From bf5677714569dbe126fb201a1e937f1b41372245 Mon Sep 17 00:00:00 2001 From: Dylan Brasseur Date: Wed, 13 Sep 2023 16:59:35 +0200 Subject: [PATCH] Fixed missing file in docker --- packages/cpp/tools/Dockerfile.worker | 1 + packages/cpp/tools/packaging/deb.Dockerfile | 1 + packages/cpp/tools/packaging/ubi7.Dockerfile | 2 ++ 3 files changed, 4 insertions(+) diff --git a/packages/cpp/tools/Dockerfile.worker b/packages/cpp/tools/Dockerfile.worker index 287dae88b..66b02ce54 100644 --- a/packages/cpp/tools/Dockerfile.worker +++ b/packages/cpp/tools/Dockerfile.worker @@ -38,6 +38,7 @@ COPY ./packages/cpp/ArmoniK.Api.Common ./ArmoniK.Api.Common COPY ./packages/cpp/ArmoniK.Api.Worker ./ArmoniK.Api.Worker COPY ./packages/cpp/ArmoniK.Api.Worker.Tests ./ArmoniK.Api.Worker.Tests COPY ./packages/cpp/CMakeLists.txt ./ +COPY ./packages/cpp/Dependencies.cmake ./ # Copy the Protocol Buffer definition files into the image WORKDIR /app/proto diff --git a/packages/cpp/tools/packaging/deb.Dockerfile b/packages/cpp/tools/packaging/deb.Dockerfile index 51b27b5c3..d18b14d03 100644 --- a/packages/cpp/tools/packaging/deb.Dockerfile +++ b/packages/cpp/tools/packaging/deb.Dockerfile @@ -17,6 +17,7 @@ COPY packages/cpp/ArmoniK.Api.Client/. ./ArmoniK.Api.Client/ COPY packages/cpp/ArmoniK.Api.Worker/. ./ArmoniK.Api.Worker/ COPY packages/cpp/CMakeLists.txt . COPY packages/cpp/Packaging.cmake . +COPY packages/cpp/Dependencies.cmake . WORKDIR /app/libarmonik/build RUN cmake -DBUILD_SHARED_LIBS=ON -DBUILD_CLIENT:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_WORKER:BOOL=ON -DPROTO_FILES_DIR=/app/libarmonik/Protos -DCPACK_GENERATOR=DEB .. && make package -j && make clean diff --git a/packages/cpp/tools/packaging/ubi7.Dockerfile b/packages/cpp/tools/packaging/ubi7.Dockerfile index 58df393e3..a185637cd 100644 --- a/packages/cpp/tools/packaging/ubi7.Dockerfile +++ b/packages/cpp/tools/packaging/ubi7.Dockerfile @@ -28,6 +28,8 @@ COPY packages/cpp/ArmoniK.Api.Client/. ./ArmoniK.Api.Client/. COPY packages/cpp/ArmoniK.Api.Worker/. ./ArmoniK.Api.Worker/. COPY packages/cpp/CMakeLists.txt . COPY packages/cpp/Packaging.cmake . +COPY packages/cpp/Dependencies.cmake . + WORKDIR /rpm/build RUN cmake -DBUILD_SHARED_LIBS=ON -DBUILD_CLIENT:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_WORKER:BOOL=ON -DPROTO_FILES_DIR=/rpm/Protos -DCPACK_GENERATOR=RPM -DCMAKE_PREFIX_PATH=/usr/local/grpc .. && make package -j ENTRYPOINT ["bash"]