From: eh552t <eh552t@intl.att.com>
Date: Mon, 4 Sep 2017 14:21:14 +0000 (+0200)
Subject: Don't put tag latest but sed in docker-compose
X-Git-Tag: 1.0.0-Amsterdam~182
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F10231%2F1;p=demo.git

Don't put tag latest but sed in docker-compose

Change-Id: I82de4f3147d2406f73bc07436595ef2933961f4f
Signed-off-by: eh552t <eh552t@intl.att.com>
Issue-Id: CLAMP-47
---

diff --git a/boot/clamp_vm_init.sh b/boot/clamp_vm_init.sh
index abc01e15..f8b26e30 100644
--- a/boot/clamp_vm_init.sh
+++ b/boot/clamp_vm_init.sh
@@ -15,14 +15,16 @@ rm -rf src/
 
 # No configuration change here as directly done in the CLAMP repo
 
-# Pull the clamp docker image from nexus and tag it
+# Pull the clamp docker image from nexus
 # Maria db will be pulled automatically from docker.io during docker-compose
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
 docker pull $NEXUS_DOCKER_REPO/onap/clamp:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/clamp:$DOCKER_IMAGE_VERSION onap/clamp:latest
 
 cd extra/docker/clamp/
 
+# Change the Clamp docker image name in the docker-compose.yml to match the one downloaded
+sed -i "/image: onap\/clamp/c\    image: $NEXUS_DOCKER_REPO\/onap\/clamp:$DOCKER_IMAGE_VERSION" docker-compose.yml
+
 # Start Clamp and MariaDB containers with docker compose and clamp/extra/docker/clamp/docker-compose.yml
 /opt/docker/docker-compose up -d