public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Docker images 8.2 (#41973)

Browse Source
This commit is contained in:
Berbe
2022-04-04 12:40:18 +02:00
committed by GitHub
parent 82a0a5fec1
commit b69d2e87dd
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+5 -3
View File
@@ -4,6 +4,7 @@ WORKDIR /usr/src/app/
COPY package.json yarn.lock ./
COPY packages packages
COPY plugins-bundled plugins-bundled
RUN apk --no-cache add git
RUN yarn install --pure-lockfile --no-progress
@@ -19,7 +20,7 @@ RUN yarn build
FROM golang:1.17.3-alpine3.14 as go-builder
RUN apk add --no-cache gcc g++
RUN apk add --no-cache gcc g++ make
WORKDIR $GOPATH/src/github.com/grafana/grafana
@@ -29,10 +30,11 @@ COPY cue.mod cue.mod
COPY packages/grafana-schema packages/grafana-schema
COPY public/app/plugins public/app/plugins
COPY pkg pkg
COPY build.go package.json ./
COPY Makefile build.go package.json ./
COPY .bingo .bingo
RUN go mod verify
RUN go run build.go build
RUN make build-go
# Final stage
FROM alpine:3.14.3
Dockerfile.ubuntu
+6 -2
View File
@@ -4,6 +4,7 @@ WORKDIR /usr/src/app/
COPY package.json yarn.lock ./
COPY packages packages
COPY plugins-bundled plugins-bundled
RUN apt-get update && apt-get install -yq git
RUN yarn install --pure-lockfile
@@ -19,10 +20,13 @@ RUN yarn build
FROM golang:1.17.3 AS go-builder
RUN apk add --no-cache make
WORKDIR /src/grafana
COPY go.mod go.sum embed.go ./
COPY build.go package.json ./
COPY Makefile build.go package.json ./
COPY .bingo .bingo
COPY pkg pkg/
COPY cue cue/
COPY cue.mod cue.mod/
@@ -30,7 +34,7 @@ COPY packages/grafana-schema packages/grafana-schema/
COPY public/app/plugins public/app/plugins/
RUN go mod verify
RUN go run build.go build
RUN make build-go
FROM ubuntu:20.04