Fixing DockerFiles

[ccsdk/cds.git] / ms / py-executor / docker / Dockerfile

diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile
index 812922c..cdf416d 100644 (file)
--- 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