Merge pull request #39 from openshift-bot/art-consistency-openshift-4…

….15-ose-alibaba-cloud-controller-manager OCPBUGS-24111: Updating ose-alibaba-cloud-controller-manager-container image to be consistent with ART
openshift · Dec 6, 2023 · 2fc6d75 · 2fc6d75
2 parents 43228aa + 4b923f5
commit 2fc6d75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,5 +1,4 @@
-
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.20-openshift-4.15
+  tag: rhel-9-release-golang-1.20-openshift-4.15
diff --git a/openshift-hack/images/Dockerfile.openshift b/openshift-hack/images/Dockerfile.openshift
@@ -1,11 +1,11 @@
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
 
 WORKDIR /build
 COPY . .
 RUN make ccm-linux
 
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 
 LABEL description="Alibaba Cloud Controller Manager"