Fixing DockerFiles

refactoring to use onap certified base image and combining run commands

Issue-ID: CCSDK-2794
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Id31d5a0018cbce14e54f4aa3e5caebb75dda2276

4 files changed, 33 insertions, 32 deletions

diff --git a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile
index b0efcbe36..6326bb862 100755
--- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile
+++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile
@@ -1,23 +1,21 @@
-FROM alpine:latest AS extractor
+FROM onap/ccsdk-alpine-j11-image:1.0.1
+
+USER root
+# add entrypoint
+COPY startService.sh /opt/app/onap/blueprints-processor/startService.sh
+# add application
 COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz
 
 RUN tar -xzf /source.tar.gz -C /tmp \
  && cp -rf /tmp/@project.build.finalName@/opt / \
  && rm -rf /source.tar.gz \
  && rm -rf /tmp/@project.build.finalName@
-
-FROM onap/ccsdk-alpine-j11-image:1.0.1
-
-USER root
-# add entrypoint
-COPY startService.sh /opt/app/onap/blueprints-processor/startService.sh
-RUN chown onap:onap /opt/app/onap/blueprints-processor/startService.sh \
- && touch /velocity.log && chmod 755 /velocity.log && chown onap:onap /velocity.log \
+ && touch /velocity.log \
+ && chown onap:onap /velocity.log \
+ && chmod 755 /velocity.log \
+ && mkdir -p /opt/app/onap/blueprints/deploy \
+ && chown onap:onap /opt -R \
  && chmod 755 /opt/app/onap/blueprints-processor/startService.sh
 
-# add application
-COPY --from=extractor /opt /opt
-RUN mkdir -p /opt/app/onap/blueprints/deploy && chown onap:onap /opt -R
-
 USER onap
 ENTRYPOINT [ "/opt/app/onap/blueprints-processor/startService.sh" ]
diff --git a/ms/command-executor/src/main/docker/Dockerfile b/ms/command-executor/src/main/docker/Dockerfile
index 7ef689728..5fc11814d 100644
--- a/ms/command-executor/src/main/docker/Dockerfile
+++ b/ms/command-executor/src/main/docker/Dockerfile
@@ -6,20 +6,20 @@ 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
-
-COPY start.sh /opt/app/onap/command-executor/start.sh \
- && chmod u+x /opt/app/onap/command-executor/start.sh
-
 RUN mkdir -p /opt/app/onap/logs/ && touch /opt/app/onap/logs/application.log
 
+# add entrypoint
+COPY start.sh /opt/app/onap/command-executor/start.sh
+# add application
 COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz
+
 RUN tar -xzf /source.tar.gz -C /tmp \
  && cp -rf /tmp/@project.build.finalName@/opt / \
  && rm -rf /source.tar.gz \
- && rm -rf /tmp/@project.build.finalName@
-
-RUN mkdir -p /opt/app/onap/blueprints/deploy
-RUN chown onap:onap /opt -R
+ && 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/
 
diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile
index 812922c4d..cdf416d9d 100644
--- a/ms/py-executor/docker/Dockerfile
+++ b/ms/py-executor/docker/Dockerfile
@@ -1,20 +1,24 @@
 FROM onap/integration-python:7.0.1
 
 USER root
+RUN python -m pip install --upgrade pip
+RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt
 RUN mkdir -p /opt/app/onap/logs/ && touch /opt/app/onap/logs/application.log
 
+# add entrypoint
+COPY start.sh /opt/app/onap/py-executor/start.sh
+# add application
 COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz
+
 RUN tar -xzf /source.tar.gz -C /tmp \
  && cp -rf /tmp/@project.build.finalName@/opt / \
  && rm -rf /source.tar.gz \
- && rm -rf /tmp/@project.build.finalName@
-
-RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt
-
-RUN mkdir -p /opt/app/onap/blueprints/deploy
-RUN chown onap:onap /opt -R
+ && rm -rf /tmp/@project.build.finalName@ \
+ && mkdir -p /opt/app/onap/blueprints/deploy \
+ && chown onap:onap /opt -R \
+ && chmod 755 /opt/app/onap/py-executor/start.sh
 
 VOLUME /opt/app/onap/blueprints/deploy/
 
 USER onap
-ENTRYPOINT /opt/app/onap/python/start.sh
+ENTRYPOINT /opt/app/onap/py-executor/start.sh
diff --git a/ms/sdclistener/distribution/src/main/docker/Dockerfile b/ms/sdclistener/distribution/src/main/docker/Dockerfile
index b001a6fa4..b89cbc7ec 100755
--- a/ms/sdclistener/distribution/src/main/docker/Dockerfile
+++ b/ms/sdclistener/distribution/src/main/docker/Dockerfile
@@ -3,17 +3,16 @@ FROM onap/ccsdk-alpine-j11-image:1.0.1
 USER root
 # add entrypoint
 COPY startService.sh /opt/app/onap/sdc-listener/startService.sh
-RUN chown onap:onap /opt/app/onap/sdc-listener/startService.sh \
- && chmod 755 /opt/app/onap/sdc-listener/startService.sh
-
 # add application
 COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz
+
 RUN tar -xzf /source.tar.gz -C /tmp \
  && cp -rf /tmp/@project.build.finalName@/opt / \
  && rm -rf /source.tar.gz \
  && rm -rf /tmp/@project.build.finalName@ \
  && mkdir -p /opt/app/onap/cds-sdc-listener \
- && chown onap:onap /opt -R
+ && chown onap:onap /opt -R \
+ && chmod 755 /opt/app/onap/sdc-listener/startService.sh
 
 USER onap
 ENTRYPOINT /opt/app/onap/sdc-listener/startService.sh