Skip to content

Bug 1872080: Updating Dockerfile.ocp baseimages to mach ocp-build-data config #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 31, 2020
Merged

Bug 1872080: Updating Dockerfile.ocp baseimages to mach ocp-build-data config #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.ocp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Golang build container
FROM openshift/origin-release:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-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 openshift/origin-base
FROM registry.svc.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