From a957d7a827aa177ff052bb805924205f9ebbf757 Mon Sep 17 00:00:00 2001 From: rzadp Date: Wed, 22 May 2019 16:20:05 +0200 Subject: [PATCH 01/12] Consolidated .gitignore --- .gitignore | 40 +++++++++++++++++++++++++++++++++++- deployment/.gitignore | 7 ------- deployment/oracle/.gitignore | 2 -- monitor/.gitignore | 7 ------- oracle-e2e/.gitignore | 2 -- ui/.gitignore | 29 -------------------------- 6 files changed, 39 insertions(+), 48 deletions(-) delete mode 100644 deployment/.gitignore delete mode 100644 deployment/oracle/.gitignore delete mode 100644 monitor/.gitignore delete mode 100644 oracle-e2e/.gitignore delete mode 100644 ui/.gitignore diff --git a/.gitignore b/.gitignore index 4a4805f78..a674d8b21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,44 @@ +# dependencies node_modules + +# testing +coverage + +# production +build + +# misc +.DS_Store .env +.env.local +.env.development.local +.env.test.local +.env.production.local .idea .nyc_output -coverage/ logs/ +responses/* +!responses/.gitkeep +*.err +*.out +data + +# contracts build +ui/src/contracts + +# compiled css +*.css + +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +#deployment +*.retry +hosts.yml +hosts +*.log +Vagrantfile +vagrant-hosts.yml +.vagrant + diff --git a/deployment/.gitignore b/deployment/.gitignore deleted file mode 100644 index 0dc8bbd71..000000000 --- a/deployment/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.retry -hosts.yml -hosts -*.log -Vagrantfile -vagrant-hosts.yml -.vagrant diff --git a/deployment/oracle/.gitignore b/deployment/oracle/.gitignore deleted file mode 100644 index ccee6ffe2..000000000 --- a/deployment/oracle/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -hosts.yml -hosts diff --git a/monitor/.gitignore b/monitor/.gitignore deleted file mode 100644 index 9214e8710..000000000 --- a/monitor/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.env -node_modules -responses/* -!responses/.gitkeep -*.err -*.out -.idea diff --git a/oracle-e2e/.gitignore b/oracle-e2e/.gitignore deleted file mode 100644 index 902b28133..000000000 --- a/oracle-e2e/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules/ -data/ diff --git a/ui/.gitignore b/ui/.gitignore deleted file mode 100644 index 9381186a8..000000000 --- a/ui/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -# See https://help.github.com/ignore-files/ for more about ignoring files. - -# dependencies -/node_modules - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env -.env.local -.env.development.local -.env.test.local -.env.production.local -.idea - -# contracts build -/src/contracts - -# compiled css -*.css - -npm-debug.log* -yarn-debug.log* -yarn-error.log* From 6f573b9b6787e07d08d61b4a4e1e951c6e6a47fa Mon Sep 17 00:00:00 2001 From: rzadp Date: Wed, 22 May 2019 16:21:21 +0200 Subject: [PATCH 02/12] Consolidated .nvmrc --- .nvmrc | 1 + oracle-e2e/.nvmrc | 1 - oracle/.nvmrc | 1 - ui/.nvmrc | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 .nvmrc delete mode 100644 oracle-e2e/.nvmrc delete mode 100644 oracle/.nvmrc delete mode 100644 ui/.nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..ec3053c8d --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +10.15 diff --git a/oracle-e2e/.nvmrc b/oracle-e2e/.nvmrc deleted file mode 100644 index 45a4fb75d..000000000 --- a/oracle-e2e/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/oracle/.nvmrc b/oracle/.nvmrc deleted file mode 100644 index 1416d7ec0..000000000 --- a/oracle/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v8.9 diff --git a/ui/.nvmrc b/ui/.nvmrc deleted file mode 100644 index d55a2ad2f..000000000 --- a/ui/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v10.15 From 4b32e8de41cb7000f9a5129b4bfebec7a0c76385 Mon Sep 17 00:00:00 2001 From: rzadp Date: Wed, 22 May 2019 16:33:28 +0200 Subject: [PATCH 03/12] Move .editorconfig to root dir. --- oracle/.editorconfig => .editorconfig | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename oracle/.editorconfig => .editorconfig (100%) diff --git a/oracle/.editorconfig b/.editorconfig similarity index 100% rename from oracle/.editorconfig rename to .editorconfig From fddaab23781c652cb807f9594c5c39d3a51172e1 Mon Sep 17 00:00:00 2001 From: rzadp Date: Wed, 22 May 2019 16:35:31 +0200 Subject: [PATCH 04/12] Remove nyc config file (as it's not used) --- oracle/.nycrc | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 oracle/.nycrc diff --git a/oracle/.nycrc b/oracle/.nycrc deleted file mode 100644 index 3b0d84da1..000000000 --- a/oracle/.nycrc +++ /dev/null @@ -1,6 +0,0 @@ -{ - "all": true, - "include": [ - "src/**/*.js" - ] -} From 31f2788a2bb870753af92f9fb6334f3fb9b73164 Mon Sep 17 00:00:00 2001 From: rzadp Date: Wed, 22 May 2019 17:01:17 +0200 Subject: [PATCH 05/12] Merged dockerignore --- .dockerignore | 17 +++++++++++++++++ oracle-e2e/.dockerignore | 5 ----- oracle/.dockerignore | 12 ------------ ui/.dockerignore | 5 ----- 4 files changed, 17 insertions(+), 22 deletions(-) create mode 100644 .dockerignore delete mode 100644 oracle-e2e/.dockerignore delete mode 100644 oracle/.dockerignore delete mode 100644 ui/.dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..8e0e328c1 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,17 @@ +node_modules +**/node_modules +**/**/node_modules + +.git +**/.git +**/**/.git + +submodules +**/submodules +**/**/submodules + +.gitmodules + +oracle-e2e/Dockerfile +oracle-e2e/.dockerignore +oracle-e2e/docker-compose.yml diff --git a/oracle-e2e/.dockerignore b/oracle-e2e/.dockerignore deleted file mode 100644 index cd791a60c..000000000 --- a/oracle-e2e/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules -submodules -Dockerfile -.dockerignore -docker-compose.yml diff --git a/oracle/.dockerignore b/oracle/.dockerignore deleted file mode 100644 index 2755ebab3..000000000 --- a/oracle/.dockerignore +++ /dev/null @@ -1,12 +0,0 @@ -CODE_OF_CONDUCT.md -CONTRIBUTING.md -docker-compose.yml -Dockerfile -.dockerignore -docs -e2e -.env* -.git* -LICENSE -README.md -node_modules diff --git a/ui/.dockerignore b/ui/.dockerignore deleted file mode 100644 index 8feb4f5b5..000000000 --- a/ui/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules -e2e-script -.git -.env -.dockerignore From 1aae4904543a3f60eca7b31b1a3277d7af7e527a Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 10:42:24 +0200 Subject: [PATCH 06/12] Simplidied dockerignore --- .dockerignore | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.dockerignore b/.dockerignore index 8e0e328c1..20e7b8675 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,17 +1,6 @@ -node_modules **/node_modules -**/**/node_modules - -.git -**/.git -**/**/.git - -submodules **/submodules -**/**/submodules - +**/Dockerfile +**/.dockerignore +**/docker-compose.yml .gitmodules - -oracle-e2e/Dockerfile -oracle-e2e/.dockerignore -oracle-e2e/docker-compose.yml From ec8493aa44a28ffb93c9fc7daf50a161628888c9 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 10:45:55 +0200 Subject: [PATCH 07/12] Duplicating dockerignore for oracle --- oracle/.dockerignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 oracle/.dockerignore diff --git a/oracle/.dockerignore b/oracle/.dockerignore new file mode 100644 index 000000000..20e7b8675 --- /dev/null +++ b/oracle/.dockerignore @@ -0,0 +1,6 @@ +**/node_modules +**/submodules +**/Dockerfile +**/.dockerignore +**/docker-compose.yml +.gitmodules From 2a509990ca2ea26baba8f17a1cca37bb982ba192 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 10:48:18 +0200 Subject: [PATCH 08/12] Removed submodules --- oracle/submodules/poa-bridge-contracts | 1 - ui/submodules/poa-bridge-contracts | 1 - 2 files changed, 2 deletions(-) delete mode 160000 oracle/submodules/poa-bridge-contracts delete mode 160000 ui/submodules/poa-bridge-contracts diff --git a/oracle/submodules/poa-bridge-contracts b/oracle/submodules/poa-bridge-contracts deleted file mode 160000 index 46151629a..000000000 --- a/oracle/submodules/poa-bridge-contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 46151629adb3dd20e6fb47d4ba91b88c6d388c4f diff --git a/ui/submodules/poa-bridge-contracts b/ui/submodules/poa-bridge-contracts deleted file mode 160000 index 492f6d010..000000000 --- a/ui/submodules/poa-bridge-contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 492f6d010a1324676801df918f0449965e770c64 From 5e698821bb8b75c333e8cb5326ac313b313b8962 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 11:45:37 +0200 Subject: [PATCH 09/12] Ignoring .git --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 20e7b8675..207b187f3 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,5 @@ **/node_modules +**/.git **/submodules **/Dockerfile **/.dockerignore From cbb55318ac6bb0b006a7c5dd5b9d1d228f409068 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 11:46:32 +0200 Subject: [PATCH 10/12] Update dockerignore --- .dockerignore | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 207b187f3..1cc166112 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,15 @@ **/node_modules -**/.git **/submodules **/Dockerfile **/.dockerignore **/docker-compose.yml .gitmodules +**/.git +**/.env* +**/docs +**/*.md +**/*.png +**/*.jpg + +contracts/test +oracle/test From 1595405749fd672d7feeebec5716e948cebe7216 Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 13:32:37 +0200 Subject: [PATCH 11/12] Fix ui-e2e tests not working on CI --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 1cc166112..048781341 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,7 +5,6 @@ **/docker-compose.yml .gitmodules **/.git -**/.env* **/docs **/*.md **/*.png From 3ab05cf728bd2cb21841d26c5cf4353576eb9ced Mon Sep 17 00:00:00 2001 From: rzadp Date: Thu, 23 May 2019 14:04:41 +0200 Subject: [PATCH 12/12] Ignoring images only in the oracle --- .dockerignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 048781341..549a551aa 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,8 +7,8 @@ **/.git **/docs **/*.md -**/*.png -**/*.jpg contracts/test oracle/test +oracle/**/*.png +oracle/**/*.jpg