X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fportal_vm_init.sh;h=8fb971a850052526e139ea76736c185ee7c09b02;hb=de8b8df79c1f0f56d978046a6f5afda05ec72fc4;hp=5f4716ecec5c7ee791cd78f8adfd6cb31278de0c;hpb=a3b65e405278eb4b54de869a19b66ed9338dd1a6;p=portal.git

diff --git a/deliveries/portal_vm_init.sh b/deliveries/portal_vm_init.sh
index 5f4716ec..8fb971a8 100755
--- a/deliveries/portal_vm_init.sh
+++ b/deliveries/portal_vm_init.sh
@@ -12,19 +12,24 @@ NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
+# Can use this version instead to use snapshot versions:
+# DOCKER_IMAGE_VERSION=latest
+# CLI has a different version than Portal
+CLI_IMAGE_VERSION=1.1-STAGING-latest
 
 # Refresh configuration and scripts
 cd /opt/portal
 git pull
 cd deliveries
 
-# Get image names used below from docker-compose environment file
+# Get variables from docker-compose environment file
 source .env
 
-# Copy property files
-ETC=/PROJECT/OpenSource/UbuntuEP/etc
-mkdir -p $ETC
-cp -r properties_rackspace/* $ETC
+# Copy property files to new directory
+mkdir -p $PROPS_DIR
+cp -r properties_rackspace/* $PROPS_DIR
+# Also create logs directory
+mkdir -p $LOGS_DIR
 
 # Refresh images
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
@@ -32,11 +37,17 @@ docker pull $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION
 docker pull $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION
 
+# CLI is not built locally
+docker pull $NEXUS_DOCKER_REPO/onap/cli:${CLI_IMAGE_VERSION}
+
 # Tag them as expected by docker-compose file
 docker tag $NEXUS_DOCKER_REPO/openecomp/${DB_IMG_NAME}:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG
 docker tag $NEXUS_DOCKER_REPO/openecomp/${EP_IMG_NAME}:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG
 docker tag $NEXUS_DOCKER_REPO/openecomp/${WMS_IMG_NAME}:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG
 
+# Tag CLI also
+docker tag $NEXUS_DOCKER_REPO/onap/cli:${CLI_IMAGE_VERSION} onap/cli:$PORTAL_TAG
+
 # compose is not in /usr/bin
 /opt/docker/docker-compose down
 /opt/docker/docker-compose up -d