From fc9f9eec009c077c3b045d78728b8e8807a758ba Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Wed, 16 Sep 2020 19:58:16 -0400 Subject: [PATCH] Updating Dockerfile.rhel baseimages to mach ocp-build-data config This PR is autogenerated by the [ocp-build-data-enforcer][1]. It updates the base images 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. Instead of merging this PR you can also create an alternate PR that includes the changes found here. If you believe the content of this PR is incorrect, please contact the dptp team in #aos-art. [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/images --- Dockerfile.rhel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 0032b21227..433ccb83b7 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 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