Skip to content

Commit 9eef4bd

Browse files
authored
Merge branch 'main' into rc-arm64
2 parents d9d9cd9 + 85c799e commit 9eef4bd

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

images/scanner-build.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ RUN dnf update -y && \
3535
dnf clean all && \
3636
rm -rf /var/cache/dnf /var/cache/yum
3737

38-
ARG GOLANG_VERSION=1.23.6
39-
ARG GOLANG_SHA256=9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d
38+
ARG GOLANG_VERSION=1.24.4
39+
ARG GOLANG_SHA256=77e5da33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717
4040
ENV GOPATH /go
4141
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
4242
RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \

images/stackrox-build.Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,13 @@ RUN dnf update -y && \
5757
dnf clean all && \
5858
rm -rf /var/cache/dnf /var/cache/yum
5959

60-
ARG GOLANG_VERSION=1.23.6
60+
61+
ARG GOLANG_VERSION=1.24.4
6162
ENV GOPATH=/go
6263
ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
6364
RUN set -e; case "$TARGETARCH" in \
64-
"amd64" ) GOLANG_SHA256="9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d";; \
65-
"arm64") GOLANG_SHA256="561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202";; \
65+
"amd64" ) GOLANG_SHA256="77e5da33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717";; \
66+
"arm64") GOLANG_SHA256="d5501ee5aca0f258d5fe9bfaed401958445014495dc115f202d43d5210b45241";; \
6667
*) echo "Unsupported $TARGETARCH"; exit 1;; \
6768
esac && \
6869
wget --no-verbose -O go.tgz "https://dl.google.com/go/go${GOLANG_VERSION}.linux-${TARGETARCH}.tar.gz" && \

images/stackrox-ui-test.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ RUN dnf update -y \
7272
&& dnf clean all \
7373
&& rm -rf /var/cache/dnf /var/cache/yum
7474

75-
ARG GOLANG_VERSION=1.23.6
76-
ARG GOLANG_SHA256=9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d
75+
ARG GOLANG_VERSION=1.24.4
76+
ARG GOLANG_SHA256=77e5da33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717
7777
ENV GOPATH /go
7878
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
7979
RUN url="https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \

0 commit comments

Comments
 (0)