Skip to content

Commit

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

Updating ose-cluster-config-operator builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Feb 25, 2021
2 parents b532a4d + 9d84c5c commit d7db686
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel7
@@ -1,10 +1,10 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 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.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.6: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 d7db686

Please sign in to comment.