X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fportal_vm_init.sh;h=7d1c5351443c7e7518bd6177d775d411ad07bf98;hb=refs%2Fheads%2Famsterdam;hp=744c4fc95a51d07cb62fb4c06fe6954d08627d2b;hpb=3426556541256f93d2cba65df3b9c8d1d1772861;p=demo.git

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
old mode 100644
new mode 100755
index 744c4fc9..7d1c5351
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -1,29 +1,49 @@
 #!/bin/bash
+# Starts docker containers for ONAP Portal in Rackspace.
+# Version for Amsterdam/R1 uses docker-compose.
 
+# be verbose
+set -x
+
+# Establish environment variables
 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)
+# Use "latest" to deploy snapshot images:
+# DOCKER_IMAGE_VERSION=latest
+CLI_DOCKER_VERSION=$(cat /opt/config/cli_docker_version.txt)
 
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/ecomp/portaldb:1610.3
-docker pull $NEXUS_DOCKER_REPO/ecomp/portalapps:1610.3
-
-docker create --name data_vol_portal -v /var/lib/mysql mariadb
-
-docker tag 6ce6ea8c6e52 ecompdb:portal
-docker tag 925a8a953d4c ep:1610-1
+# Refresh configuration and scripts
+cd /opt/portal
+git pull
+cd deliveries
 
-docker rm -f ecompdb_portal
-docker rm -f 1610-1
+# Get image names used below from docker-compose environment file
+source .env
 
-./dbstart.sh
-./new_start.sh
-
-sleep 60
-
-if [ ! -e /opt/config/boot.txt ]
-then
-  IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
-  mysql -u root -p'Aa123456' -h $IP_ADDRESS < users.sql
-  echo "yes" > /opt/config/boot.txt
-fi
\ No newline at end of file
+# Refresh images
+docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+docker pull $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION
+
+# Tag them as expected by docker-compose file
+docker tag $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG
+docker tag $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG
+docker tag $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG
+docker tag $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION $CLI_IMG_NAME:$PORTAL_TAG
+
+# Export variable for local logs directory, and create directory too
+# The leading "./" is required for docker-compose
+export LOGS_DIR=./logs
+mkdir -p $LOGS_DIR
+
+# Export variable for subdirectory with appropriate property files
+# The leading "./" is required for docker-compose
+export PROPS_DIR=./properties_simpledemo
+
+# docker-compose is not in /usr/bin
+/opt/docker/docker-compose down
+/opt/docker/docker-compose up -d