X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2F.env;h=d1cc7d617f0650284fafe88ca37354833508d7f5;hb=a59bc3e85eaf33c0a38063e5c30fe890588a0eb1;hp=eb7f33cab0ef643b3c18513ffa058afc11a46191;hpb=bfbe335566089f03f44b00bd18f1d3a4b0209927;p=portal.git

diff --git a/deliveries/.env b/deliveries/.env
index eb7f33ca..d1cc7d61 100644
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -1,18 +1,45 @@
 # Environment settings
 # used by docker-compose AND by other shell scripts
+# The name ".env" is required by docker-compose
 
-# Host directory with config files
-PROJECT_DIR=/PROJECT/OpenSource/UbuntuEP
+# 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.0
+
+# This is used during builds and in docker-compose;
+# it is never published to the ONAP registry.
+PORTAL_TAG=casablanca
 
-# Directory within containers
+# 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.1.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"