From 7aed967db02bf118506bb76aeeec63b02068c1af Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Mon, 7 Nov 2022 18:03:55 -0500 Subject: [PATCH] improve go dependency cacheability, always build go in alpine --- Dockerfile | 15 ++++++++++----- Dockerfile.ubuntu | 19 +++++++++++++------ packaging/docker/Dockerfile | 2 +- packaging/docker/ubuntu.Dockerfile | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f2171195691..8a54e9d8eb12 100644 --- 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 " +LABEL maintainer="Grafana Labs " ARG GF_UID="472" ARG GF_GID="0" diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 72c4019dc9d3..a5dbfa80f04f 100644 --- 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 " +LABEL maintainer="Grafana Labs " ARG GF_UID="472" ARG GF_GID="0" diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 8ecf2a2e4961..34387f7c5915 100644 --- 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 " +LABEL maintainer="Grafana Labs " ARG GF_UID="472" ARG GF_GID="0" diff --git a/packaging/docker/ubuntu.Dockerfile b/packaging/docker/ubuntu.Dockerfile index f9167b0a2557..c5d008d43eb1 100644 --- 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 " +LABEL maintainer="Grafana Labs " ARG GF_UID="472" ARG GF_GID="0"