From 3b44fbcaa711e7c7676f353b78d06581d8f5917b Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 28 Nov 2023 15:26:13 +0000 Subject: [PATCH] UPSTREAM: : Updating csi-attacher-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/9dc2a375bf335e7e4e3d7e75abc5c3bdbb0c0e98/images/csi-attacher.yml --- .ci-operator.yaml | 2 +- Dockerfile.openshift.rhel7 | 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/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 index 7b04864a8..4dd8e2f03 100644 --- a/Dockerfile.openshift.rhel7 +++ b/Dockerfile.openshift.rhel7 @@ -1,8 +1,8 @@ -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 /go/src/github.com/kubernetes-csi/external-attacher COPY . . RUN make build -FROM registry.ci.openshift.org/ocp/4.15:base +FROM registry.ci.openshift.org/ocp/4.15:base-rhel9 COPY --from=builder /go/src/github.com/kubernetes-csi/external-attacher/bin/csi-attacher /usr/bin/ ENTRYPOINT ["/usr/bin/csi-attacher"]