From 3c377e4a8ad9bb51f166e65f594bf57e808edc3d Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:25:01 +0000 Subject: [PATCH] Updating Dockerfile.ocp 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.ocp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ocp b/Dockerfile.ocp index fa5a17b5bda..614bb01a97b 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.14 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder WORKDIR /go/src/github.com/prometheus/prometheus COPY . . # NOTE(spasquie): the 'build' target regenerates the ReactJS code and the Go @@ -9,7 +9,7 @@ COPY . . # should be committed to the repository. RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make common-build -FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6 LABEL io.k8s.display-name="OpenShift Prometheus" \ io.k8s.description="The Prometheus monitoring system and time series database." \ io.openshift.tags="prometheus,monitoring" \