From 79a30c0bfcede447aa5aa88e8673c26761846d1d Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 18:50:51 +0000 Subject: [PATCH] Updating images/installer-artifacts/Dockerfile.rhel 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 --- images/installer-artifacts/Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/installer-artifacts/Dockerfile.rhel b/images/installer-artifacts/Dockerfile.rhel index 08f9fbb8598..dd9d19cf83c 100644 --- a/images/installer-artifacts/Dockerfile.rhel +++ b/images/installer-artifacts/Dockerfile.rhel @@ -1,11 +1,11 @@ # This Dockerfile builds an image containing the Mac version of the installer layered # on top of the Linux installer image. -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/installer COPY . . RUN go generate ./data && \ SKIP_GENERATION=y GOOS=darwin GOARCH=amd64 hack/build.sh -FROM registry.svc.ci.openshift.org/ocp/4.1:installer +FROM registry.svc.ci.openshift.org/ocp/4.6:installer COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install