Merge pull request openshift#61 from openshift-bot/art-consistency-op…

…enshift-4.15-ose-powervs-cloud-controller-manager OCPBUGS-24170: Updating ose-powervs-cloud-controller-manager-container image to be consistent with ART
jaypoulz · Dec 6, 2023 · 18b36ee · 18b36ee
2 parents e9719c6 + c6a7d3f
commit 18b36ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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.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 @@
 # Build IBM cloud controller manager binary
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS ccm-builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS ccm-builder
 WORKDIR /build
 COPY . .
 RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o ibm-cloud-controller-manager .
 
 # Assemble the final image
-FROM registry.ci.openshift.org/ocp/4.15:base
+FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
 LABEL description="IBM Cloud Controller Manager"
 COPY --from=ccm-builder /build/ibm-cloud-controller-manager /bin/ibm-cloud-controller-manager
 ENTRYPOINT [ "/bin/ibm-cloud-controller-manager" ]