From 66dc7f98882179bff05ccac8f582589dc3e50d33 Mon Sep 17 00:00:00 2001
From: George Sedov <george.sedov@desy.de>
Date: Wed, 9 Feb 2022 16:08:11 +0100
Subject: [PATCH] fix deps
---
.gitlab-ci.yml | 6 ------
receiver/docker/Dockerfile | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a45a74536..e0461657e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,12 +71,6 @@ build-services-linux-release:
- cd $CI_PROJECT_DIR/build
- cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=ON -DBUILD_CONSUMER_TOOLS=ON -DBUILD_BROKER=ON -DBUILD_INTEGRATION_TESTS=ON -DENABLE_LIBFABRIC=ON -DBUILD_CPP_DOCS=ON -DBUILD_EVENT_MONITOR_PRODUCER=ON -DSTOP_BUILD_ON_WARNINGS=ON -DENABLE_NEW_RECEIVER_MONITORING=ON ..
- make -j 4
- # special treatment for receiver dependencies.
- - 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 --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
rules:
diff --git a/receiver/docker/Dockerfile b/receiver/docker/Dockerfile
index 99197fbec..cd9496687 100644
--- a/receiver/docker/Dockerfile
+++ b/receiver/docker/Dockerfile
@@ -1,7 +1,7 @@
FROM $CI_REGISTRY_IMAGE/asapo-services-linux-build-env:latest
FROM busybox:glibc
-#REPLACE_COPY_LIBS
+COPY --from=0 /usr/lib/x86_64-linux-gnu/*.so* /lib/
COPY receiver /
CMD ["/receiver","/var/lib/receiver/config.json"]
--
GitLab