From 1e30794d3f989345b3b8e661db403f75a56a3d64 Mon Sep 17 00:00:00 2001 From: Justin Pierce Date: Wed, 7 Oct 2020 12:03:22 -0400 Subject: [PATCH] Updating ose-cli-artifacts builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ac81dd4ff0bd57c4e75058d25b40615b92948259/images/ose-cli-artifacts.yml --- 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 e467298e9a..3b1b06b63b 100644 --- a/images/cli-artifacts/Dockerfile.rhel +++ b/images/cli-artifacts/Dockerfile.rhel @@ -1,11 +1,11 @@ # 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/ocp/builder:rhel-7-golang-openshift-4.6 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-1.15-openshift-4.7 AS builder WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make cross-build --warn-undefined-variables -FROM registry.svc.ci.openshift.org/ocp/4.6:cli +FROM registry.svc.ci.openshift.org/ocp/4.7: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