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

diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index 744c4fc9..e7ecfe54 100644
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -3,27 +3,44 @@
 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)
+
+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:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/openecomp/portalapps:$DOCKER_IMAGE_VERSION
 
 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:$DOCKER_IMAGE_VERSION ecompdb:portal
+docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:$DOCKER_IMAGE_VERSION 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
+  if [ -e /opt/config/public_ip.txt ]
+  then
+    IP_ADDRESS=$(cat /opt/config/public_ip.txt)
+  else
+    IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
+  fi
+  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