Choose the correct docker containers to pull at runtime

Issue: IS-80

1 files changed, 5 insertions, 5 deletions

diff --git a/salt/openbook/workflow_server/files/build.sh b/salt/openbook/workflow_server/files/build.sh
index d89c34e..dbb5238 100644
--- a/salt/openbook/workflow_server/files/build.sh
+++ b/salt/openbook/workflow_server/files/build.sh
@@ -16,16 +16,16 @@ echo "Repackaging into .xz file"
 tar Jcvf docker-start.tar.xz -C tmp/ .
 
 echo "Deleting existing docker container"
-docker stop {{ pillar["workflow_server"]["container_name"] }}
+docker stop {{ pillar["workflow_server"]["container_name"] }}_{{ pillar["workflow_server"]["branch"] }}
 docker container prune -f
-docker rmi -f {{ pillar["workflow_server"]["image_name"] }}
+docker rmi -f {{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}
 
 echo "Building docker Ubuntu image"
-docker build -t {{ pillar["workflow_server"]["image_name"] }} .
+docker build -t {{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }} .
 
 echo "Push docker image to the registry"
-docker tag {{ pillar["workflow_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}
-docker push {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}
+docker tag {{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}
+docker push {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }}_{{ pillar["workflow_server"]["branch"] }}
 
 echo "Cleaning up"
 rm -rf tmp