Skip to content

Commit

Permalink
Updating ose-machine-config-operator builder & base images to be cons…
Browse files Browse the repository at this point in the history
  • Loading branch information
jupierce committed Oct 7, 2020
1 parent 08ddac3 commit 8c791c9
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,12 +1,12 @@
# THIS FILE IS GENERATED FROM Dockerfile DO NOT EDIT
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
WORKDIR /go/src/github.com/openshift/machine-config-operator
COPY . .
# FIXME once we can depend on a new enough host that supports globs for COPY,
# just use that. For now we work around this by copying a tarball.
RUN make install DESTDIR=./instroot && tar -C instroot -cf instroot.tar .

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.svc.ci.openshift.org/ocp/4.7:base
COPY --from=builder /go/src/github.com/openshift/machine-config-operator/instroot.tar /tmp/instroot.tar
RUN cd / && tar xf /tmp/instroot.tar && rm -f /tmp/instroot.tar
COPY install /manifests
Expand Down

0 comments on commit 8c791c9

Please sign in to comment.