diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a45a74536c561836db7b3b818257997884919af6..e0461657ede0bca88a7c90dc916b1898b8792580 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 99197fbec2d9cea2d282740cde46f254856b54ee..cd9496687127d916b189244629d0640e3f7e7342 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"]