admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: [2.6] Bump go version to 1.24.6 with image builder (#44763)

Browse Source 
Cherry-pick from master
pr: #44739 #44757
Fixing CVE-2025-47907

---------

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2025-10-11 16:35:57 +08:00 committed by GitHub
parent fc6fe6e3bd
commit e469e89d83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env
View File

@ -5,11 +5,11 @@ IMAGE_ARCH=amd64
OS_NAME=ubuntu22.04 OS_NAME=ubuntu22.04
# for services.builder.image in docker-compose.yml # for services.builder.image in docker-compose.yml
DATE_VERSION=20250915-2b2a11a DATE_VERSION=20251011-78b266a
LATEST_DATE_VERSION=20250915-2b2a11a LATEST_DATE_VERSION=20251011-78b266a
# for services.gpubuilder.image in docker-compose.yml # for services.gpubuilder.image in docker-compose.yml
GPU_DATE_VERSION=20250915-2b2a11a GPU_DATE_VERSION=20251011-78b266a
LATEST_GPU_DATE_VERSION=20250915-2b2a11a LATEST_GPU_DATE_VERSION=20251011-78b266a
# for other services in docker-compose.yml # for other services in docker-compose.yml
MINIO_ADDRESS=minio:9000 MINIO_ADDRESS=minio:9000

2
.github/workflows/mac.yaml vendored
View File

@ -61,7 +61,7 @@ jobs:
- name: Setup Go environment - name: Setup Go environment
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
go-version: '1.24.4' go-version: '1.24.6'
- name: Download Caches - name: Download Caches
uses: ./.github/actions/macos-cache-restore uses: ./.github/actions/macos-cache-restore
- name: Code Check - name: Code Check

2
build/docker/builder/cpu/amazonlinux2023/Dockerfile
View File

@ -22,7 +22,7 @@ ENV GOPATH /go
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go
ENV GO111MODULE on ENV GO111MODULE on
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.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.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \
go clean --modcache && \ go clean --modcache && \
chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)

2
build/docker/builder/cpu/rockylinux8/Dockerfile
View File

@ -27,7 +27,7 @@ RUN dnf -y update && \
RUN pip3 install conan==1.64.1 RUN pip3 install conan==1.64.1
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.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.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.89 -y sh -s -- --default-toolchain=1.89 -y

2
build/docker/builder/cpu/ubuntu20.04/Dockerfile
View File

@ -30,7 +30,7 @@ ENV GOPATH /go
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go
ENV GO111MODULE on ENV GO111MODULE on
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.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.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \
go clean --modcache && \ go clean --modcache && \
chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)

2
build/docker/builder/cpu/ubuntu22.04/Dockerfile
View File

@ -36,7 +36,7 @@ ENV GOPATH /go
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go
ENV GO111MODULE on ENV GO111MODULE on
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.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.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ mkdir -p "$GOPATH/src" "$GOPATH/bin" && \
go clean --modcache && \ go clean --modcache && \
chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)

2
build/docker/builder/gpu/ubuntu20.04/Dockerfile
View File

@ -41,7 +41,7 @@ ENV GOPATH /go
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go
ENV GO111MODULE on ENV GO111MODULE on
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.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.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
mkdir -p "$GOPATH/src" "$GOPATH/bin" && \ 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 && \ 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 && \ # export GO111MODULE=on && go get github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.2.1 && \

2
build/docker/builder/gpu/ubuntu22.04/Dockerfile
View File

@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
# Install go # Install go
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.24.4.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.6.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go
# Install conan # Install conan
RUN pip3 install conan==1.64.1 RUN pip3 install conan==1.64.1
# Install rust # Install rust

2
client/README.md
View File

@ -10,7 +10,7 @@ Go MilvusClient for [Milvus](https://github.com/milvus-io/milvus). To contribute
### Prerequisites ### Prerequisites
Go 1.24.4 or higher Go 1.24.6 or higher
### Install Milvus Go SDK ### Install Milvus Go SDK

2
client/go.mod
View File

@ -1,6 +1,6 @@
module github.com/milvus-io/milvus/client/v2 module github.com/milvus-io/milvus/client/v2
go 1.24.4 go 1.24.6
require ( require (
github.com/blang/semver/v4 v4.0.0 github.com/blang/semver/v4 v4.0.0

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/milvus-io/milvus module github.com/milvus-io/milvus
go 1.24.4 go 1.24.6
require ( require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1

2
pkg/go.mod
View File

@ -1,6 +1,6 @@
module github.com/milvus-io/milvus/pkg/v2 module github.com/milvus-io/milvus/pkg/v2
go 1.24.4 go 1.24.6
require ( require (
cloud.google.com/go/storage v1.50.0 cloud.google.com/go/storage v1.50.0

2
tests/go_client/Dockerfile
View File

@ -1,4 +1,4 @@
FROM golang:1.24.4 as builder FROM golang:1.24.6 as builder
# Define a build argument with an empty default value # Define a build argument with an empty default value
ARG CUSTOM_GOPROXY="" ARG CUSTOM_GOPROXY=""

2
tests/go_client/go.mod
View File

@ -1,6 +1,6 @@
module github.com/milvus-io/milvus/tests/go_client module github.com/milvus-io/milvus/tests/go_client
go 1.24.4 go 1.24.6
require ( require (
github.com/milvus-io/milvus/client/v2 v2.0.0-20241125024034-0b9edb62a92d github.com/milvus-io/milvus/client/v2 v2.0.0-20241125024034-0b9edb62a92d