Fix: Run both sonar and clm scans in parallel

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

diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile
index cdf416d..74e6f5f 100644 (file)
--- a/ms/py-executor/docker/Dockerfile
+++ b/ms/py-executor/docker/Dockerfile
@@ -1,24 +1,24 @@
-FROM onap/integration-python:7.0.1
-
+FROM python:3.7-slim
 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
+COPY *.sh /opt/app/onap/py-executor/
+
 # 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/blueprints/deploy \
- && chown onap:onap /opt -R \
- && chmod 755 /opt/app/onap/py-executor/start.sh
+    && cp -rf /tmp/@project.build.finalName@/opt / \
+    && rm -rf /source.tar.gz \
+    && rm -rf /tmp/@project.build.finalName@ \
+    && groupadd -r -g 1000 onap && useradd -r -u 1000 -g onap onap \
+    && 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
 
-VOLUME /opt/app/onap/blueprints/deploy/
+RUN python -m pip install --no-cache-dir --upgrade pip setuptools
+RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt
 
 USER onap
 ENTRYPOINT /opt/app/onap/py-executor/start.sh