From 552676cc9d596c44ef05b02db01350134d944d85 Mon Sep 17 00:00:00 2001 From: Mark Honeychurch Date: Mon, 18 Nov 2019 12:20:39 +1300 Subject: [PATCH 1/2] Ignore local override file Adding an ignore rule for docker-compose.override.yml should allow people to clone this repo and use an override file to match their environment, without that file causing issues every time they pull a new version of the repo. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cbaffa8..4b029d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.sql.gz .netbox +docker-compose.override.yml From 29185fb9fdfa1fb6a8b557d16cd4dd78899e9a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Mon, 25 Nov 2019 17:09:37 +0100 Subject: [PATCH 2/2] reorganized docker ignore file .. and added some more files to it. --- .dockerignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 1b2bacc..23492a4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,7 @@ +.git .github .travis.yml +*.md +env build* -*.env -.git +docker-compose.override.yml