From: Dan Timoney <dtimoney@att.com>
Date: Thu, 2 Jul 2020 15:38:10 +0000 (-0400)
Subject: Do not install certs in docker image
X-Git-Tag: 1.1.0~181
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2e80cc8a3e97b1e0979511c54aebd86bddfa7f35;p=ccsdk%2Fcds.git

Do not install certs in docker image

Updated docker config to no longer install certificates in docker image.
Instead, in kubernetes env, they will be installed as secrets in oom.
In docker-compose env, certs will be an external mount.

Issue-ID: CCSDK-2519
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Id67e16e72d2cb7d0c9a1d88fdcff544d86ca2708
(cherry picked from commit 3b346af513694c07a3cb57734c8b881677c595f6)
---

diff --git a/ms/py-executor/dc/docker-compose.yaml b/ms/py-executor/dc/docker-compose.yaml
index 63c5eeb4f..844f8b06c 100755
--- a/ms/py-executor/dc/docker-compose.yaml
+++ b/ms/py-executor/dc/docker-compose.yaml
@@ -9,6 +9,7 @@ services:
     restart: always
     volumes:
       - blueprints-deploy:/opt/app/onap/blueprints/deploy
+      - ../certs:/opt/app/onap/python/certs
     environment:
       APPLICATIONNAME: PythonExecutor
       BUNDLEVERSION: 1.0.0
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
@@ -67,12 +67,6 @@
             <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>