From 4cafb0e14f54c74023b8236b952a70e7f0363090 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 18:13:11 +0000 Subject: [PATCH] Updating Dockerfile 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 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a77e2f9df..bd6961e8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-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/openshift/origin-v4.0:base +FROM registry.svc.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 /