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

diff --git a/deliveries/.env b/deliveries/.env
index c67f43f4..fc7c94c4 100644
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -1,19 +1,36 @@
 # 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
+WMS_IMG_NAME=onap/portal-wms
+# Deployed with portal; built elsewhere
+CLI_IMG_NAME=onap/cli
 
-# Directory within containers (not host)
-WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
+# This is the first portion of the Docker image tag
+# that is published to the ONAP registry.
+PORTAL_VERSION=2.1
 
-# 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
+# This is used during builds and in docker-compose;
+# it is never published to the ONAP registry.
+PORTAL_TAG=beijing
+
+# Name of directory in apps container (NOT host)
+WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
 
-# 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_rackspace
 
-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.openecomp.org"