Skip to content

Commit

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

Updating grafana builder & base images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Feb 24, 2021
2 parents 0ef8a9c + c9b6ec0 commit 1075a44
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.ocp
@@ -1,5 +1,5 @@
# Golang build container
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 $GOPATH/src/github.com/grafana/grafana
ENV GOFLAGS="-mod=vendor"
Expand All @@ -19,7 +19,7 @@ RUN cp $GOPATH/src/github.com/grafana/grafana/bin/linux-$(go env GOARCH)/grafana
/usr/bin/

# Final container
FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.ci.openshift.org/ocp/4.6:base

LABEL io.k8s.display-name="Grafana" \
io.k8s.description="Grafana is an open-source, general purpose dashboard and graph composer" \
Expand Down

0 comments on commit 1075a44

Please sign in to comment.