Skip to content

Commit 6149936

Browse files
cfergeauopenshift-merge-robot
authored andcommitted
build: Remove patch release from registry.access.redhat.com/ubi8/go-toolset
There are now registry.access.redhat.com/ubi8/go-toolset:1.18 images which point to the latest go-toolset image. It's easier to use this as the go-toolset usually lagged behind latest go releases, so the patch version number had to be adjusted by hand.
1 parent c199fd7 commit 6149936

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

images/build-e2e/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/go-toolset:1.17.7 as builder
1+
FROM registry.access.redhat.com/ubi8/go-toolset:1.17 as builder
22

33
USER root
44
WORKDIR /workspace

images/build-integration/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8/go-toolset:1.17.7 as builder
1+
FROM registry.access.redhat.com/ubi8/go-toolset:1.17 as builder
22

33
USER root
44
WORKDIR /workspace

update-go-version.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ set -euo pipefail
77
# This requires yq and jq in addition to fairly standard shell tools (curl, grep, sed, ...)
88

99
golang_base_version=$1
10-
latest_version=$(curl --location --silent 'https://go.dev/dl/?mode=json&include=all' | jq -r '.[].files[].version' |uniq | sed -e 's/go//' |sort -V |grep ${golang_base_version}|tail -1)
11-
echo "Updating golang version to $latest_version"
10+
echo "Updating golang version to $golang_base_version"
1211

1312
go mod edit -go ${golang_base_version}
1413
go mod edit -go ${golang_base_version} tools/go.mod
1514
sed -i "s,^FROM registry.ci.openshift.org/openshift/release:golang-1\... AS builder\$,FROM registry.ci.openshift.org/openshift/release:golang-${golang_base_version} AS builder," images/openshift-ci/Dockerfile
16-
sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+ as builder\$,FROM registry.access.redhat.com/ubi8/go-toolset:${latest_version} as builder," images/build-e2e/Dockerfile
17-
sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+ as builder\$,FROM registry.access.redhat.com/ubi8/go-toolset:${latest_version} as builder," images/build-integration/Dockerfile
15+
sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+ as builder\$,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version} as builder," images/build-e2e/Dockerfile
16+
sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+ as builder\$,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version} as builder," images/build-integration/Dockerfile
1817
for f in .github/workflows/*.yml; do
1918
yq eval --inplace ".jobs.build.strategy.matrix.go[0] = ${golang_base_version}" "$f";
2019
done

0 commit comments

Comments
 (0)