summaryrefslogtreecommitdiffstats
path: root/ms/command-executor/src
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-04-19 00:10:05 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-19 00:10:05 +0000
commiteb5c00585a59343e8a186ed5fc3f98b1394b7e37 (patch)
treec3bf18d42b43d151b66288cbadf312d20feef15b /ms/command-executor/src
parentcdaa0d3851ad758f02163af1a4fc2cfbb19eb9e2 (diff)
parent6fcfbc12e20e5a853c9204469dac6867b7eb6ccb (diff)
Merge "Integration Test - Component Executor"
Diffstat (limited to 'ms/command-executor/src')
-rw-r--r--ms/command-executor/src/main/docker/Dockerfile11
-rwxr-xr-xms/command-executor/src/main/docker/distribution.xml2
-rwxr-xr-xms/command-executor/src/main/docker/start.sh2
3 files changed, 8 insertions, 7 deletions
diff --git a/ms/command-executor/src/main/docker/Dockerfile b/ms/command-executor/src/main/docker/Dockerfile
index cac2b958b..1137de168 100644
--- a/ms/command-executor/src/main/docker/Dockerfile
+++ b/ms/command-executor/src/main/docker/Dockerfile
@@ -5,10 +5,8 @@ RUN python -m pip install --upgrade pip
RUN pip install grpcio==${GRPC_PYTHON_VERSION} grpcio-tools==${GRPC_PYTHON_VERSION}
RUN pip install virtualenv
-RUN mkdir -p /opt/onap/blueprints && mkdir -p /opt/onap/app/python && chmod -R 777 /opt/onap
-
-COPY start.sh /opt/onap/app/start.sh
-RUN chmod u+x /opt/onap/app/start.sh
+COPY start.sh /opt/app/onap/start.sh
+RUN chmod u+x /opt/app/onap/start.sh
COPY @project.build.finalName@-@assembly.id@.tar.gz /source.tar.gz
RUN tar -xzf /source.tar.gz -C /tmp \
@@ -16,4 +14,7 @@ RUN tar -xzf /source.tar.gz -C /tmp \
&& rm -rf /source.tar.gz \
&& rm -rf /tmp/@project.build.finalName@
-ENTRYPOINT /opt/onap/app/start.sh \ No newline at end of file
+
+VOLUME /opt/app/onap/blueprints/deploy/
+
+ENTRYPOINT /opt/app/onap/start.sh \ No newline at end of file
diff --git a/ms/command-executor/src/main/docker/distribution.xml b/ms/command-executor/src/main/docker/distribution.xml
index e4ac2f85d..7b8c27021 100755
--- a/ms/command-executor/src/main/docker/distribution.xml
+++ b/ms/command-executor/src/main/docker/distribution.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/python</directory>
- <outputDirectory>/opt/onap/app/python</outputDirectory>
+ <outputDirectory>/opt/app/onap/python</outputDirectory>
</fileSet>
</fileSets>
</assembly> \ No newline at end of file
diff --git a/ms/command-executor/src/main/docker/start.sh b/ms/command-executor/src/main/docker/start.sh
index 6c0aa0018..0dbd7e8f3 100755
--- a/ms/command-executor/src/main/docker/start.sh
+++ b/ms/command-executor/src/main/docker/start.sh
@@ -28,5 +28,5 @@ then
export BASIC_AUTH="Basic Y2NzZGthcHBzOmNjc2RrYXBwcw=="
fi
-cd /opt/onap/app/python/
+cd /opt/app/onap/python/
python command_executor_server.py ${APP_PORT} ${BASIC_AUTH} \ No newline at end of file