Skip to content

Commit

Permalink
update base images for integration and e2e to go-toolset:1.21
Browse files Browse the repository at this point in the history
this updates the update-go-version.sh script to also updaate go
versions in the files images/*/Containerfile

fixes #4185
  • Loading branch information
anjannath committed Jun 3, 2024
1 parent d9e501b commit 2bf3df5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion images/build-e2e/Containerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

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

USER root

Expand Down
2 changes: 1 addition & 1 deletion images/build-integration/Containerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

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

USER root

Expand Down
1 change: 1 addition & 0 deletions update-go-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ go mod edit -go ${golang_base_version} tools/go.mod
sed -i "s,^GOVERSION = 1.[0-9]\+,GOVERSION = ${golang_base_version}," Makefile
sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile
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
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
for f in .github/workflows/*.yml; do
if [ $(yq eval '.jobs.build.strategy.matrix | has("go")' "$f") == "true" ]; then
yq eval --inplace ".jobs.build.strategy.matrix.go[0] = ${golang_base_version} | .jobs.build.strategy.matrix.go[0] style=\"single\"" "$f";
Expand Down

0 comments on commit 2bf3df5

Please sign in to comment.