From cc458a823a2b32476a59a8490fde31df93571131 Mon Sep 17 00:00:00 2001 From: Justin Pierce Date: Wed, 7 Oct 2020 11:12:29 -0400 Subject: [PATCH] Updating openshift-enterprise-cli builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/0b997d0add07947c7ca65baa44901a2d113fd0e9/images/openshift-enterprise-cli.yml --- images/cli/Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/cli/Dockerfile.rhel b/images/cli/Dockerfile.rhel index 7b11401993..d40e92bfe4 100644 --- a/images/cli/Dockerfile.rhel +++ b/images/cli/Dockerfile.rhel @@ -1,9 +1,9 @@ -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 build --warn-undefined-variables -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/oc/oc /usr/bin/ RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done LABEL io.k8s.display-name="OpenShift Client" \