Skip to content

Commit

Permalink
version: Bump golang to 1.22.11
Browse files Browse the repository at this point in the history
Bump golang to fix vulnerabilities:
- GO-2025-3420
- GO-2025-3373
- GO-2025-3372

Following on from this will be another PR that uses the new builder image,
but it isn't published until this is merged.

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
  • Loading branch information
stevenhorsman committed Jan 28, 2025
1 parent e5a39b5 commit 3b42f39
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions hack/Dockerfile.golang
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ FROM --platform=$TARGETPLATFORM ${BASE_IMAGE} AS base

# DO NOT UPDATE THIS BY HAND !!
# Use hack/update-go-container.sh to update the version and hashes.
ARG GO_VERSION=1.22.7
ARG GO_LINUX_ARM64_SHA256=ed695684438facbd7e0f286c30b7bc2411cfc605516d8127dc25c62fe5b03885
ARG GO_LINUX_AMD64_SHA256=fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb
ARG GO_LINUX_PPC64LE_SHA256=a6441d5da40a961039ec22b0aadbc8b513f52b31bb8919c359a7e2c3c5bcf26a
ARG GO_LINUX_S390X_SHA256=08dc28de0dafb175501b9d1623c9b11a9b734eb4b3a35c9c658cc91d4dfce3f3
ARG GO_VERSION=1.22.11
ARG GO_LINUX_ARM64_SHA256=9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031
ARG GO_LINUX_AMD64_SHA256=0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991
ARG GO_LINUX_PPC64LE_SHA256=963a0ec973640b23ee8bb7a462cc415276fd8436111a03df8c34eb3b1ae29f12
ARG GO_LINUX_S390X_SHA256=1a235afe650dee989fb37fef6aa520f35e4cd557c31453f3e82b553da3a90669

FROM base AS base-amd64
ADD --checksum=sha256:${GO_LINUX_AMD64_SHA256} https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz .
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/ibmcloud-powervs/image/prereq.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# FIXME to pickup these values from versions.yaml
GO_VERSION="1.22.7"
GO_VERSION="1.22.11"

# Install dependencies
yum install -y curl libseccomp-devel openssl openssl-devel skopeo clang clang-devel
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cloudimg:
tools:
bats: 1.10.0
iptables-wrapper: v0.0.0-20240819165702-06cad2ec6cb5
golang: 1.22.7
golang: 1.22.11
kcli: 99.0.202408152044
mkosi: v22
protoc: 3.15.0
Expand Down

0 comments on commit 3b42f39

Please sign in to comment.