From d5d2935ab4db04f2d410af08adf5199dfcd55b0b Mon Sep 17 00:00:00 2001 From: Cesar Wong Date: Mon, 15 Jan 2024 16:55:29 -0500 Subject: [PATCH] Update Dockerfiles to use publicly available RHEL9 images This is needed for compatibility with RHEL9-based images in the release payload. The change will not impact CI or ART images, since they use their own replacements --- Dockerfile | 4 ++-- Dockerfile.control-plane | 4 ++-- fast.Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 40bc350762..eb1013e597 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/openshift/release:golang-1.21 as builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.21-openshift-4.16 as builder WORKDIR /hypershift @@ -6,7 +6,7 @@ COPY . . RUN make build -FROM quay.io/openshift/origin-base:4.16 +FROM registry.access.redhat.com/ubi9:latest COPY --from=builder /hypershift/bin/hypershift \ /hypershift/bin/hcp \ /hypershift/bin/hypershift-operator \ diff --git a/Dockerfile.control-plane b/Dockerfile.control-plane index 3ca73306c4..f5c61f9446 100644 --- a/Dockerfile.control-plane +++ b/Dockerfile.control-plane @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.21-openshift-4.16 AS builder WORKDIR /hypershift @@ -6,7 +6,7 @@ COPY . . RUN make control-plane-operator control-plane-pki-operator -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 +FROM registry.access.redhat.com/ubi9:latest COPY --from=builder /hypershift/bin/control-plane-operator /usr/bin/control-plane-operator COPY --from=builder /hypershift/bin/control-plane-pki-operator /usr/bin/control-plane-pki-operator diff --git a/fast.Dockerfile b/fast.Dockerfile index 78ba0f1f5b..ca829f5d37 100644 --- a/fast.Dockerfile +++ b/fast.Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/openshift/origin-base:4.16 +FROM registry.access.redhat.com/ubi9:latest LABEL io.openshift.hypershift.control-plane-operator-skips-haproxy=true LABEL io.openshift.hypershift.control-plane-operator-subcommands=true