From d58ba75095368476528078ce55254f5f0fe7dd0d Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Wed, 9 Feb 2022 11:46:11 +0100
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 731135b7d..f137788cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,12 +95,26 @@ build-services-docker:
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - services="broker authorizer discovery receiver file-transfer"
-    - >
-      for service in $services; do
-          service_dir=${service//"-"/"_"}
-          if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
-          IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
-      done
+    - service="broker"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="authorizer"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="discovery"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="receiver"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
+    - service="file-transfer"
+    - service_dir=${service//"-"/"_"}
+    - if [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]]; then DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies); else DEPENDENCY_LIBS=''; fi
+    - IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/build/${service_dir} --dockerfile $CI_PROJECT_DIR/build/${service_dir}/Dockerfile --destination $CI_REGISTRY_IMAGE/asapo-dev-${service}:${CI_COMMIT_SHORT_SHA} --build-args "CI_REGISTRY_IMAGE='${CI_REGISTRY_IMAGE}'" --build-args "DEPENDENCY_LIBS='${DEPENDENCY_LIBS}'"
   tags:
     - kubernetes-executor
   rules:
-- 
GitLab