FROM python:3.7-slim
+USER root
-RUN mkdir -p /opt/app/onap/logs/ && touch /opt/app/onap/logs/application.log
+# add entrypoint
+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@
-RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements.txt
+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@ \
+ && 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
-ENTRYPOINT /opt/app/onap/python/start.sh
+USER onap
+ENTRYPOINT /opt/app/onap/py-executor/start.sh