Merge pull request #1190 from openshift-bot/art-consistency-openshift-4.16-ose-machine-api-operator

openshift-merge-bot[bot] · web-flow · commit b1efdacd83aa · 2023-12-21T17:37:21.000Z
OCPBUGS-25580: Updating ose-machine-api-operator-container image to be consistent with ART
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.20-openshift-4.16
+  tag: rhel-9-release-golang-1.21-openshift-4.16
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
 WORKDIR /go/src/github.com/openshift/machine-api-operator
 COPY . .
 RUN NO_DOCKER=1 make build

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 AS builder`
	`1`	`+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder`
`2`	`2`	`WORKDIR /go/src/github.com/openshift/machine-api-operator`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN NO_DOCKER=1 make build`