summaryrefslogtreecommitdiffstats
path: root/ms/py-executor/docker
diff options
context:
space:
mode:
authorBrinda Santh <bs2796@att.com>2019-11-19 15:07:32 -0500
committerBrinda Santh <bs2796@att.com>2019-11-19 15:07:32 -0500
commit2783ded8664505cc0bbfd254fc2a96c5830b66a0 (patch)
tree6c4c6d829caba7a6378a3bb05bf7802cb8a8ae4f /ms/py-executor/docker
parent1337eccc2be949d860f3c5b1f0148c061c3c669b (diff)
Folder for py-executor TLS certificate files
Issue-ID: CCSDK-1747 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: Ia404322cefbd603fd06bd23ff1d069dc277065ec
Diffstat (limited to 'ms/py-executor/docker')
-rwxr-xr-xms/py-executor/docker/distribution.xml9
-rwxr-xr-xms/py-executor/docker/start.sh6
2 files changed, 6 insertions, 9 deletions
diff --git a/ms/py-executor/docker/distribution.xml b/ms/py-executor/docker/distribution.xml
index bb7a8d20a..6d09be8b2 100755
--- a/ms/py-executor/docker/distribution.xml
+++ b/ms/py-executor/docker/distribution.xml
@@ -38,14 +38,17 @@
<includes>
<include>requirements.txt</include>
<include>configuration.ini</include>
- <include>*.crt</include>
- <include>*.key</include>
- <include>*.pem</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
<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>
diff --git a/ms/py-executor/docker/start.sh b/ms/py-executor/docker/start.sh
index fd53d474b..3a3a9cb70 100755
--- a/ms/py-executor/docker/start.sh
+++ b/ms/py-executor/docker/start.sh
@@ -22,12 +22,6 @@ then
export APP_PORT=50052
fi
-if [ -z "${BASIC_AUTH}" ]
-then
- echo "BASIC_AUTH environment variable is not set, using default."
- export BASIC_AUTH="Basic Y2NzZGthcHBzOmNjc2RrYXBwcw=="
-fi
-
if [ -z "${LOG_FILE}" ]
then
echo "LOG_FILE environment variable is not set, using default."