From 432bafd3dd4b01b902ff9044ea8c6b52db3ed98e Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:16:16 +0000 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 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.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 2d91b6919..7d9878358 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-7-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/openshift-controller-manager COPY . . RUN make build --warn-undefined-variables -FROM registry.svc.ci.openshift.org/ocp/4.2:base +FROM registry.svc.ci.openshift.org/ocp/4.6:base COPY --from=builder /go/src/github.com/openshift/openshift-controller-manager/openshift-controller-manager /usr/bin/ LABEL io.k8s.display-name="OpenShift Controller Manager Command" \ io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \