From 3f917fae003bd498f984166567ea74e54801f00f Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:13:47 +0000 Subject: [PATCH] Updating images/cli-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/cli-artifacts/Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/cli-artifacts/Dockerfile.rhel b/images/cli-artifacts/Dockerfile.rhel index d9cf3e996b..649e2ff83a 100644 --- a/images/cli-artifacts/Dockerfile.rhel +++ b/images/cli-artifacts/Dockerfile.rhel @@ -1,12 +1,12 @@ # This Dockerfile builds an image containing the Mac and Windows version of oc # layered on top of the Linux cli image. -FROM registry.svc.ci.openshift.org/openshift/release: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/oc COPY . . RUN yum install -y --setopt=skip_missing_names_on_install=False gpgme-devel libassuan-devel RUN make cross-build --warn-undefined-variables -FROM registry.svc.ci.openshift.org/ocp/4.2:cli +FROM registry.svc.ci.openshift.org/ocp/4.6:cli COPY --from=builder /go/src/github.com/openshift/oc/_output/bin/darwin_amd64/oc /usr/share/openshift/mac/oc COPY --from=builder /go/src/github.com/openshift/oc/_output/bin/windows_amd64/oc.exe /usr/share/openshift/windows/oc.exe COPY --from=builder /go/src/github.com/openshift/oc/_output/bin/linux_amd64/oc /usr/share/openshift/linux_amd64/oc