Merge pull request #3426 from csrwng/fix_dockerfile

NO-JIRA: Update Dockerfiles to use publicly available RHEL9 images
openshift · Jan 23, 2024 · c32704f · c32704f
2 parents ef43500 + d5d2935
commit c32704f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-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
 
 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
@@ -1,12 +1,12 @@
-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
 
 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
@@ -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