From e2d292d5baa28a7c5b41f13ced705d1f8d2712c9 Mon Sep 17 00:00:00 2001
From: Piotr Darosz <piotr.darosz@nokia.com>
Date: Wed, 29 Aug 2018 10:33:54 +0200
Subject: VID Internal HTTPS

Use HTTPS for internal VID interfaces

Change-Id: I72260cd10c4d83e84f639798f4e4ebb738f6f4aa
Issue-ID: VID-273
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
---
 .../src/main/docker/assembly/assembly-for-plugin.xml       | 14 ++++++++++++++
 deliveries/src/main/docker/docker-files/Dockerfile         | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'deliveries')

diff --git a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml
index 35c203352..27bcdb2c6 100755
--- a/deliveries/src/main/docker/assembly/assembly-for-plugin.xml
+++ b/deliveries/src/main/docker/assembly/assembly-for-plugin.xml
@@ -26,6 +26,20 @@
 			<directory>src/main/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
 		</fileSet>
+		<fileSet>
+			<includes>
+				<include>server.xml</include>
+			</includes>
+			<directory>../epsdk-app-onap/src/main/resources</directory>
+			<outputDirectory>config</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<includes>
+				<include>org.onap.vid.jks</include>
+			</includes>
+			<directory>../epsdk-app-onap/src/main/webapp/WEB-INF/cert</directory>
+			<outputDirectory>config</outputDirectory>
+		</fileSet>
 	</fileSets>
 	
 </assembly>
diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index a347659a5..010318232 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,10 +1,12 @@
 FROM tomcat:8.0-jre8
 # add vim and uncomment alias to speedup troubleshooting purpose
 RUN apt-get update && apt-get install -y \
-	openjdk-8-jdk vim
+	openjdk-8-jdk vim net-tools
 
 RUN sed -i 's/# alias/alias/g' /root/.bashrc
 
+RUN mkdir -p ${ROOT_DIR}/etc
+
 ENV JAVA_OPTS="-Xmx1536m -Xms1536m"
 
 ENV ROOT_DIR /opt/app/vid
@@ -52,7 +54,7 @@ ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.onap.org:8989
 ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com
 
 ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=
-ENV VID_UEB_URL_LIST ueb.api.simpledemo.onap.org 
+ENV VID_UEB_URL_LIST ueb.api.simpledemo.onap.org
 ENV VID_UEB_CONSUMER_GROUP VID
 ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX
 ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD
@@ -70,6 +72,14 @@ ENV VID_MYSQL_USER vidadmin
 ENV VID_MYSQL_MAXCONNECTIONS 5
 ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
+ENV VID_KEYSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.jks
+ENV VID_KEYSTORE_PASSWORD Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ENV VID_TOMCAT_PATH /usr/local/tomcat/conf/
+ENV CATALINA_OPTS "-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}"
+
+ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME}
+ADD maven/config/server.xml ${VID_TOMCAT_PATH}
+
 ADD maven/scripts/*.sh /tmp/vid/
 ADD maven/artifacts/vid.war /tmp/vid/stage/
 
-- 
cgit 1.2.3-korg