From cb6835e92f2528c4e51bbe2636d4674b2e2966ba Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 6 Sep 2021 16:38:01 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-aws-machine-controllers images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/44bc7dde7a1abf6a25bf16d7d05e98599a9783e1/images/ose-aws-machine-controllers.yml --- Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index ab4d96ae01..d8271988eb 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,10 +1,10 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws COPY . . # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own RUN unset VERSION \ && GOPROXY=off NO_DOCKER=1 make build -FROM registry.ci.openshift.org/ocp/4.9:base +FROM registry.ci.openshift.org/ocp/4.10:base COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-aws/bin/machine-controller-manager / COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-aws/bin/termination-handler /