From ba12e847eff8ae726c3a612312a6caee95c51971 Mon Sep 17 00:00:00 2001 From: Raj Shah Date: Tue, 2 Aug 2022 01:49:11 +0000 Subject: [PATCH] Remove ldd --- Dockerfile.mayhem | 11 +++-------- Mayhemfile | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile.mayhem b/Dockerfile.mayhem index fc4790eaf..33b9c5817 100644 --- a/Dockerfile.mayhem +++ b/Dockerfile.mayhem @@ -13,14 +13,9 @@ RUN curl -sSL https://get.haskellstack.org/ | sh COPY . /repo WORKDIR /repo/build -RUN cmake .. +RUN cmake .. -DCMAKE_INSTALL_PREFIX=/install RUN make -j8 - -RUN mkdir -p /deps -RUN ldd /repo/build/examples/cpp/core/bf/bf | tr -s '[:blank:]' '\n' | grep '^/' | xargs -I % sh -c 'cp % /deps;' +RUN make install FROM ubuntu:22.04 as package - -COPY --from=builder /deps /deps -COPY --from=builder /repo/build/examples/cpp/core/bf/bf /repo/build/examples/cpp/core/bf/bf -ENV LD_LIBRARY_PATH=/deps +COPY --from=builder /install /install diff --git a/Mayhemfile b/Mayhemfile index c425af17b..6fb966123 100644 --- a/Mayhemfile +++ b/Mayhemfile @@ -2,6 +2,5 @@ project: bond target: bf testsuite: - file://examples/cs/core/blob/schema.bond - cmds: - - cmd: /repo/build/examples/cpp/core/bf/bf @@ + - cmd: /install/bin/bf @@