summaryrefslogtreecommitdiffstats
path: root/boot
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-10-01 22:49:59 -0400
committerMarco Platania <platania@research.att.com>2017-10-01 22:49:59 -0400
commit16fcf6623fc9a1cff66db477d1a700e604ff2465 (patch)
treedaca889c04dfb2cfd882a8cc01d9c2876a9993b8 /boot
parentcad23be5e96ff7c0bbe9c21343f2796d01cdc36f (diff)
Add CLI docker version number
Change-Id: I2b7cb0d8969cd9eb4185b225d913a2b04d2933e9 Issue-ID: INT-213 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'boot')
-rwxr-xr-xboot/portal_vm_init.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index 5b201e09..c58f22f0 100755
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -10,6 +10,7 @@ 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)
+CLI_DOCKER_VERSION=$(cat /opt/config/cli_docker_version.txt)
# Refresh configuration and scripts
cd /opt/portal
@@ -30,14 +31,14 @@ 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
+docker pull $NEXUS_DOCKER_REPO/onap/cli:$CLI_DOCKER_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 tag $NEXUS_DOCKER_REPO/onap/cli:$CLI_DOCKER_VERSION onap/cli:$PORTAL_TAG
# docker-compose is not in /usr/bin
/opt/docker/docker-compose down