From 921b71aa276597ef92f1e9191f5caa6cc139a5ec Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:24:16 +0000 Subject: [PATCH] Updating Dockerfile.config-reloader.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.config-reloader.ocp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.config-reloader.ocp b/Dockerfile.config-reloader.ocp index f71a569f3be..c16806d85b1 100644 --- a/Dockerfile.config-reloader.ocp +++ b/Dockerfile.config-reloader.ocp @@ -1,12 +1,12 @@ # Dockerfile used by OSBS and by prow CI. -FROM registry.svc.ci.openshift.org/ocp/builder: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/coreos/prometheus-operator COPY . . ENV GO111MODULE=on ENV GOFLAGS="-mod=vendor" RUN OS=$(go env GOOS) ARCH=$(go env GOARCH) make prometheus-config-reloader -FROM registry.svc.ci.openshift.org/ocp/4.0:base +FROM registry.svc.ci.openshift.org/ocp/4.6:base LABEL io.k8s.display-name="Prometheus config reloader" \ io.k8s.description="This component reloads a Prometheus server in a controlled and configurable way." \ io.openshift.tags="prometheus" \