diff options
Diffstat (limited to 'ms/py-executor/docker')
| -rw-r--r-- | ms/py-executor/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | ms/py-executor/docker/distribution.xml | 33 | ||||
| -rwxr-xr-x | ms/py-executor/docker/start.sh | 19 |
3 files changed, 49 insertions, 5 deletions
diff --git a/ms/py-executor/docker/Dockerfile b/ms/py-executor/docker/Dockerfile index 9e86cc87e..043e15d53 100644 --- a/ms/py-executor/docker/Dockerfile +++ b/ms/py-executor/docker/Dockerfile @@ -8,7 +8,7 @@ RUN tar -xzf /source.tar.gz -C /tmp \ && 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 pip install --no-cache-dir -r /opt/app/onap/python/requirements/docker.txt VOLUME /opt/app/onap/blueprints/deploy/ diff --git a/ms/py-executor/docker/distribution.xml b/ms/py-executor/docker/distribution.xml index 6d09be8b2..558ce2f17 100755 --- a/ms/py-executor/docker/distribution.xml +++ b/ms/py-executor/docker/distribution.xml @@ -27,17 +27,42 @@ <directory>${project.basedir}</directory> <outputDirectory>opt/app/onap/python</outputDirectory> <includes> - <include>blueprints_grpc/**/*.py</include> + <include>blueprints_grpc/*.py</include> <include>*.py</include> </includes> <useDefaultExcludes>true</useDefaultExcludes> </fileSet> <fileSet> + <directory>${project.basedir}/../../py-modules</directory> + <outputDirectory>opt/app/onap/dependencies/</outputDirectory> + <includes> + <include>common/**/*.py</include> + </includes> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/..</directory> + <outputDirectory>opt/app/onap/dependencies</outputDirectory> + <includes> + <include>artifact-manager/**/*.*</include> + </includes> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/..</directory> + <outputDirectory>opt/app/onap</outputDirectory> + <includes> + <include>logging.yaml</include> + <include>configuration.ini</include> + </includes> + <useDefaultExcludes>true</useDefaultExcludes> + <fileMode>0666</fileMode> + </fileSet> + <fileSet> <directory>${project.basedir}</directory> <outputDirectory>opt/app/onap/python</outputDirectory> <includes> - <include>requirements.txt</include> - <include>configuration.ini</include> + <include>requirements/*.txt</include> </includes> <useDefaultExcludes>true</useDefaultExcludes> <fileMode>0666</fileMode> @@ -58,4 +83,4 @@ <fileMode>0755</fileMode> </fileSet> </fileSets> -</assembly>
\ No newline at end of file +</assembly> diff --git a/ms/py-executor/docker/start.sh b/ms/py-executor/docker/start.sh index 3a3a9cb70..6868ba0e7 100755 --- a/ms/py-executor/docker/start.sh +++ b/ms/py-executor/docker/start.sh @@ -22,12 +22,24 @@ then export APP_PORT=50052 fi +if [ -z "${ARTIFACT_MANAGER_PORT}" ] +then + echo "ARTIFACT_MANAGER_PORT environment variable is not set, using default." + export ARTIFACT_MANAGER_PORT=50053 +fi + if [ -z "${LOG_FILE}" ] then echo "LOG_FILE environment variable is not set, using default." export LOG_FILE="application.log" fi +if [ -z "${ARTIFACT_MANAGER_SERVER_LOG_FILE}" ] +then + echo "ARTIFACT_MANAGER_SERVER_LOG_FILE environment variable is not set, using default." + export ARTIFACT_MANAGER_SERVER_LOG_FILE="artifacts.log" +fi + if [ "${http_proxy}" ] then echo "Setting http_proxy: ${http_proxy}" @@ -38,5 +50,12 @@ then echo "Setting https_proxy: ${https_proxy}" fi +if [ -z "${CONFIGURATION}" ] +then + echo "CONFIGURATION environment variable is not set, using default." + export CONFIGURATION="/opt/app/onap/configuration.ini" +fi + + cd /opt/app/onap/python/ python server.py
\ No newline at end of file |