From ca2a67970be93f54813d133e899ad297070fd2c9 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Wed, 9 Jan 2019 21:52:31 +0100
Subject: [PATCH] Convert to docker multistage Dockerfile

---
 Dockerfile | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 234915029e20..c73f1b249211 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openshift/origin-base
+FROM openshift/origin-release:golang-1.10 AS builder
 
 ENV GOPATH="/go"
 ENV GOBIN="${GOPATH}/bin"
@@ -7,12 +7,20 @@ RUN mkdir -p $GOBIN
 
 COPY . $GOPATH/src/github.com/grafana/grafana
 
-RUN yum install -y golang make git && \
-    cd $GOPATH/src/github.com/grafana/grafana && \
-    go run build.go build && \
-    cp $GOPATH/src/github.com/grafana/grafana/bin/linux-$(go env GOARCH)/grafana-server /usr/bin/ && \
-    yum autoremove -y golang make git && yum clean all && \
-    rm -rf .git
+#RUN yum install -y make git
+RUN cd $GOPATH/src/github.com/grafana/grafana && go run build.go build
+RUN cp $GOPATH/src/github.com/grafana/grafana/bin/linux-$(go env GOARCH)/grafana-server /usr/bin/
+RUN rm -rf $GOPATH/src/github.com/grafana/grafana/.git
+
+FROM openshift/origin-base
+
+ENV GOPATH="/go"
+ENV GOBIN="${GOPATH}/bin"
+ENV PATH="${GOBIN}:${PATH}"
+RUN mkdir -p $GOBIN
+
+COPY --from=builder /usr/bin/grafana-server /usr/bin/grafana-server
+COPY --from=builder $GOPATH/src/github.com/grafana/grafana $GOPATH/src/github.com/grafana/grafana
 
 LABEL io.k8s.display-name="Grafana" \
       io.k8s.description="" \