From d7d6efb9f4a772cb780dd7b24773d38eadb83f50 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 1 Apr 2021 18:23:39 +0000 Subject: [PATCH] Updating ose-gcp-machine-controllers images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/550d9224dc7fd6054946384bd8809eda4d90bf4f/images/ose-gcp-machine-controllers.yml --- Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index b8e454500..e83f40e0c 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,10 +1,10 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/cluster-api-provider-gcp COPY . . # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own RUN unset VERSION \ && make build GOPROXY=off NO_DOCKER=1 CGO_ENABLED=0 -FROM registry.svc.ci.openshift.org/ocp/4.6:base +FROM registry.ci.openshift.org/ocp/4.6:base COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-gcp/bin/machine-controller-manager / COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-gcp/bin/termination-handler /