From 676db59c525e03232988b318ecd1356ad896092e Mon Sep 17 00:00:00 2001 From: Anthony Yeh Date: Wed, 11 Dec 2019 11:15:22 -0800 Subject: [PATCH 1/2] Make .gitignore rules safer. In particular, `bin*` ignores any file anywhere that even starts with "bin", of which we have many (e.g. "binlog_blah"). This change scopes these rules down to only match directories (`/` suffix) at the root of the repo (`/` prefix). Signed-off-by: Anthony Yeh --- .gitignore | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2561bdd9379..c502ea1ca73 100644 --- a/.gitignore +++ b/.gitignore @@ -80,9 +80,8 @@ releases # Vagrant .vagrant -dist/* -py-vtdb* -vthook* -bin* - -vtdataroot* +/dist/ +/py-vtdb/ +/vthook/ +/bin/ +/vtdataroot/ From 7c3074ed8af7eda46e81afee27c530aa1cecae0f Mon Sep 17 00:00:00 2001 From: Anthony Yeh Date: Wed, 11 Dec 2019 13:53:01 -0800 Subject: [PATCH 2/2] Add new ignores to .dockerignore too. So docker doesn't try to pull them into its build context. Signed-off-by: Anthony Yeh --- .dockerignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.dockerignore b/.dockerignore index 5b123fd0195..58354ff4211 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,3 +5,8 @@ java/*/target java/*/bin php/vendor releases +/dist/ +/py-vtdb/ +/vthook/ +/bin/ +/vtdataroot/