From acaac7cf3f42b71abe03fe781b276596f3b54b9e Mon Sep 17 00:00:00 2001 From: mu <59917266+4eUeP@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:22:01 +0800 Subject: [PATCH] tmp --- Dockerfile | 8 +++++--- checksum/haskell.sha256sum | 2 +- checksum/hsthrift.sha256sum | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 301651f..6ca832d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,13 +48,15 @@ COPY --from=ghcr.io/hstreamdb/grpc:1.54.2 /usr/local/lib/ /usr/local/lib/ COPY requirements/ /tmp/requirements/ RUN apt-get update && \ DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \ - $(cat /tmp/requirements/ubuntu-jammy.txt) && \ + $(cat /tmp/requirements/ubuntu-jammy.txt) libjemalloc2 && \ rm -rf /tmp/requirements && rm -rf /var/lib/apt/lists/* && apt-get clean COPY --from=ld_client /usr/local/lib/ /usr/local/lib/ COPY --from=ld_client /usr/local/include/ /usr/local/include/ -COPY --from=ld_client /usr/lib/libjemalloc.so.2 /usr/lib/ -RUN ln -sr /usr/lib/libjemalloc.so.2 /usr/lib/libjemalloc.so && \ +# COPY --from=ld_client /usr/lib/libjemalloc.so.2 /usr/lib/ + +# ln -sr /usr/lib/libjemalloc.so.2 /usr/lib/libjemalloc.so && \ +RUN \ [ -f "/usr/local/include/thrift/lib/thrift/gen-cpp2/RpcMetadata_types.h" ] && \ # temporary fix of "cabal build --enable-profiling" \ sed -i '/^#pragma once/a #ifdef PROFILING\n#undef PROFILING\n#endif' /usr/local/include/thrift/lib/thrift/gen-cpp2/RpcMetadata_types.h diff --git a/checksum/haskell.sha256sum b/checksum/haskell.sha256sum index 003fd77..5594cc0 100644 --- a/checksum/haskell.sha256sum +++ b/checksum/haskell.sha256sum @@ -1 +1 @@ -20c40e1d008514b1a89c59e1678cc41a5429c89eea1c7800e6d169dd7fb7ba4d Dockerfile +ae3e58033011f2bcc0ed71368ba191b6f911460be3f56f0e84fd075df16c8527 Dockerfile diff --git a/checksum/hsthrift.sha256sum b/checksum/hsthrift.sha256sum index d61255e..ec37659 100644 --- a/checksum/hsthrift.sha256sum +++ b/checksum/hsthrift.sha256sum @@ -1 +1 @@ -1f9e2b93c70d58a9910ff58429327ac09500898fcf7eef14c7d7fd5e0f236da5 dockerfiles/hsthrift +f9e2b93c70d58a9910ff58429327ac09500898fcf7eef14c7d7fd5e0f236da5 dockerfiles/hsthrift