From d96f56a838671424580766beccbe63ad677e4ab8 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Wed, 22 Nov 2017 13:07:43 -0700 Subject: added docker baseimage Issue: IS-34 --- salt/openbook/ci/files/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'salt/openbook/ci/files') diff --git a/salt/openbook/ci/files/build.sh b/salt/openbook/ci/files/build.sh index 77f2a5e..99fadf0 100644 --- a/salt/openbook/ci/files/build.sh +++ b/salt/openbook/ci/files/build.sh @@ -18,7 +18,10 @@ pushd {{ pillar["ci"]["build_dir"] }} 2>/dev/null echo "Login to docker registry" docker login --username {{ pillar["registry"]["username"] }} --password {{ pillar["registry"]["password"] }} {{ pillar["registry"]["url"] }} -if [ "${artifact}" == "database" ]; then +if [ "${artifact}" == "baseimage" ]; then + delete_old_image "{{ pillar["baseimage"]["image_name"] }}" + {{ pillar["baseimage"]["build_dir"] }}/build.sh +elif [ "${artifact}" == "database" ]; then delete_old_image "{{ pillar["database"]["image_name"] }}" {{ pillar["database"]["build_dir"] }}/build.sh elif [ "${artifact}" == "admin-api-server" ]; then @@ -40,6 +43,7 @@ elif [ "${artifact}" == "workflow-server" ]; then delete_old_image "{{ pillar["workflow_server"]["image_name"] }}" {{ pillar["workflow_server"]["build_dir"] }}/build.sh else + delete_old_image "{{ pillar["baseimage"]["image_name"] }}" delete_old_image "{{ pillar["database"]["image_name"] }}" delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}" delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}" @@ -47,6 +51,7 @@ else delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}" delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}" delete_old_image "{{ pillar["workflow_server"]["image_name"] }}" + {{ pillar["baseimage"]["build_dir"] }}/build.sh {{ pillar["database"]["build_dir"] }}/build.sh {{ pillar["admin_api_server"]["build_dir"] }}/build.sh {{ pillar["customer_api_server"]["build_dir"] }}/build.sh -- cgit v1.3