From 0d54e37082e702e024f19bae1f45343389ee3b4e Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Sat, 13 Dec 2025 23:57:39 +0800 Subject: [PATCH] enhance: [2.5] Bump go version to 1.24.11 fixing CVE Signed-off-by: zhenshan.cao --- .env | 8 ++++---- .github/workflows/mac.yaml | 2 +- build/docker/builder/cpu/amazonlinux2023/Dockerfile | 2 +- build/docker/builder/cpu/rockylinux8/Dockerfile | 2 +- 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 +- client/README.md | 2 +- client/go.mod | 2 +- go.mod | 2 +- pkg/go.mod | 2 +- tests/go_client/Dockerfile | 2 +- tests/go_client/go.mod | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.env b/.env index 994feb3d47..0b9f124013 100644 --- a/.env +++ b/.env @@ -5,11 +5,11 @@ IMAGE_ARCH=amd64 OS_NAME=ubuntu22.04 # for services.builder.image in docker-compose.yml -DATE_VERSION=20250508-f0451d2 -LATEST_DATE_VERSION=20250508-f0451d2 +DATE_VERSION=20251203-0171511 +LATEST_DATE_VERSION=20251203-0171511 # for services.gpubuilder.image in docker-compose.yml -GPU_DATE_VERSION=20250509-3a7b2fe -LATEST_GPU_DATE_VERSION=20250509-3a7b2fe +GPU_DATE_VERSION=20251203-0171511 +LATEST_GPU_DATE_VERSION=20251203-0171511 # for other services in docker-compose.yml MINIO_ADDRESS=minio:9000 diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml index cd1fb5595b..173e7ad99e 100644 --- a/.github/workflows/mac.yaml +++ b/.github/workflows/mac.yaml @@ -45,7 +45,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@v2.2.0 with: - go-version: '~1.21.11' + go-version: '~1.24.11' - name: Download Caches uses: ./.github/actions/macos-cache-restore - name: Code Check diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index 6eb7541374..754a7bebf1 100644 --- a/build/docker/builder/cpu/amazonlinux2023/Dockerfile +++ b/build/docker/builder/cpu/amazonlinux2023/Dockerfile @@ -22,7 +22,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ go clean --modcache && \ chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) diff --git a/build/docker/builder/cpu/rockylinux8/Dockerfile b/build/docker/builder/cpu/rockylinux8/Dockerfile index 166fa71f71..7e4e58b485 100644 --- a/build/docker/builder/cpu/rockylinux8/Dockerfile +++ b/build/docker/builder/cpu/rockylinux8/Dockerfile @@ -43,7 +43,7 @@ RUN dnf -y update && \ RUN pip3 install conan==1.64.1 -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go RUN curl https://sh.rustup.rs -sSf | \ sh -s -- --default-toolchain=1.83 -y diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index addd8d6bcc..4194c8b97e 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -40,7 +40,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ go clean --modcache && \ chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile index 028553b7b3..66ac3bf24f 100644 --- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile @@ -46,7 +46,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ go clean --modcache && \ chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index c266eba119..d6b54b9e2a 100644 --- a/build/docker/builder/gpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu20.04/Dockerfile @@ -51,7 +51,7 @@ ENV GOPATH /go ENV GOROOT /usr/local/go ENV GO111MODULE on ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOROOT}/bin v1.46.2 && \ # export GO111MODULE=on && go get github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.2.1 && \ diff --git a/build/docker/builder/gpu/ubuntu22.04/Dockerfile b/build/docker/builder/gpu/ubuntu22.04/Dockerfile index be3c387ac1..ab430a52af 100644 --- a/build/docker/builder/gpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu22.04/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce # Install go -RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go +RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.11.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go # Install conan RUN pip3 install conan==1.64.1 # Install rust diff --git a/client/README.md b/client/README.md index 61f29b7814..2dd9d5d241 100644 --- a/client/README.md +++ b/client/README.md @@ -10,7 +10,7 @@ Go MilvusClient for [Milvus](https://github.com/milvus-io/milvus). To contribute ### Prerequisites -Go 1.21 or higher +Go 1.24.11 or higher ### Install Milvus Go SDK diff --git a/client/go.mod b/client/go.mod index c6a602408f..8473154af4 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus/client/v2 -go 1.24.2 +go 1.24.11 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/go.mod b/go.mod index 7cce26f43d..86d7b333ec 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus -go 1.24.2 +go 1.24.11 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 diff --git a/pkg/go.mod b/pkg/go.mod index 90975f04fa..d85013dd1c 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus/pkg/v2 -go 1.24.2 +go 1.24.11 require ( github.com/apache/pulsar-client-go v0.6.1-0.20210728062540-29414db801a7 diff --git a/tests/go_client/Dockerfile b/tests/go_client/Dockerfile index 2635ed1007..d1259d4489 100644 --- a/tests/go_client/Dockerfile +++ b/tests/go_client/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.2 as builder +FROM golang:1.24.11 as builder # Define a build argument with an empty default value ARG CUSTOM_GOPROXY="" diff --git a/tests/go_client/go.mod b/tests/go_client/go.mod index 090db5a363..edb98b65ce 100644 --- a/tests/go_client/go.mod +++ b/tests/go_client/go.mod @@ -1,6 +1,6 @@ module github.com/milvus-io/milvus/tests/go_client -go 1.24.2 +go 1.24.11 require ( github.com/milvus-io/milvus/client/v2 v2.0.0-20241125024034-0b9edb62a92d