Add tagging for CLI to match with portal

[demo.git] / boot / portal_vm_init.sh

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
old mode 100644 (file)
new mode 100755 (executable)
index 93fdff2..5b201e0
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -1,39 +1,45 @@
 #!/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)
 
+# Refresh configuration and scripts
 cd /opt/portal
 git pull
-cd /opt
-
-chmod +x portal/deliveries/new_start.sh
-chmod +x portal/deliveries/new_stop.sh
-chmod +x portal/deliveries/dbstart.sh
-unzip -o portal/deliveries/etc.zip -d /PROJECT/OpenSource/UbuntuEP/
-
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/openecomp/portaldb:latest
-docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:latest
+cd deliveries
 
-docker create --name data_vol_portal -v /var/lib/mysql mariadb
+# Get image names used below from docker-compose environment file
+source .env
 
-docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:latest ecompdb:portal
-docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:latest ep:1610-1
+# Copy property files
+ETC=/PROJECT/OpenSource/UbuntuEP/etc
+mkdir -p $ETC
+cp -r properties_rackspace/* $ETC
 
-docker rm -f ecompdb_portal
-docker rm -f 1610-1
-
-cd portal/deliveries
-./dbstart.sh
-./new_start.sh
-
-sleep 60
+# Refresh images
+docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+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
+# Add CLI docker image
+docker pull $NEXUS_DOCKER_REPO/onap/cli:$DOCKER_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
+# Add tagging for CLI docker image as expected by docker-compose file
+docker tag $NEXUS_DOCKER_REPO/onap/cli:$DOCKER_IMAGE_VERSION onap/cli:$PORTAL_TAG
+
+# docker-compose is not in /usr/bin
+/opt/docker/docker-compose down
+/opt/docker/docker-compose up -d
 
-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 < /opt/portal/deliveries/Apps_Users_OnBoarding_Script.sql
-  echo "yes" > /opt/config/boot.txt
-fi