From c3cc60b080a7fb56eae39cebe5dfdbed5f729ef1 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Mon, 7 May 2018 12:32:18 +0200 Subject: [PATCH] Support for local Docker builds * add a git-ignored `local/` folder for Makefile/Dockerfile * import `local/Makefile` to root Makefile * add `.dockerignore` --- .dockerignore | 18 ++++++++++++++++++ .gitignore | 2 ++ Makefile | 2 ++ 3 files changed, 22 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000000..c79fe777899 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,18 @@ +.awcache +.dockerignore +.git +.gitignore +.github +data* +dist +docker +docs +dump.rdb +node_modules +/local +/tmp +/vendor +*.yml +*.md +/vendor +/tmp diff --git a/.gitignore b/.gitignore index cf13dac6d9b..953c98d04aa 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Makefile b/Makefile index 6f7beb837d8..c1d755d247d 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +-include local/Makefile + all: deps build deps-go: