Skip to content

Commit

Permalink
Merge pull request #388 from wking/revert-385-art-consistency-openshi…
Browse files Browse the repository at this point in the history
…ft-4.15-ose-cluster-config-operator

Revert "OCPBUGS-19106: Updating ose-cluster-config-operator-container image to be consistent with ART"
  • Loading branch information
openshift-merge-bot[bot] authored Dec 6, 2023
2 parents e6b1a8d + 808abdb commit c436b7a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/github.com/openshift/cluster-config-operator
COPY . .
ENV GO_PACKAGE github.com/openshift/cluster-config-operator
RUN make build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.15:base-rhel9
FROM registry.ci.openshift.org/ocp/4.15:base
RUN mkdir -p /usr/share/bootkube/manifests/manifests
RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/vendor/github.com/openshift/api/config/v1/*_config-operator_*.yaml /usr/share/bootkube/manifests/manifests
Expand Down

0 comments on commit c436b7a

Please sign in to comment.