Skip to content

Commit

Permalink
Merge pull request #147 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.15-ose-cluster-capi-operator

OCPBUGS-24150: Updating ose-cluster-capi-operator-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Dec 8, 2023
2 parents ba9b0cd + b5fc7e6 commit c044892
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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/openshift/cluster-capi-operator
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/openshift/cluster-capi-operator/bin/cluster-capi-operator .
COPY --from=builder /go/src/github.com/openshift/cluster-capi-operator/manifests /manifests

Expand Down

0 comments on commit c044892

Please sign in to comment.