From 6fb7a60a2b4248e65197b216bcd8c5b0d58393ae Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Mon, 4 May 2020 11:59:10 +0200
Subject: [PATCH] Dockerfile: Move Go step after JS step, since it's faster
 (#24221)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
---
 Dockerfile        | 34 ++++++++++++++++------------------
 Dockerfile.ubuntu | 26 +++++++++++++-------------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a7b60f6e222..f90f08aae7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,3 @@
-# Golang build container
-FROM golang:1.14.2-alpine3.11 as go-builder
-
-RUN apk add --no-cache gcc g++
-
-WORKDIR $GOPATH/src/github.com/grafana/grafana
-
-COPY go.mod go.sum ./
-
-RUN go mod verify
-
-COPY pkg pkg
-COPY build.go package.json ./
-
-RUN go run build.go build
-
-# Node build container
 FROM node:12.16.3-alpine3.11 as js-builder
 
 WORKDIR /usr/src/app/
@@ -33,7 +16,22 @@ COPY emails emails
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-# Final container
+FROM golang:1.14.2-alpine3.11 as go-builder
+
+RUN apk add --no-cache gcc g++
+
+WORKDIR $GOPATH/src/github.com/grafana/grafana
+
+COPY go.mod go.sum ./
+
+RUN go mod verify
+
+COPY pkg pkg
+COPY build.go package.json ./
+
+RUN go run build.go build
+
+# Final stage
 FROM alpine:3.11
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 39e5e5ba7e9..90855b09adc 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,16 +1,3 @@
-FROM golang:1.14.2 AS go-builder
-
-WORKDIR /src/grafana
-
-COPY go.mod go.sum ./
-
-RUN go mod verify
-
-COPY build.go package.json ./
-COPY pkg pkg/
-
-RUN go run build.go build
-
 FROM node:12.16.3-slim AS js-builder
 
 WORKDIR /usr/src/app/
@@ -29,6 +16,19 @@ COPY emails emails
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
+FROM golang:1.14.2 AS go-builder
+
+WORKDIR /src/grafana
+
+COPY go.mod go.sum ./
+
+RUN go mod verify
+
+COPY build.go package.json ./
+COPY pkg pkg/
+
+RUN go run build.go build
+
 FROM ubuntu:20.04
 
 LABEL maintainer="Grafana team <hello@grafana.com>"