diff options
Diffstat (limited to 'salt/openbook/job_scheduler_server/files/build.sh')
| -rw-r--r-- | salt/openbook/job_scheduler_server/files/build.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/salt/openbook/job_scheduler_server/files/build.sh b/salt/openbook/job_scheduler_server/files/build.sh index 84b5759..866adae 100644 --- a/salt/openbook/job_scheduler_server/files/build.sh +++ b/salt/openbook/job_scheduler_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["job_scheduler_server"]["container_name"] }} +docker stop {{ pillar["job_scheduler_server"]["container_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} docker container prune -f -docker rmi -f {{ pillar["job_scheduler_server"]["image_name"] }} +docker rmi -f {{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} echo "Building docker Ubuntu image" -docker build -t {{ pillar["job_scheduler_server"]["image_name"] }} . +docker build -t {{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} . echo "Push docker image to the registry" -docker tag {{ pillar["job_scheduler_server"]["image_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} -docker push {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} +docker tag {{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} +docker push {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }}_{{ pillar["job_scheduler_server"]["branch"] }} echo "Cleaning up" rm -rf tmp |