Skip to content

Commit

Permalink
Merge pull request #331 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.6-prom-label-proxy

Updating prom-label-proxy builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Jan 14, 2021
2 parents de0a460 + ffce97b commit 2b51499
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.ocp
@@ -1,11 +1,11 @@
# FROM directives are overriden by CI system (both Prow CI and OSBS)
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

WORKDIR /go/src/github.com/openshift/prom-label-proxy
COPY . .
RUN if yum install -y prometheus-promu; then export BUILD_PROMU=false; fi && make build

FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6
FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6
COPY --from=builder /go/src/github.com/openshift/prom-label-proxy/prom-label-proxy /usr/bin/prom-label-proxy

LABEL io.k8s.display-name="" \
Expand Down

0 comments on commit 2b51499

Please sign in to comment.