summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Mitsura <oleg.mitsura@bell.ca>2022-05-31 18:10:04 -0400
committerOleg Mitsura <oleg.mitsura@amdocs.com>2022-05-31 18:22:32 -0400
commit826cfd94ce636c5da62a616b6ce37980ec9f3f74 (patch)
treec8c55dcb284708db9e8fab62726612db771ae3d9
parent4dbcb4c95a6e245d687de18602e00c3f91631b22 (diff)
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>
-rw-r--r--ms/artifact-manager/requirements/shared.txt1
-rw-r--r--ms/command-executor/src/main/docker/Dockerfile8
-rw-r--r--ms/py-executor/requirements/shared.txt1
3 files changed, 6 insertions, 4 deletions
diff --git a/ms/artifact-manager/requirements/shared.txt b/ms/artifact-manager/requirements/shared.txt
index 971d4a82e..36e93a367 100644
--- 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 3a6d99a63..7704a20a5 100644
--- 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 228320120..1086e48b9 100644
--- 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