Change template properties for AAI

[vid.git] / deliveries / src / main / docker / docker-files / Dockerfile

diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index 72d37c3..33c3ac1 100755 (executable)
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -1,17 +1,23 @@
 FROM tomcat:8.0-jre8\r
-\r
+# add vim and uncomment alias to speedup troubleshooting purpose\r
 RUN apt-get update && apt-get install -y \\r
-       openjdk-8-jdk\r
+       openjdk-8-jdk vim net-tools\r
+\r
+RUN sed -i 's/# alias/alias/g' /root/.bashrc\r
+\r
+RUN mkdir -p ${ROOT_DIR}/etc\r
+\r
+ENV JAVA_OPTS="-Xmx1536m -Xms1536m"\r
 \r
 ENV ROOT_DIR /opt/app/vid\r
 \r
 ENV ASDC_CLIENT_TYPE REST\r
-ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.openecomp.org\r
+ENV ASDC_CLIENT_REST_HOST c2.vm1.sdc.simpledemo.onap.org\r
 #old creds 1/9/2017 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOnZpZG9z\r
 ENV ASDC_CLIENT_REST_AUTH Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=\r
 ENV ASDC_CLIENT_REST_PROTOCOL http\r
 ENV ASDC_CLIENT_REST_PORT 8080\r
-ENV ASDC_CLIENT_MODEL_NAMESPACE org.openecomp\r
+ENV ASDC_CLIENT_MODEL_NAMESPACE org.onap\r
 \r
 ENV CACHE_DIRECTORY $ROOT_DIR/cache\r
 \r
@@ -19,14 +25,11 @@ ENV LOG4J_LOGLEVEL INFO
 ENV LOG4J_APPENDER rollingfile\r
 ENV LOG4J_LOGS_DIRECTORY ${ROOT_DIR}/logs\r
 \r
-ENV VID_AAI_HOST aai.api.simpledemo.openecomp.org\r
-ENV VID_AAI_PORT 8443\r
+ENV VID_AAI_URL https://aai.api.simpledemo.onap.org:8443\r
 ENV VID_APP_DISPLAY_NAME VID\r
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.openecomp.org:8080/ecompportal/context\r
-ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.openecomp.org:8080\r
-ENV VID_TRUSTSTORE_FILE ${ROOT_DIR}/etc/vid_keystore.jks\r
+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL https://portal.api.simpledemo.onap.org:8080/onapportal/context\r
+ENV VID_MSO_SERVER_URL http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra\r
 ENV VID_MYLOGIN_FEED_DIRECTORY /tmp/MyLogins\r
-ENV VID_TRUSTSTORE_PASS 5c84906b14912dbe96154e09b1e1db90e31f8dedb08e3e6c9f17da3f926cb67b33e4229cc1fe0f59c996d2e38b8ded42\r
 ENV VID_MSO_USER InfraPortalClient\r
 ENV VID_MSO_PASS OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz\r
 ENV MSO_DME2_CLIENT_TIMEOUT 10000\r
@@ -42,13 +45,14 @@ ENV AAI_VID_UID VID
 ENV AAI_VID_PASSWD_X OBF:1jm91i0v1jl9\r
 ENV AAI_USE_CLIENT_CERT false\r
 ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED\r
-ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm\r
-ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi\r
-ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/context\r
+ENV VID_ECOMP_REDIRECT_URL  http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm\r
+ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi\r
+ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/context\r
+ENV VID_ROLE_ACCESS_CENTRALIZED local\r
 ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com\r
 \r
 ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=\r
-ENV VID_UEB_URL_LIST ueb.api.simpledemo.openecomp.org \r
+ENV VID_UEB_URL_LIST ueb.api.simpledemo.onap.org\r
 ENV VID_UEB_CONSUMER_GROUP VID\r
 ENV VID_ECOMP_PORTAL_INBOX_NAME ECOMP-PORTAL-INBOX\r
 ENV VID_UEB_APP_KEY 2Re7Pvdkgw5aeAUD\r
@@ -66,6 +70,17 @@ ENV VID_MYSQL_USER vidadmin
 ENV VID_MYSQL_MAXCONNECTIONS 5\r
 ENV VID_MYSQL_PASS Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U\r
 \r
+ENV VID_KEYSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.jks\r
+ENV VID_KEYSTORE_PASSWORD Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U\r
+ENV VID_TRUSTSTORE_FILENAME ${ROOT_DIR}/etc/org.onap.vid.trust.jks\r
+ENV VID_TRUSTSTORE_PASSWORD OBF:1dx01j0e1hs01t981mis1dws156s1ojc1qjc1zsx1pw31qob1qr71pyj1zst1qhy1ojq156i1dua1mm21tb61hvi1j0g1du2\r
+ENV VID_TOMCAT_PATH /usr/local/tomcat/conf/\r
+ENV CATALINA_OPTS "-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}"\r
+\r
+ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME}\r
+ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME}\r
+ADD maven/config/server.xml ${VID_TOMCAT_PATH}\r
+\r
 ADD maven/scripts/*.sh /tmp/vid/\r
 ADD maven/artifacts/vid.war /tmp/vid/stage/\r
 \r