aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2019-08-08 15:17:32 +0200
committerBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2019-08-08 15:18:01 +0200
commit7a3e2594842990fa4450aead1f7b1d87ff9bb20e (patch)
tree53afb4fdaaa23d41cb9e50ac0602b58cb0975963
parent34f413dcc03e5ca582b694463196b7e21ca72bf9 (diff)
moving certs from docker image to mounted catalog
Removing certificates from dockerfile and adding mounted volume in docker-compose, this is connected with oom commit https://gerrit.onap.org/r/c/oom/+/92888 Issue-ID: VID-494 Change-Id: Ibf52542344ecf79fb947858329f37018731d2270 Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
-rwxr-xr-xdeliveries/src/main/docker/docker-files/Dockerfile4
-rwxr-xr-xdeliveries/src/main/docker/docker-files/docker-compose.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index 106b8a394..62feb8c3c 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -85,13 +85,11 @@ ENV JAVA_OPTS="-Xmx1536m -Xms1536m"
ENV CATALINA_OPTS="-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME} -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp"
-ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME}
-ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME}
ADD maven/config/server.xml ${VID_TOMCAT_PATH}
ADD maven/scripts/*.sh /tmp/vid/
ADD maven/artifacts/vid.war /tmp/vid/stage/
-RUN chown onap:onap /tmp/vid /usr/local/tomcat /opt/app -R
+RUN chown onap:onap /tmp/vid /usr/local/tomcat -R
RUN chmod +x /tmp/vid/localize.sh
USER onap
CMD ["/tmp/vid/localize.sh"]
diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml
index 8d321cfb5..a62636c49 100755
--- a/deliveries/src/main/docker/docker-files/docker-compose.yml
+++ b/deliveries/src/main/docker/docker-files/docker-compose.yml
@@ -16,6 +16,8 @@ services:
ASDC_CLIENT_REST_PORT: 1080
VID_AAI_URL: http://vid-simulator:1080
VID_MSO_SERVER_URL: http://vid-simulator:1080
+ volumes:
+ - ../../../../../epsdk-app-onap/src/main/webapp/WEB-INF/cert:/opt/app/vid/etc
vid-mariadb:
image: mariadb:10