From a0d4f90a64213e99327ec811b680a59f5f7e563b Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Thu, 14 Jan 2021 00:59:20 +0000 Subject: [PATCH] Updating ose-prometheus-adapter builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4a98c8d67fb1b0233d689c4bcc7f97e61da53999/images/ose-prometheus-adapter.yml --- Dockerfile.ocp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ocp b/Dockerfile.ocp index 6db6680d1..b133f85c1 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder COPY . /go/src/github.com/directxman12/k8s-prometheus-adapter @@ -8,7 +8,7 @@ RUN make RUN mv /go/src/github.com/directxman12/k8s-prometheus-adapter/_output/$(go env GOARCH)/adapter /usr/bin/cm-adapter -FROM registry.svc.ci.openshift.org/ocp/4.6:base +FROM registry.ci.openshift.org/ocp/4.6:base COPY --from=builder /usr/bin/cm-adapter /usr/bin/cm-adapter