apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for local Makefile to docker (#41296)

Browse Source
pull/41315/head
Guilherme Caulada 4 years ago committed by GitHub
parent fb5a65d9be
commit 3cefa0bbba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      .dockerignore
  2. 1
      Dockerfile

1
.dockerignore
Unescape View File

@ -13,7 +13,6 @@ docs
dump.rdb dump.rdb
node_modules node_modules
**/node_modules **/node_modules
/local
/tmp /tmp
*.yml *.yml
!.yarnrc.yml !.yarnrc.yml

1
Dockerfile
Unescape View File

@ -27,6 +27,7 @@ RUN apk add --no-cache gcc g++ make
WORKDIR /grafana WORKDIR /grafana
COPY go.mod go.sum embed.go Makefile build.go package.json ./ COPY go.mod go.sum embed.go Makefile build.go package.json ./
COPY ./local/* ./local/
COPY cue cue COPY cue cue
COPY packages/grafana-schema packages/grafana-schema COPY packages/grafana-schema packages/grafana-schema
COPY public/app/plugins public/app/plugins COPY public/app/plugins public/app/plugins

Write Preview
Loading…
Cancel
Save