IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-12-05 10:17:22 +01:00
parent 735c28580d a6ef156922
commit 180ca021b5
111 changed files with 2537 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -90,6 +90,8 @@ Choose this option to build on platforms other than linux/amd64 and/or not have
The resulting image will be tagged as `grafana/grafana:dev`
Notice: If you are using Docker for MacOS, be sure to let limit of Memory bigger than 2 GiB (at docker -> Perferences -> Advanced), otherwize you may faild at `grunt build`
### Dev config
Create a custom.ini in the conf directory to override default configuration options.