X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2F.env;h=d811815849874ff672728dfe65bfe0aa48459018;hb=d23be7aa6224274f8740437291416b40800ce571;hp=c67f43f4bb028695a3d457d33731201ef4a3f74e;hpb=de8b8df79c1f0f56d978046a6f5afda05ec72fc4;p=portal.git

diff --git a/deliveries/.env b/deliveries/.env
index c67f43f4..d8118158 100644
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -1,19 +1,45 @@
 # Environment settings
 # used by docker-compose AND by other shell scripts
+# The name ".env" is required by docker-compose
 
-# Host directories; must be writable
-LOGS_DIR=/PROJECT/OpenSource/UbuntuEP/logs
-PROPS_DIR=/PROJECT/OpenSource/UbuntuEP/properties
+# Following are ALSO used in demo/boot/portal_vm_init.sh
+EP_IMG_NAME=onap/portal-app
+SDK_IMG_NAME=onap/portal-sdk
+DB_IMG_NAME=onap/portal-db
+CDR_IMG_NAME=onap/music/cassandra_music
+ZK_IMG_NAME=zookeeper
+WMS_IMG_NAME=onap/portal-wms
+# Deployed with portal; built elsewhere
+CLI_IMG_NAME=onap/cli
+
+# This is the first portion of the Docker image tag
+# that is published to the ONAP registry.
+PORTAL_VERSION=2.3.1
+
+# This is used during builds and in docker-compose;
+# it is never published to the ONAP registry.
+PORTAL_TAG=casablanca
 
-# Directory within containers (not host)
+# Name of directory in apps container (NOT host)
 WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
+TOMCAT_DIR=/opt/apache-tomcat-8.0.37
+
+# Certs
+TOMCAT_KEY=keystoreONAP.keystore
+TOMCAT_TRUST=truststoreONAPall.jks
+CERT_PWD=changeit
 
-# Following are ALSO used in demo/boot/portal_vm_init.sh
-EP_IMG_NAME=portal-apps
-DB_IMG_NAME=portal-db
-WMS_IMG_NAME=portal-wms
 
-# Tag all images with this
-PORTAL_TAG=1.3.0
+# Required settings with default values.
+# Export shell environment variables on ALL hosts.
+LOGS_DIR=./logs
+PROPS_DIR=./properties_simpledemo
 
-NEXUS_REPO=nexus3.onap.org:10003
+# Optional settings with no defaults.
+EXTRA_HOST_IP=""
+EXTRA_HOST_NAME=""
+# Export shell environment variables on hosts with no DNS;
+# a line is added to docker container's /etc/hosts.
+# For example:
+#EXTRA_HOST_IP="-i 10.11.12.13"
+#EXTRA_HOST_NAME="-n portal.api.simpledemo.onap.org"