Skip to content

Commit

Permalink
Updating prom-label-proxy builder & base images to be consistent with…
Browse files Browse the repository at this point in the history 
… ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/2f29408622931b40e3d23370c21a7fec758a8f98/images/prom-label-proxy.yml
  • Loading branch information
AOS Automation Release Team committed Jan 12, 2021
1 parent de0a460 commit ffce97b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.ocp
View file
Original file line number Diff line number Diff line change
@@ -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 ffce97b

Please sign in to comment.