From 224579246984aae8ac77d13c3524b44e45a81883 Mon Sep 17 00:00:00 2001 From: Andrey Lebedev Date: Wed, 11 Sep 2024 00:01:05 +0200 Subject: [PATCH] UPSTREAM: : openshift: Use RHEL9 for base and building images --- .ci-operator.yaml | 2 +- Dockerfile.openshift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 393a82639b..1e59c02c25 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.22-openshift-4.17 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 5b9ae3c7fc..70bd25ca76 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder WORKDIR /sigs.k8s.io/external-dns COPY . . RUN make build -FROM registry.ci.openshift.org/ocp/4.17:base +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 COPY --from=builder /sigs.k8s.io/external-dns/build/external-dns /usr/bin/ ENTRYPOINT ["/usr/bin/external-dns"] LABEL io.openshift.release.operator="true"