From a32f81d539c681f567f24d6ef4bef6535895dd17 Mon Sep 17 00:00:00 2001 From: openshift-bot Date: Mon, 24 Aug 2020 19:04:22 +0000 Subject: [PATCH] Updating Dockerfile.promtail.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.promtail.ocp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.promtail.ocp b/Dockerfile.promtail.ocp index dba1e6722a183..75d4cac50be8a 100644 --- a/Dockerfile.promtail.ocp +++ b/Dockerfile.promtail.ocp @@ -1,11 +1,11 @@ -FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder ARG GOARCH="amd64" WORKDIR /go/src/github.com/grafana/loki COPY . . RUN touch loki-build-image/.uptodate && mkdir /build RUN make BUILD_IN_CONTAINER=false cmd/promtail/promtail -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 Loki Promtail" \ io.k8s.description="An agent responsible for gathering logs and sending them to Loki." \ io.openshift.tags="grafana,prometheus,monitoring" \