From 595aeae0f1af8f2b4e9b080fb97bf15a1f7d67b0 Mon Sep 17 00:00:00 2001 From: sthuang <167743503+shaoting-huang@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:28:26 +0800 Subject: [PATCH] enhance: upgrade go version to 1.21.11 (#35258) issue: https://github.com/milvus-io/milvus/issues/35142 related pr in master: https://github.com/milvus-io/milvus/pull/35257 Signed-off-by: shaoting-huang --- .github/workflows/mac.yaml | 2 +- DEVELOPMENT.md | 4 ++-- build/docker/builder/cpu/amazonlinux2023/Dockerfile | 4 ++-- build/docker/builder/cpu/rockylinux8/Dockerfile | 10 +++++----- build/docker/builder/cpu/ubuntu20.04/Dockerfile | 4 ++-- build/docker/builder/cpu/ubuntu22.04/Dockerfile | 4 ++-- build/docker/builder/gpu/ubuntu20.04/Dockerfile | 4 ++-- build/docker/builder/gpu/ubuntu22.04/Dockerfile | 4 ++-- build/docker/meta-migration/builder/Dockerfile | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml index adc748fdc6..13ea053023 100644 --- a/.github/workflows/mac.yaml +++ b/.github/workflows/mac.yaml @@ -56,7 +56,7 @@ jobs: - name: Setup Go environment uses: actions/setup-go@v2.2.0 with: - go-version: '~1.21.10' + go-version: '~1.21.11' - name: Mac Cache Go Mod Volumes uses: actions/cache@v3 with: diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 7e436a25af..00030b41be 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -239,8 +239,8 @@ pip3 install conan==1.64.1 #### Install GO 1.80 ```bash -wget https://go.dev/dl/go1.21.10.linux-arm64.tar.gz -tar zxf go1.21.10.linux-arm64.tar.gz +wget https://go.dev/dl/go1.21.11.linux-arm64.tar.gz +tar zxf go1.21.11.linux-arm64.tar.gz mv ./go /usr/local vi /etc/profile export PATH=$PATH:/usr/local/go/bin diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index 27844e1ba9..82b1f7a60e 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.10.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.21.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) @@ -52,7 +52,7 @@ RUN mkdir /tmp/ccache && cd /tmp/ccache &&\ # refer: https://code.visualstudio.com/docs/remote/containers-advanced#_avoiding-extension-reinstalls-on-container-rebuild RUN mkdir -p /home/milvus/.vscode-server/extensions \ - /home/milvus/.vscode-server-insiders/extensions \ + /home/milvus/.vscode-server-insiders/extensions \ && chmod -R 777 /home/milvus COPY --chown=0:0 build/docker/builder/entrypoint.sh / diff --git a/build/docker/builder/cpu/rockylinux8/Dockerfile b/build/docker/builder/cpu/rockylinux8/Dockerfile index 85c2768e5e..44a75517de 100644 --- a/build/docker/builder/cpu/rockylinux8/Dockerfile +++ b/build/docker/builder/cpu/rockylinux8/Dockerfile @@ -1,8 +1,8 @@ FROM rockylinux/rockylinux:8 as vcpkg-installer RUN dnf -y install curl wget tar zip unzip git \ - gcc gcc-c++ make cmake \ - perl-IPC-Cmd perl-Digest-SHA + gcc gcc-c++ make cmake \ + perl-IPC-Cmd perl-Digest-SHA # install ninjia RUN dnf -y update && \ @@ -32,8 +32,8 @@ FROM rockylinux/rockylinux:8 ARG TARGETARCH RUN dnf install -y make cmake automake gcc gcc-c++ curl zip unzip tar git which \ - libaio libuuid-devel wget python3 python3-pip \ - pkg-config perl-IPC-Cmd perl-Digest-SHA libatomic libtool + libaio libuuid-devel wget python3 python3-pip \ + pkg-config perl-IPC-Cmd perl-Digest-SHA libatomic libtool # install openblas-devel texinfo ninja RUN dnf -y update && \ @@ -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.10.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.21.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.73 -y diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index 1b37e09dc3..62cdf7ac61 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -40,14 +40,14 @@ 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.10.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.21.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) # refer: https://code.visualstudio.com/docs/remote/containers-advanced#_avoiding-extension-reinstalls-on-container-rebuild RUN mkdir -p /home/milvus/.vscode-server/extensions \ - /home/milvus/.vscode-server-insiders/extensions \ + /home/milvus/.vscode-server-insiders/extensions \ && chmod -R 777 /home/milvus COPY --chown=0:0 build/docker/builder/entrypoint.sh / diff --git a/build/docker/builder/cpu/ubuntu22.04/Dockerfile b/build/docker/builder/cpu/ubuntu22.04/Dockerfile index 07d68e6175..7802c97519 100644 --- a/build/docker/builder/cpu/ubuntu22.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu22.04/Dockerfile @@ -46,14 +46,14 @@ 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.10.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.21.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) # refer: https://code.visualstudio.com/docs/remote/containers-advanced#_avoiding-extension-reinstalls-on-container-rebuild RUN mkdir -p /home/milvus/.vscode-server/extensions \ - /home/milvus/.vscode-server-insiders/extensions \ + /home/milvus/.vscode-server-insiders/extensions \ && chmod -R 777 /home/milvus COPY --chown=0:0 build/docker/builder/entrypoint.sh / diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index 36585dca7c..ddeab775ac 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.10.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.21.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 && \ @@ -74,7 +74,7 @@ RUN echo 'root:root' | chpasswd # refer: https://code.visualstudio.com/docs/remote/containers-advanced#_avoiding-extension-reinstalls-on-container-rebuild RUN mkdir -p /home/milvus/.vscode-server/extensions \ - /home/milvus/.vscode-server-insiders/extensions \ + /home/milvus/.vscode-server-insiders/extensions \ && chmod -R 777 /home/milvus COPY --chown=0:0 build/docker/builder/entrypoint.sh / diff --git a/build/docker/builder/gpu/ubuntu22.04/Dockerfile b/build/docker/builder/gpu/ubuntu22.04/Dockerfile index 5914d34bcb..5c270b9d26 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.10.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.21.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 @@ -31,7 +31,7 @@ RUN vcpkg install azure-identity-cpp azure-storage-blobs-cpp gtest # refer: https://code.visualstudio.com/docs/remote/containers-advanced#_avoiding-extension-reinstalls-on-container-rebuild RUN mkdir -p /home/milvus/.vscode-server/extensions \ - /home/milvus/.vscode-server-insiders/extensions \ + /home/milvus/.vscode-server-insiders/extensions \ && chmod -R 777 /home/milvus diff --git a/build/docker/meta-migration/builder/Dockerfile b/build/docker/meta-migration/builder/Dockerfile index f102266fcf..f299854cb6 100644 --- a/build/docker/meta-migration/builder/Dockerfile +++ b/build/docker/meta-migration/builder/Dockerfile @@ -1,2 +1,2 @@ -FROM golang:1.21.10-alpine3.19 +FROM golang:1.21.11-alpine3.19 RUN apk add --no-cache make bash \ No newline at end of file