improve go dependency cacheability, always build go in alpine

grafana · Nov 15, 2022 · 7aed967 · 7aed967
1 parent 1c6432c
commit 7aed967
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -38,22 +38,27 @@ RUN apk add --no-cache gcc g++ make
 
 WORKDIR /tmp/grafana
 
-COPY go.mod go.sum embed.go Makefile build.go package.json ./
+COPY go.* ./
+COPY .bingo .bingo
+
+RUN go mod download && \
+    go install github.com/bwplotka/bingo@latest && \
+    bingo get
+
+COPY embed.go Makefile build.go package.json ./
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
 COPY public/api-spec.json public/api-spec.json
 COPY pkg pkg
 COPY scripts scripts
 COPY cue.mod cue.mod
-COPY .bingo .bingo
 
-RUN go mod verify && \
-    make build-go
+RUN make build-go
 
 # Final stage
 FROM ${BASE_IMAGE}
 
-LABEL maintainer="Grafana team <hello@grafana.com>"
+LABEL maintainer="Grafana Labs <hello@grafana.com>"
 
 ARG GF_UID="472"
 ARG GF_GID="0"

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -32,26 +32,33 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.19.3 as go-builder
+FROM golang:1.19.3-alpine3.15 as go-builder
+
+RUN apk add --no-cache gcc g++ make
 
 WORKDIR /tmp/grafana
 
-COPY go.mod go.sum embed.go Makefile build.go package.json ./
+COPY go.* ./
+COPY .bingo .bingo
+
+RUN go mod download && \
+    go install github.com/bwplotka/bingo@latest && \
+    bingo get
+
+COPY embed.go Makefile build.go package.json ./
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
 COPY public/api-spec.json public/api-spec.json
 COPY pkg pkg
 COPY scripts scripts
 COPY cue.mod cue.mod
-COPY .bingo .bingo
 
-RUN go mod verify && \
-    make build-go
+RUN make build-go
 
 # Final stage
 FROM ${BASE_IMAGE}
 
-LABEL maintainer="Grafana team <hello@grafana.com>"
+LABEL maintainer="Grafana Labs <hello@grafana.com>"
 
 ARG GF_UID="472"
 ARG GF_GID="0"

diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
@@ -28,7 +28,7 @@ RUN tar xzf /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
 # Final stage
 FROM ${BASE_IMAGE}
 
-LABEL maintainer="Grafana team <hello@grafana.com>"
+LABEL maintainer="Grafana Labs <hello@grafana.com>"
 
 ARG GF_UID="472"
 ARG GF_GID="0"

diff --git a/packaging/docker/ubuntu.Dockerfile b/packaging/docker/ubuntu.Dockerfile
@@ -25,7 +25,7 @@ RUN tar xzf /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
 # Final stage
 FROM ${BASE_IMAGE}
 
-LABEL maintainer="Grafana team <hello@grafana.com>"
+LABEL maintainer="Grafana Labs <hello@grafana.com>"
 
 ARG GF_UID="472"
 ARG GF_GID="0"