From 637ea95b04ed9867825f03785ac2a955dfcebf91 Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Wed, 9 Feb 2022 15:11:41 +0100
Subject: [PATCH] fix receiver deps
---
.gitlab-ci.yml | 2 +-
receiver/docker/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abdba0583..a45a74536 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ build-services-linux-release:
- KAFKA_LIBS=$(dpkg -L librdkafka-dev | grep "\.so")
- FABRIC_LIBS=$(dpkg -L libfabric-dev | grep "\.so")
- CURL_LIBS=$(dpkg -L libcurl4-openssl-dev | grep "\.so")
- - DEPENDENCIES=$(printf "${KAFKA_LIBS}\n${FABRIC_LIBS}\n${CURL_LIBS}" | sed -e 's/\/\(.\+\)\/\(.\+\)/COPY \/\1\/\2 \/lib\/\2/g' | awk '{printf "%s\\n", $0}')
+ - DEPENDENCIES=$(printf "${KAFKA_LIBS}\n${FABRIC_LIBS}\n${CURL_LIBS}" | sed -e 's/\/\(.\+\)\/\(.\+\)/COPY --from=0 \/\1\/\2 \/lib\/\2/g' | awk '{printf "%s\\n", $0}')
- sed -e "s|#REPLACE_COPY_LIBS|${DEPENDENCIES}|g" -i $CI_PROJECT_DIR/build/receiver/Dockerfile
tags:
- kubernetes-executor
diff --git a/receiver/docker/Dockerfile b/receiver/docker/Dockerfile
index c604d9473..99197fbec 100644
--- a/receiver/docker/Dockerfile
+++ b/receiver/docker/Dockerfile
@@ -1,7 +1,7 @@
FROM $CI_REGISTRY_IMAGE/asapo-services-linux-build-env:latest
-#REPLACE_COPY_LIBS
FROM busybox:glibc
+#REPLACE_COPY_LIBS
COPY receiver /
CMD ["/receiver","/var/lib/receiver/config.json"]
--
GitLab