From c6a7d3f62fd4543e77aac2cb6719bfd5bd94207e Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 28 Nov 2023 23:45:52 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-powervs-cloud-controller-manager-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/ose-powervs-cloud-controller-manager.yml --- .ci-operator.yaml | 2 +- openshift-hack/images/Dockerfile.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 7cd14bfef..7096df34e 100644 --- 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 index 5fdc447cb..3def94f33 100644 --- 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" ]