From 4651f89944aa8c649e5765340e0e35f89e9a431b Mon Sep 17 00:00:00 2001 From: Jiquan Long Date: Tue, 12 Dec 2023 22:10:41 +0800 Subject: [PATCH] enhance: specify version while rust-init (#29108) This will reduce the size of builder image. /kind improvement --------- Signed-off-by: longjiquan --- build/docker/builder/cpu/amazonlinux2023/Dockerfile | 7 +++---- build/docker/builder/cpu/ubuntu20.04/Dockerfile | 4 +--- build/docker/builder/gpu/ubuntu20.04/Dockerfile | 4 +--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index 77702309c4..cedc3d9396 100644 --- a/build/docker/builder/cpu/amazonlinux2023/Dockerfile +++ b/build/docker/builder/cpu/amazonlinux2023/Dockerfile @@ -23,8 +23,9 @@ RUN pip3 install conan==1.61.0 RUN echo "target arch $TARGETARCH" RUN wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local +# https://github.com/microsoft/vcpkg/pull/35084 RUN mkdir /opt/vcpkg && \ - wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ + wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/refs/tags/2023.11.20.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz ENV VCPKG_FORCE_SYSTEM_BINARIES 1 @@ -48,11 +49,9 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \ COPY --chown=0:0 build/docker/builder/entrypoint.sh / RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain stable -y + sh -s -- --default-toolchain=1.73 -y ENV PATH=/root/.cargo/bin:$PATH -RUN rustup install 1.73 && rustup default 1.73 - ENTRYPOINT [ "/entrypoint.sh" ] CMD ["tail", "-f", "/dev/null"] diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index b9d2f45697..2a0d735117 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -53,11 +53,9 @@ RUN mkdir -p /home/milvus/.vscode-server/extensions \ COPY --chown=0:0 build/docker/builder/entrypoint.sh / RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain stable -y + sh -s -- --default-toolchain=1.73 -y ENV PATH=/root/.cargo/bin:$PATH -RUN rustup install 1.73 && rustup default 1.73 - ENTRYPOINT [ "/entrypoint.sh" ] CMD ["tail", "-f", "/dev/null"] diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index 4ab54fba49..a9fc65f3a8 100644 --- a/build/docker/builder/gpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu20.04/Dockerfile @@ -87,11 +87,9 @@ RUN wget -O /tini https://github.com/krallin/tini/releases/download/v0.19.0/tini chmod +x /tini RUN curl https://sh.rustup.rs -sSf | \ - sh -s -- --default-toolchain stable -y + sh -s -- --default-toolchain=1.73 -y ENV PATH=/root/.cargo/bin:$PATH -RUN rustup install 1.73 && rustup default 1.73 - ENTRYPOINT [ "/tini", "--", "autouseradd", "--user", "milvus", "--", "/entrypoint.sh" ] CMD ["tail", "-f", "/dev/null"]