Skip to content

Commit bc1c53b

Browse files
praveenkumaranjannath
authored andcommitted
CI: Update images from rhel-8-release-golang tag to rhel-9-release-golang
By default crc support 2 major release so better to update the images to rhel-9 since rhel-10 is released and available from quite some time.
1 parent ecbf4d6 commit bc1c53b

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CRC environment",
3-
"image": "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19",
3+
"image": "registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19",
44

55
"customizations": {
66
"vscode": {

.github/workflows/verify-devcontainer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
verify-devcontainer:
99
runs-on: ubuntu-24.04
1010
container:
11-
image: registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19
11+
image: registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
1212
options: --cpus 4
1313
steps:
1414
- name: Run `git clone`

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.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder
2+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 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.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder
2+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder
33

44
USER root
55

images/build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder
1+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder
22
MAINTAINER CRC <[email protected]>
33

44
WORKDIR /opt/src
55
COPY . .
66
RUN make cross
77

88
FROM registry.access.redhat.com/ubi9/ubi
9-
COPY --from=builder /opt/src/out/ /opt/
9+
COPY --from=builder /opt/src/out/ /opt/

images/openshift-ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile is used by openshift CI
22
# It builds an image containing crc and nss-wrapper for remote deployments, as well as the google cloud-sdk for nested GCE environments.
33

4-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 AS builder
4+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19 AS builder
55
WORKDIR /go/src/github.com/crc-org/crc
66
COPY . .
77
RUN make release

update-go-version.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ go mod edit -go "${golang_base_version}.0"
1313
go mod edit -go "${golang_base_version}.1" tools/go.mod
1414

1515
sed -i "s,^GOVERSION = 1.[0-9]\+,GOVERSION = ${golang_base_version}," Makefile
16-
sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile
17-
sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Containerfile
18-
sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .devcontainer/devcontainer.json
16+
sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile
17+
sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Containerfile
18+
sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .devcontainer/devcontainer.json
1919
for f in .github/workflows/*.yml; do
2020
if [ $(yq eval '.jobs.build.strategy.matrix | has("go")' "$f") == "true" ]; then
2121
yq eval --inplace ".jobs.build.strategy.matrix.go[0] = ${golang_base_version} | .jobs.build.strategy.matrix.go[0] style=\"single\"" "$f";
@@ -25,4 +25,4 @@ for f in .github/workflows/*.yml; do
2525
fi
2626
done
2727
# Use sed for verify-devcontainer because image is from registry.ci.openshift
28-
sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .github/workflows/verify-devcontainer.yml
28+
sed -i "s,\(registry.ci.openshift.org/openshift/release:rhel-9-release-golang-\)1.[0-9]\+,\1${golang_base_version}," .github/workflows/verify-devcontainer.yml

0 commit comments

Comments
 (0)