From b5c4eb2a5a7123fcebfe05040f4d95827fe308e6 Mon Sep 17 00:00:00 2001 From: LinZexiao <55120714+LinZexiao@users.noreply.github.com> Date: Fri, 15 Jul 2022 17:31:25 +0800 Subject: [PATCH] chore: venus docker : docker move copying ddl to the stage when runtime was built (#5092) * feat: add ddl when runtime was build --- docker/venus-runtime.dockerfile | 15 +++++++++++++++ dockerfile | 13 ------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/docker/venus-runtime.dockerfile b/docker/venus-runtime.dockerfile index efd6b84b7b..c81af5abbe 100644 --- a/docker/venus-runtime.dockerfile +++ b/docker/venus-runtime.dockerfile @@ -13,3 +13,18 @@ RUN ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime \ # set charset ENV LANG C.UTF-8 + + +# copy ddl +COPY --from=filvenus/venus-buildenv /usr/lib/x86_64-linux-gnu/libhwloc.so.15 \ + /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 \ + /lib/x86_64-linux-gnu/libgcc_s.so.1 \ + /lib/x86_64-linux-gnu/libutil.so.1 \ + /lib/x86_64-linux-gnu/librt.so.1 \ + /lib/x86_64-linux-gnu/libpthread.so.0 \ + /lib/x86_64-linux-gnu/libm.so.6 \ + /lib/x86_64-linux-gnu/libdl.so.2 \ + /lib/x86_64-linux-gnu/libc.so.6 \ + /usr/lib/x86_64-linux-gnu/libnuma.so.1 \ + /usr/lib/x86_64-linux-gnu/libltdl.so.7 \ + /lib/ diff --git a/dockerfile b/dockerfile index d7e8f23401..92fc6c0bb7 100644 --- a/dockerfile +++ b/dockerfile @@ -14,19 +14,6 @@ WORKDIR /app COPY --from=buildenv /go/venus/venus /app/venus COPY ./docker/script /script -# copy ddl -COPY --from=buildenv /usr/lib/x86_64-linux-gnu/libhwloc.so.15 \ - /usr/lib/x86_64-linux-gnu/libOpenCL.so.1 \ - /lib/x86_64-linux-gnu/libgcc_s.so.1 \ - /lib/x86_64-linux-gnu/libutil.so.1 \ - /lib/x86_64-linux-gnu/librt.so.1 \ - /lib/x86_64-linux-gnu/libpthread.so.0 \ - /lib/x86_64-linux-gnu/libm.so.6 \ - /lib/x86_64-linux-gnu/libdl.so.2 \ - /lib/x86_64-linux-gnu/libc.so.6 \ - /usr/lib/x86_64-linux-gnu/libnuma.so.1 \ - /usr/lib/x86_64-linux-gnu/libltdl.so.7 \ - /lib/ EXPOSE 3453 ENTRYPOINT ["/app/venus","daemon"]