summaryrefslogtreecommitdiff
path: root/salt/openbook/ci/files
diff options
context:
space:
mode:
authorCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-11-22 13:07:43 -0700
committerCarlos Konstanski <ckonstanski@pippiandcarlos.com>2017-11-22 13:07:43 -0700
commitd96f56a838671424580766beccbe63ad677e4ab8 (patch)
treedb6877f763b7aa72f12ec681578e9d53ee088b3b /salt/openbook/ci/files
parent1d12614280fe82454053e2bf381023dcb0c6612c (diff)
added docker baseimage
Issue: IS-34
Diffstat (limited to 'salt/openbook/ci/files')
-rw-r--r--salt/openbook/ci/files/build.sh7
1 files changed, 6 insertions, 1 deletions
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