From 93e776ad50a1e996c3f0b7cd3eb0601f80d8a942 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:33:26 +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 a6592111f3..5a0f84dcba 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/improbable-eng/thanos COPY . . ENV GOFLAGS="-mod=vendor" @@ -11,7 +11,7 @@ RUN if ! yum install -y prometheus-promu; then \ curl -s -L https://github.com/prometheus/promu/releases/download/v0.5.0/promu-0.5.0.linux-amd64.tar.gz | tar -xzvf - -C /usr/bin --strip-components 1 promu-0.5.0.linux-amd64/promu; \ fi; \ promu build; -FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base +FROM registry.svc.ci.openshift.org/ocp/4.6:base LABEL io.k8s.display-name="OpenShift Thanos" \ io.k8s.description="Highly available Prometheus setup with long term storage capabilities." \ io.openshift.tags="prometheus,monitoring" \