From cd0bbf41bb18a2b3afb468253d251e8b7a6a4eda Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 18:49:02 +0000 Subject: [PATCH] Updating pod/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 --- pod/Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pod/Dockerfile.rhel b/pod/Dockerfile.rhel index eb1609758..d6606f6c9 100644 --- a/pod/Dockerfile.rhel +++ b/pod/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.10 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/images COPY . . RUN CGO_ENABLED=0 go build -installsuffix=cgo -o pod/bin/pod ./pod -FROM registry.svc.ci.openshift.org/ocp/4.0:base +FROM registry.svc.ci.openshift.org/ocp/4.6:base COPY --from=builder /go/src/github.com/openshift/images/pod/bin/pod /usr/bin/ LABEL io.k8s.display-name="OpenShift Pod" \ io.k8s.description="This is a component of OpenShift and contains the binary that holds the pod namespaces." \