From 82a4e72b03b61fcde7244ba199d834cea9849138 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Sat, 10 Mar 2018 12:53:30 -0700 Subject: Choose the correct docker containers to pull at runtime Issue: IS-80 --- salt/openbook/admin_api_server/files/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'salt/openbook/admin_api_server/files/build.sh') diff --git a/salt/openbook/admin_api_server/files/build.sh b/salt/openbook/admin_api_server/files/build.sh index feaaaa1..b42f423 100644 --- a/salt/openbook/admin_api_server/files/build.sh +++ b/salt/openbook/admin_api_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["admin_api_server"]["container_name"] }} +docker stop {{ pillar["admin_api_server"]["container_name"] }}_{{ pillar["admin_api_server"]["branch"] }} docker container prune -f -docker rmi -f {{ pillar["admin_api_server"]["image_name"] }} +docker rmi -f {{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} echo "Building docker Ubuntu image" -docker build -t {{ pillar["admin_api_server"]["image_name"] }} . +docker build -t {{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} . echo "Push docker image to the registry" -docker tag {{ pillar["admin_api_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} -docker push {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} +docker tag {{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} +docker push {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }}_{{ pillar["admin_api_server"]["branch"] }} echo "Cleaning up" rm -rf tmp -- cgit v1.3