From 80c37469debe5ae2665b5a4dffd8da918e2bb5ec Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Tue, 8 Feb 2022 21:38:37 +0100
Subject: [PATCH] fix folders
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 357265880..8b43b755b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ build-services-linux-release:
# special treatment for receiver dependencies.
- KAFKA_LIBS=$(dpkg -L librdkafka-dev | grep "\.so")
- FABRIC_LIBS=$(dpkg -L libfabric-dev | grep "\.so")
- - printf "${KAFKA_LIBS}\n${FABRIC_LIBS}" > $CI_PROJECT_DIR/build/receiver/docker/dependencies
+ - printf "${KAFKA_LIBS}\n${FABRIC_LIBS}" > $CI_PROJECT_DIR/build/receiver/dependencies
tags:
- kubernetes-executor
rules:
@@ -100,8 +100,8 @@ build-services-docker:
do
service_dir=${service//"-"/"_"}
# read the dependency list if exists
- [[ -f $CI_PROJECT_DIR/${service_dir}/docker/dependencies ]] && DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/${service_dir}/docker/dependencies) || DEPENDENCY_LIBS=''
- IFS='' /kaniko/executor --cache=false --context $CI_PROJECT_DIR/${service_dir}/docker --dockerfile $CI_PROJECT_DIR/${service_dir}/docker/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}'"
+ [[ -f $CI_PROJECT_DIR/build/${service_dir}/dependencies ]] && DEPENDENCY_LIBS=$(<$CI_PROJECT_DIR/build/${service_dir}/dependencies) || DEPENDENCY_LIBS=''
+ 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
tags:
- kubernetes-executor
--
GitLab