From c440fd4f5ad82f9bfe179ce9405e50cf9d31785f Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 27 Jul 2021 12:15:32 +0200 Subject: [PATCH] delay go mod verify until all is copied (#37246) (#37249) (cherry picked from commit 56702376b6b3d595bd5ccd199324522009234d57) Co-authored-by: Will Browne --- Dockerfile | 4 +--- Dockerfile.ubuntu | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2dbb5193c9a..2571aaa428a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,14 +24,12 @@ RUN apk add --no-cache gcc g++ WORKDIR $GOPATH/src/github.com/grafana/grafana COPY go.mod go.sum embed.go ./ - -RUN go mod verify - COPY cue cue COPY public/app/plugins public/app/plugins COPY pkg pkg COPY build.go package.json ./ +RUN go mod verify RUN go run build.go build # Final stage diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index e3e8cb84944..19948c4a0ba 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -22,14 +22,12 @@ FROM golang:1.16 AS go-builder WORKDIR /src/grafana COPY go.mod go.sum embed.go ./ - -RUN go mod verify - COPY build.go package.json ./ COPY pkg pkg/ COPY cue cue/ COPY public/app/plugins public/app/plugins/ +RUN go mod verify RUN go run build.go build FROM ubuntu:20.04