Skip to content

Commit

Permalink
Merge pull request #42 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….6-ose-prometheus-adapter

Updating ose-prometheus-adapter builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Feb 24, 2021
2 parents 06726fb + a0d4f90 commit 7f012a2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions 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

Expand All @@ -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

Expand Down

0 comments on commit 7f012a2

Please sign in to comment.