From b7c695f41671fe4dc302c1b641deac7d938274d7 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Wed, 22 Apr 2026 11:26:16 +0800 Subject: [PATCH 1/2] DevOps: upgrade Go to 1.24.13 in Docker build images Update Go installation in all Docker build containers to use the latest Go 1.24.13 release instead of 1.23.4, with corresponding SHA256 checksums for both amd64 and arm64 architectures. Affected files: - devops/deploy/docker/build/rocky8/Dockerfile - devops/deploy/docker/build/rocky9/Dockerfile - devops/deploy/docker/build/ubuntu22.04/Dockerfile - devops/deploy/docker/build/ubuntu24.04/Dockerfile Updated SHA256 checksums: - linux-amd64: 1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730 - linux-arm64: 74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3 --- devops/deploy/docker/build/rocky8/Dockerfile | 6 +++--- devops/deploy/docker/build/rocky9/Dockerfile | 6 +++--- devops/deploy/docker/build/ubuntu22.04/Dockerfile | 6 +++--- devops/deploy/docker/build/ubuntu24.04/Dockerfile | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/devops/deploy/docker/build/rocky8/Dockerfile b/devops/deploy/docker/build/rocky8/Dockerfile index 45d6706e593..2c19236bd76 100644 --- a/devops/deploy/docker/build/rocky8/Dockerfile +++ b/devops/deploy/docker/build/rocky8/Dockerfile @@ -150,14 +150,14 @@ RUN dnf makecache && \ make -j$(nproc) && \ make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \ rm -rf ~/xerces-c* && \ - cd && GO_VERSION="go1.23.4" && \ + cd && GO_VERSION="go1.24.13" && \ ARCH=$(uname -m) && \ if [ "${ARCH}" = "aarch64" ]; then \ GO_ARCH="arm64" && \ - GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \ + GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \ elif [ "${ARCH}" = "x86_64" ]; then \ GO_ARCH="amd64" && \ - GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \ + GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \ else \ echo "Unsupported architecture: ${ARCH}" && exit 1; \ fi && \ diff --git a/devops/deploy/docker/build/rocky9/Dockerfile b/devops/deploy/docker/build/rocky9/Dockerfile index 26190109ef0..62289f51371 100644 --- a/devops/deploy/docker/build/rocky9/Dockerfile +++ b/devops/deploy/docker/build/rocky9/Dockerfile @@ -151,14 +151,14 @@ RUN dnf makecache && \ make -j$(nproc) && \ make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \ rm -rf ~/xerces-c* && \ - cd && GO_VERSION="go1.23.4" && \ + cd && GO_VERSION="go1.24.13" && \ ARCH=$(uname -m) && \ if [ "${ARCH}" = "aarch64" ]; then \ GO_ARCH="arm64" && \ - GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \ + GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \ elif [ "${ARCH}" = "x86_64" ]; then \ GO_ARCH="amd64" && \ - GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \ + GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \ else \ echo "Unsupported architecture: ${ARCH}" && exit 1; \ fi && \ diff --git a/devops/deploy/docker/build/ubuntu22.04/Dockerfile b/devops/deploy/docker/build/ubuntu22.04/Dockerfile index 3023a9fce67..8c0e4cf3bac 100644 --- a/devops/deploy/docker/build/ubuntu22.04/Dockerfile +++ b/devops/deploy/docker/build/ubuntu22.04/Dockerfile @@ -144,14 +144,14 @@ RUN apt-get update && \ quilt \ unzip && \ apt-get clean && rm -rf /var/lib/apt/lists/* && \ - cd && GO_VERSION="go1.23.4" && \ + cd && GO_VERSION="go1.24.13" && \ ARCH=$(uname -m) && \ if [ "${ARCH}" = "aarch64" ]; then \ GO_ARCH="arm64" && \ - GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \ + GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \ elif [ "${ARCH}" = "x86_64" ]; then \ GO_ARCH="amd64" && \ - GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \ + GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \ else \ echo "Unsupported architecture: ${ARCH}" && exit 1; \ fi && \ diff --git a/devops/deploy/docker/build/ubuntu24.04/Dockerfile b/devops/deploy/docker/build/ubuntu24.04/Dockerfile index c4f4e646720..762456d0b84 100644 --- a/devops/deploy/docker/build/ubuntu24.04/Dockerfile +++ b/devops/deploy/docker/build/ubuntu24.04/Dockerfile @@ -144,14 +144,14 @@ RUN apt-get update && \ quilt \ unzip && \ apt-get clean && rm -rf /var/lib/apt/lists/* && \ - cd && GO_VERSION="go1.23.4" && \ + cd && GO_VERSION="go1.24.13" && \ ARCH=$(uname -m) && \ if [ "${ARCH}" = "aarch64" ]; then \ GO_ARCH="arm64" && \ - GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \ + GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \ elif [ "${ARCH}" = "x86_64" ]; then \ GO_ARCH="amd64" && \ - GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \ + GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \ else \ echo "Unsupported architecture: ${ARCH}" && exit 1; \ fi && \ From 15713ec8b0308de3d2929cdf931e53cd58b40493 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Wed, 22 Apr 2026 14:24:20 +0800 Subject: [PATCH 2/2] CI: update docker/setup-qemu-action to v4.0.0 See: https://github.com/apache/infrastructure-actions/blob/2b6ec5f38ac73c7c5970f3b4f863e8d15bf12d7d/actions.yml#L326 --- .github/workflows/docker-cbdb-build-containers.yml | 2 +- .github/workflows/docker-cbdb-test-containers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-cbdb-build-containers.yml b/.github/workflows/docker-cbdb-build-containers.yml index 3ef8fae00a8..d42139d0fae 100644 --- a/.github/workflows/docker-cbdb-build-containers.yml +++ b/.github/workflows/docker-cbdb-build-containers.yml @@ -117,7 +117,7 @@ jobs: # This allows building ARM64 images on AMD64 infrastructure and vice versa - name: Set up QEMU if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }} - uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 + uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 # Login to DockerHub for pushing images # Requires DOCKERHUB_USER and DOCKERHUB_TOKEN secrets to be set diff --git a/.github/workflows/docker-cbdb-test-containers.yml b/.github/workflows/docker-cbdb-test-containers.yml index efb98d2b7a6..36d320f0737 100644 --- a/.github/workflows/docker-cbdb-test-containers.yml +++ b/.github/workflows/docker-cbdb-test-containers.yml @@ -106,7 +106,7 @@ jobs: # This allows building ARM64 images on AMD64 infrastructure and vice versa - name: Set up QEMU if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }} - uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0 + uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 # Login to DockerHub for pushing images - name: Login to Docker Hub