From c4d4d4b4882bee291f32842caf634dff0881c8e0 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:05:45 +0000 Subject: [PATCH] Updating Dockerfile.rhel7 baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the baseimages in the Dockerfile used for promotion in order to ensure it matches the configuration in the [ocp-build-data repository][2] used for producing release artifacts. If you believe the content of this PR is incorrect, please contact the dptp team in #forum-testplatform. [1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer [2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images --- Dockerfile.rhel7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index f5181ee3d7..a8c45cb283 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,12 +1,12 @@ # THIS FILE IS GENERATED FROM Dockerfile DO NOT EDIT -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 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.0:base +FROM registry.svc.ci.openshift.org/ocp/4.6: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