Skip to content

Commit

Permalink
delay go mod verify until all is copied (grafana#37246)
Browse files Browse the repository at this point in the history
  • Loading branch information
wbrowne authored Jul 27, 2021
1 parent e8eb73f commit 5670237
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5670237

Please sign in to comment.