Skip to content

Commit 2bf3df5

Browse files
committed
update base images for integration and e2e to go-toolset:1.21
this updates the update-go-version.sh script to also updaate go versions in the files images/*/Containerfile fixes #4185
1 parent d9e501b commit 2bf3df5

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

images/build-e2e/Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder
2+
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
33

44
USER root
55

images/build-integration/Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 AS builder
2+
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
33

44
USER root
55

update-go-version.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ go mod edit -go ${golang_base_version} tools/go.mod
1414
sed -i "s,^GOVERSION = 1.[0-9]\+,GOVERSION = ${golang_base_version}," Makefile
1515
sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile
1616
sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version}," images/*/Dockerfile
17+
sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version}," images/*/Containerfile
1718
for f in .github/workflows/*.yml; do
1819
if [ $(yq eval '.jobs.build.strategy.matrix | has("go")' "$f") == "true" ]; then
1920
yq eval --inplace ".jobs.build.strategy.matrix.go[0] = ${golang_base_version} | .jobs.build.strategy.matrix.go[0] style=\"single\"" "$f";

0 commit comments

Comments
 (0)