Skip to content

Commit feae82b

Browse files
authored
Merge branch 'main' into AddRocky10
2 parents 2951867 + 56dd541 commit feae82b

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/docker-cbdb-build-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
# This allows building ARM64 images on AMD64 infrastructure and vice versa
121121
- name: Set up QEMU
122122
if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
123-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
123+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
124124

125125
# Login to DockerHub for pushing images
126126
# Requires DOCKERHUB_USER and DOCKERHUB_TOKEN secrets to be set

.github/workflows/docker-cbdb-test-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
# This allows building ARM64 images on AMD64 infrastructure and vice versa
110110
- name: Set up QEMU
111111
if: ${{ steps.platform-filter.outputs[matrix.platform] == 'true' }}
112-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
112+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
113113

114114
# Login to DockerHub for pushing images
115115
- name: Login to Docker Hub

devops/deploy/docker/build/rocky8/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ RUN dnf makecache && \
150150
make -j$(nproc) && \
151151
make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \
152152
rm -rf ~/xerces-c* && \
153-
cd && GO_VERSION="go1.23.4" && \
153+
cd && GO_VERSION="go1.24.13" && \
154154
ARCH=$(uname -m) && \
155155
if [ "${ARCH}" = "aarch64" ]; then \
156156
GO_ARCH="arm64" && \
157-
GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \
157+
GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \
158158
elif [ "${ARCH}" = "x86_64" ]; then \
159159
GO_ARCH="amd64" && \
160-
GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \
160+
GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \
161161
else \
162162
echo "Unsupported architecture: ${ARCH}" && exit 1; \
163163
fi && \

devops/deploy/docker/build/rocky9/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ RUN dnf makecache && \
151151
make -j$(nproc) && \
152152
make install -C ~/xerces-c-${XERCES_LATEST_RELEASE} && \
153153
rm -rf ~/xerces-c* && \
154-
cd && GO_VERSION="go1.23.4" && \
154+
cd && GO_VERSION="go1.24.13" && \
155155
ARCH=$(uname -m) && \
156156
if [ "${ARCH}" = "aarch64" ]; then \
157157
GO_ARCH="arm64" && \
158-
GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \
158+
GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \
159159
elif [ "${ARCH}" = "x86_64" ]; then \
160160
GO_ARCH="amd64" && \
161-
GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \
161+
GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \
162162
else \
163163
echo "Unsupported architecture: ${ARCH}" && exit 1; \
164164
fi && \

devops/deploy/docker/build/ubuntu22.04/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ RUN apt-get update && \
144144
quilt \
145145
unzip && \
146146
apt-get clean && rm -rf /var/lib/apt/lists/* && \
147-
cd && GO_VERSION="go1.23.4" && \
147+
cd && GO_VERSION="go1.24.13" && \
148148
ARCH=$(uname -m) && \
149149
if [ "${ARCH}" = "aarch64" ]; then \
150150
GO_ARCH="arm64" && \
151-
GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \
151+
GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \
152152
elif [ "${ARCH}" = "x86_64" ]; then \
153153
GO_ARCH="amd64" && \
154-
GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \
154+
GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \
155155
else \
156156
echo "Unsupported architecture: ${ARCH}" && exit 1; \
157157
fi && \

devops/deploy/docker/build/ubuntu24.04/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ RUN apt-get update && \
144144
quilt \
145145
unzip && \
146146
apt-get clean && rm -rf /var/lib/apt/lists/* && \
147-
cd && GO_VERSION="go1.23.4" && \
147+
cd && GO_VERSION="go1.24.13" && \
148148
ARCH=$(uname -m) && \
149149
if [ "${ARCH}" = "aarch64" ]; then \
150150
GO_ARCH="arm64" && \
151-
GO_SHA256="16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e"; \
151+
GO_SHA256="74d97be1cc3a474129590c67ebf748a96e72d9f3a2b6fef3ed3275de591d49b3"; \
152152
elif [ "${ARCH}" = "x86_64" ]; then \
153153
GO_ARCH="amd64" && \
154-
GO_SHA256="6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971"; \
154+
GO_SHA256="1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730"; \
155155
else \
156156
echo "Unsupported architecture: ${ARCH}" && exit 1; \
157157
fi && \

0 commit comments

Comments
 (0)