CCSDK-3682 pin protobuf to 3.20.1

Issue-ID: CCSDK-3682

protobuf gets updated to a later version (without pinning), which is not compatible
with protoc, as well as we need to keep it consistent with SO proto version.

Change-Id: I7b35503e7f2997cc56e131ad4775a41a942eeac5
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>

diff --git a/ms/artifact-manager/requirements/shared.txt b/ms/artifact-manager/requirements/shared.txt
index 971d4a8..36e93a3 100644 (file)
--- a/ms/artifact-manager/requirements/shared.txt
+++ b/ms/artifact-manager/requirements/shared.txt
@@ -1,3 +1,4 @@
 grpcio-tools==1.25.0
+protobuf==3.20.1
 onappylog==1.0.9
 click==7.0

diff --git a/ms/command-executor/src/main/docker/Dockerfile b/ms/command-executor/src/main/docker/Dockerfile
index 3a6d99a..7704a20 100644 (file)
--- a/ms/command-executor/src/main/docker/Dockerfile
+++ b/ms/command-executor/src/main/docker/Dockerfile
@@ -15,10 +15,10 @@ RUN tar -xzf /source.tar.gz -C /tmp \
     && mkdir -p /opt/app/onap/blueprints/deploy /opt/app/onap/logs \
     && touch /opt/app/onap/logs/application.log \
     && chown -R onap:onap /opt \
-    && chmod -R 755 /opt
-
-RUN python -m pip install --no-cache-dir --upgrade pip setuptools
-RUN pip install --no-cache-dir requests==2.26.0 grpcio==1.20.0 grpcio-tools==1.20.0 virtualenv==16.7.9 prometheus-client==0.11.0
+    && chmod -R 755 /opt \
+    && apt-get update && apt-get install -y procps iputils-ping curl telnet && rm -rf /var/lib/apt/lists/* \
+    && python -m pip install --no-cache-dir --upgrade pip setuptools \
+    && pip install --no-cache-dir requests==2.26.0 grpcio==1.20.0 grpcio-tools==1.20.0 virtualenv==16.7.9 prometheus-client==0.11.0 protobuf==3.20.1
 
 USER onap
 ENTRYPOINT /opt/app/onap/command-executor/start.sh

diff --git a/ms/py-executor/requirements/shared.txt b/ms/py-executor/requirements/shared.txt
index 2283201..1086e48 100644 (file)
--- a/ms/py-executor/requirements/shared.txt
+++ b/ms/py-executor/requirements/shared.txt
@@ -1,5 +1,6 @@
 grpcio==1.25.0
 grpcio-tools==1.25.0
+protobuf==3.20.1
 configparser==4.0.2
 requests==2.22.0
 ncclient==0.6.6