From f1c1c7dc2b9dc4ddd875903981baa606b5322a57 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 18:38:44 +0000 Subject: [PATCH] Updating Dockerfile.openshift.rhel7 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.openshift.rhel7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 index 682a2cdb48..ab9ab0ed7f 100644 --- a/Dockerfile.openshift.rhel7 +++ b/Dockerfile.openshift.rhel7 @@ -1,9 +1,9 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder WORKDIR /go/src/github.com/coredns/coredns COPY . . RUN GO111MODULE=on GOFLAGS=-mod=vendor go build -o coredns . -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/coredns/coredns/coredns /usr/bin/ ENTRYPOINT ["/usr/bin/coredns"]