diff options
Diffstat (limited to 'ms/py-executor/docker')
| -rw-r--r-- | ms/py-executor/docker/Dockerfile | 20 | ||||
| -rwxr-xr-x | ms/py-executor/docker/distribution.xml | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile index eb43b7320..2fa699672 100644 --- a/ms/py-executor/docker/Dockerfile +++ b/ms/py-executor/docker/Dockerfile @@ -1,20 +1,26 @@ FROM python:3.7-slim -RUN groupadd -r -g 1000 onap && useradd -u 1000 -r -g onap onap - +USER root 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@ + && rm -rf /tmp/@project.build.finalName@ \ + && mkdir -p /opt/app/onap/blueprints/deploy \ + && chmod 755 /opt/app/onap/py-executor/start.sh + +VOLUME /opt/app/onap/blueprints/deploy/ +RUN python -m pip install --upgrade pip setuptools RUN pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt -RUN mkdir -p /opt/app/onap/blueprints/deploy +RUN groupadd -r -g 1000 onap && useradd -r -u 1000 -g onap onap RUN chown onap:onap /opt -R - -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/py-executor/docker/distribution.xml b/ms/py-executor/docker/distribution.xml index 558ce2f17..a2739bdfa 100755 --- a/ms/py-executor/docker/distribution.xml +++ b/ms/py-executor/docker/distribution.xml @@ -68,12 +68,6 @@ <fileMode>0666</fileMode> </fileSet> <fileSet> - <directory>${project.basedir}/certs</directory> - <outputDirectory>opt/app/onap/python/certs</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <fileMode>0666</fileMode> - </fileSet> - <fileSet> <directory>${project.basedir}/docker</directory> <outputDirectory>opt/app/onap/python</outputDirectory> <includes> |