summaryrefslogtreecommitdiffstats
path: root/ms/command-executor
diff options
context:
space:
mode:
authorSingal, Kapil (ks220y) <ks220y@att.com>2020-09-16 10:49:28 -0400
committerSingal, Kapil (ks220y) <ks220y@att.com>2020-09-18 14:20:00 -0400
commitfbbc9bceb83de1ade5b4b6a666546aba24a14e2f (patch)
tree25586609f64ac3f4856ae0cc33fd446d5c93d322 /ms/command-executor
parent6c77ea314cb8cdac8f602cea608ae06108ab6062 (diff)
Fixing dockerFile
Fixing dockerFile and related items Refactoring pom properties Issue-ID: CCSDK-2794 Change-Id: Ib9d3cc38c2db65778cef2590ab774035305a16fa Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Diffstat (limited to 'ms/command-executor')
-rwxr-xr-xms/command-executor/pom.xml18
-rw-r--r--ms/command-executor/src/main/docker/Dockerfile14
2 files changed, 11 insertions, 21 deletions
diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml
index eb5337973..441a22a5f 100755
--- a/ms/command-executor/pom.xml
+++ b/ms/command-executor/pom.xml
@@ -34,10 +34,6 @@
<properties>
<assembly.id>maven</assembly.id>
<image.name>onap/ccsdk-commandexecutor</image.name>
- <docker.push.phase>deploy</docker.push.phase>
- <docker.verbose>true</docker.verbose>
- <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
<build>
@@ -115,7 +111,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.26.1</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
<images>
@@ -132,18 +128,12 @@
</build>
</image>
</images>
- <verbose>true</verbose>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
+ <id>build-push-images</id>
<phase>${docker.push.phase}</phase>
<goals>
<goal>build</goal>
diff --git a/ms/command-executor/src/main/docker/Dockerfile b/ms/command-executor/src/main/docker/Dockerfile
index 5fc11814d..8f2f1a717 100644
--- a/ms/command-executor/src/main/docker/Dockerfile
+++ b/ms/command-executor/src/main/docker/Dockerfile
@@ -1,11 +1,6 @@
-FROM onap/integration-python:7.0.1
+FROM python:3.7-slim
USER root
-ENV GRPC_PYTHON_VERSION 1.20.0
-
-RUN python -m pip install --upgrade pip
-RUN pip install grpcio==${GRPC_PYTHON_VERSION} grpcio-tools==${GRPC_PYTHON_VERSION}
-RUN pip install virtualenv==16.7.9
RUN mkdir -p /opt/app/onap/logs/ && touch /opt/app/onap/logs/application.log
# add entrypoint
@@ -18,10 +13,15 @@ RUN tar -xzf /source.tar.gz -C /tmp \
&& rm -rf /source.tar.gz \
&& rm -rf /tmp/@project.build.finalName@ \
&& mkdir -p /opt/app/onap/blueprints/deploy \
- && chown onap:onap /opt -R \
&& chmod 755 /opt/app/onap/command-executor/start.sh
VOLUME /opt/app/onap/blueprints/deploy/
+RUN python -m pip install --upgrade pip setuptools
+RUN pip install grpcio==1.20.0 grpcio-tools==1.20.0
+RUN pip install virtualenv==16.7.9
+
+RUN groupadd -r -g 1000 onap && useradd -r -u 1000 -g onap onap
+RUN chown onap:onap /opt -R
USER onap
ENTRYPOINT /opt/app/onap/command-executor/start.sh