Fix SQL issue in portal_vm_init

[demo.git] / boot / portal_vm_init.sh

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index 744c4fc..05e969f 100644 (file)
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -4,26 +4,36 @@ 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)
 
+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/ecomp/portaldb:1610.3
-docker pull $NEXUS_DOCKER_REPO/ecomp/portalapps:1610.3
+docker pull $NEXUS_DOCKER_REPO/openecomp/portaldb:latest
+docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:latest
 
 docker create --name data_vol_portal -v /var/lib/mysql mariadb
 
-docker tag 6ce6ea8c6e52 ecompdb:portal
-docker tag 925a8a953d4c ep:1610-1
+docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:latest ecompdb:portal
+docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:latest ep:1610-1
 
 docker rm -f ecompdb_portal
 docker rm -f 1610-1
 
+cd portal/deliveries
 ./dbstart.sh
 ./new_start.sh
 
-sleep 60
+sleep 180
 
 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
+  mysql -u root -p'Aa123456' -h $IP_ADDRESS < /opt/portal/deliveries/Apps_Users_OnBoarding_Script.sql
   echo "yes" > /opt/config/boot.txt
-fi
\ No newline at end of file
+fi