From d897215165b225687384074ff1a30b875828b5f7 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:32:43 +0000 Subject: [PATCH] Updating Dockerfile 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0cf7e6100..a13f00d3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openshift/origin-release:golang-1.13 +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 ENV GOFLAGS="-mod=vendor" COPY . /go/src/github.com/openshift/telemeter RUN cd /go/src/github.com/openshift/telemeter && \ @@ -6,7 +6,7 @@ RUN cd /go/src/github.com/openshift/telemeter && \ go build ./cmd/telemeter-server && \ go build ./cmd/authorization-server -FROM centos:7 +FROM registry.svc.ci.openshift.org/ocp/4.6:base COPY --from=0 /go/src/github.com/openshift/telemeter/telemeter-client /usr/bin/ COPY --from=0 /go/src/github.com/openshift/telemeter/telemeter-server /usr/bin/ COPY --from=0 /go/src/github.com/openshift/telemeter/authorization-server /usr/bin/