Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Security/ Package Name changes
[portal.git]
/
deliveries
/
.env
diff --git
a/deliveries/.env
b/deliveries/.env
index
0a3230d
..
fc7c94c
100644
(file)
--- a/
deliveries/.env
+++ b/
deliveries/.env
@@
-1,15
+1,22
@@
# Environment settings
# used by docker-compose AND by other shell scripts
# Environment settings
# used by docker-compose AND by other shell scripts
+# The name ".env" is required by docker-compose
# Following are ALSO used in demo/boot/portal_vm_init.sh
# Following are ALSO used in demo/boot/portal_vm_init.sh
-EP_IMG_NAME=onap/portal-apps
+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
DB_IMG_NAME=onap/portal-db
WMS_IMG_NAME=onap/portal-wms
# Deployed with portal; built elsewhere
CLI_IMG_NAME=onap/cli
-# Tag all images with this
-PORTAL_TAG=1.3.0
+# This is the first portion of the Docker image tag
+# that is published to the ONAP registry.
+PORTAL_VERSION=2.1
+
+# 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
# Name of directory in apps container (NOT host)
WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
@@
-25,5
+32,5
@@
EXTRA_HOST_NAME=""
# Export shell environment variables on hosts with no DNS;
# a line is added to docker container's /etc/hosts.
# For example:
# 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 1
35.207.161.16
3"
+#EXTRA_HOST_IP="-i 1
0.11.12.1
3"
#EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org"
#EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org"