From 2b2a11afba1d2642d2dee507949076e976390047 Mon Sep 17 00:00:00 2001 From: aoiasd <45024769+aoiasd@users.noreply.github.com> Date: Mon, 15 Sep 2025 19:33:59 +0800 Subject: [PATCH] enhance: use fixed vcpkg version for build image (#44378) Signed-off-by: aoiasd --- build/docker/builder/cpu/rockylinux8/Dockerfile | 4 ++-- build/docker/builder/cpu/ubuntu20.04/Dockerfile | 2 +- build/docker/builder/cpu/ubuntu22.04/Dockerfile | 2 +- build/docker/builder/gpu/ubuntu20.04/Dockerfile | 2 +- build/docker/builder/gpu/ubuntu22.04/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/docker/builder/cpu/rockylinux8/Dockerfile b/build/docker/builder/cpu/rockylinux8/Dockerfile index 20dd924e1a..f644bc5055 100644 --- a/build/docker/builder/cpu/rockylinux8/Dockerfile +++ b/build/docker/builder/cpu/rockylinux8/Dockerfile @@ -14,7 +14,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES 1 # install vcpkg 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/2025.06.13.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz # empty the vscpkg toolchains linux.cmake file to avoid the error @@ -53,7 +53,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES 1 # install vcpkg 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/2025.06.13.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz # Copy the vcpkg installed libraries COPY --from=vcpkg-installer /root/.cache/vcpkg /root/.cache/vcpkg diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index 9683caf75c..ea6f8a501f 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -26,7 +26,7 @@ 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 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/2025.06.13.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz ENV VCPKG_FORCE_SYSTEM_BINARIES 1 diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile index e634671dca..4378191f08 100644 --- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile @@ -32,7 +32,7 @@ RUN echo "target arch $TARGETARCH" RUN wget -qO- "https://cmake.org/files/v3.31/cmake-3.31.8-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local 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/2025.06.13.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz ENV VCPKG_FORCE_SYSTEM_BINARIES 1 diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index bff4fb0865..8d4057e5c0 100644 --- a/build/docker/builder/gpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu20.04/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce RUN pip3 install conan==1.64.1 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/2025.06.13.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz ENV VCPKG_FORCE_SYSTEM_BINARIES 1 diff --git a/build/docker/builder/gpu/ubuntu22.04/Dockerfile b/build/docker/builder/gpu/ubuntu22.04/Dockerfile index c7b505314a..5bd2a6937d 100644 --- a/build/docker/builder/gpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu22.04/Dockerfile @@ -22,7 +22,7 @@ RUN curl https://sh.rustup.rs -sSf | \ ENV PATH=/root/.cargo/bin:/usr/local/bin:/usr/local/go/bin:$PATH 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/2025.06.13.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz ENV VCPKG_FORCE_SYSTEM_BINARIES 1 RUN /opt/vcpkg/bootstrap-vcpkg.sh -disableMetrics && ln -s /opt/vcpkg/vcpkg /usr/local/bin/vcpkg && vcpkg version