Merge pull request #237 from openshift-bot/art-consistency-openshift-4.11-ose-openstack-machine-controllers

openshift-merge-robot · web-flow · commit 440ca42cd834 · 2022-05-13T11:23:17.000+02:00
Updating ose-openstack-machine-controllers images 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-8-release-golang-1.17-openshift-4.11
+  tag: rhel-8-release-golang-1.18-openshift-4.11
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
 WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack
 COPY . .
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder`
	`1`	`+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder`
`2`	`2`	`WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack`
`3`	`3`	`COPY . .`
`4`	`4`