Support for local Docker builds

* add a git-ignored `local/` folder for Makefile/Dockerfile
* import `local/Makefile` to root Makefile
* add `.dockerignore`
This commit is contained in:
David Kaltschmidt
2018-05-07 12:32:18 +02:00
parent afec9ec5be
commit c3cc60b080
3 changed files with 22 additions and 0 deletions

18
.dockerignore Normal file
View File

@ -0,0 +1,18 @@
.awcache
.dockerignore
.git
.gitignore
.github
data*
dist
docker
docs
dump.rdb
node_modules
/local
/tmp
/vendor
*.yml
*.md
/vendor
/tmp

2
.gitignore vendored
View File

@ -44,7 +44,9 @@ docker-compose.yaml
/conf/provisioning/**/custom.yaml
profile.cov
/grafana
/local
.notouch
/Makefile.local
/pkg/cmd/grafana-cli/grafana-cli
/pkg/cmd/grafana-server/grafana-server
/pkg/cmd/grafana-server/debug

View File

@ -1,3 +1,5 @@
-include local/Makefile
all: deps build
deps-go: