diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-09 15:09:19 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-11-09 15:09:19 -0700 |
| commit | 8c238d558b8bca11cab5a0fb0989dca288e09063 (patch) | |
| tree | b4e4ceb0e753d9ee2d68e7b5da09fcd43f02b15c /salt | |
| parent | 49cd44798adb6e0e49063a13dbcca383b52cb53a (diff) | |
Openbook CI: autoclean docker registry
Closes-Bug: OB-1089
Diffstat (limited to 'salt')
| -rw-r--r-- | salt/openbook/ci/files/build.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/salt/openbook/ci/files/build.sh b/salt/openbook/ci/files/build.sh index 0b8df0d..c9a78bc 100644 --- a/salt/openbook/ci/files/build.sh +++ b/salt/openbook/ci/files/build.sh @@ -20,34 +20,34 @@ echo "Login to docker registry" docker login --username {{ pillar["registry"]["username"] }} --password {{ pillar["registry"]["password"] }} {{ pillar["registry"]["url"] }} if [ "${artifact}" == "database" ]; then - delete_old_image("{{ pillar["database"]["image_name"] }}") + delete_old_image "{{ pillar["database"]["image_name"] }}" {{ pillar["database"]["build_dir"] }}/build.sh elif [ "${artifact}" == "admin-api-server" ]; then - delete_old_image("{{ pillar["admin_api_server"]["image_name"] }}") + delete_old_image "{{ pillar["admin_api_server"]["image_name"] }}" {{ pillar["admin_api_server"]["build_dir"] }}/build.sh elif [ "${artifact}" == "customer-api-server" ]; then - delete_old_image("{{ pillar["customer_api_server"]["image_name"] }}") + delete_old_image "{{ pillar["customer_api_server"]["image_name"] }}" {{ pillar["customer_api_server"]["build_dir"] }}/build.sh elif [ "${artifact}" == "admin-web-ui" ]; then - delete_old_image("{{ pillar["admin_web_ui"]["image_name"] }}") + delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}" {{ pillar["admin_web_ui"]["build_dir"] }}/build.sh elif [ "${artifact}" == "customer-web-ui" ]; then - delete_old_image("{{ pillar["customer_web_ui"]["image_name"] }}") + delete_old_image "{{ pillar["customer_web_ui"]["image_name"] }}" {{ pillar["customer_web_ui"]["build_dir"] }}/build.sh elif [ "${artifact}" == "job-scheduler-server" ]; then - delete_old_image("{{ pillar["job_scheduler_server"]["image_name"] }}") + delete_old_image "{{ pillar["job_scheduler_server"]["image_name"] }}" {{ pillar["job_scheduler_server"]["build_dir"] }}/build.sh elif [ "${artifact}" == "workflow-server" ]; then - delete_old_image("{{ pillar["workflow_server"]["image_name"] }}") + delete_old_image "{{ pillar["workflow_server"]["image_name"] }}" {{ pillar["workflow_server"]["build_dir"] }}/build.sh else - 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"] }}") - delete_old_image("{{ pillar["admin_web_ui"]["image_name"] }}") - 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"] }}") + 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"] }}" + delete_old_image "{{ pillar["admin_web_ui"]["image_name"] }}" + 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["database"]["build_dir"] }}/build.sh {{ pillar["admin_api_server"]["build_dir"] }}/build.sh {{ pillar["customer_api_server"]["build_dir"] }}/build.sh |
