From 92bad11c067fc3b40b9cfa3a87bbefcb1120a8d2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 14 May 2018 19:30:57 +0800 Subject: [PATCH 1/3] Add basic .editorconfig [ci skip] --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..ce04bc2e7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.sh] +indent_size = 2 +indent_style = space From 7d6c726941350e298aa10b3b3b900999d823a825 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 14 May 2018 19:35:10 +0800 Subject: [PATCH 2/3] Add EditorConfig test on Travis CI --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index 270ceb480..9a2adfb86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,17 @@ stages: jobs: include: + - stage: Test + env: + - TEST: Editor Config check + language: node_js + node_js: + - lts/* + install: + - npm i -g eclint + script: + - eclint check + - stage: Test env: - TEST: Doc Toc Check From bbf199c4595c596ac36b394cbc9e2362e014efdf Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 15 May 2018 20:05:37 +0800 Subject: [PATCH 3/3] Fix format issues --- .travis.yml | 84 +++++++++++++++++++++---------------------- docs/BestPractices.md | 2 +- update.sh | 4 +-- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a2adfb86..147d91793 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,105 +64,105 @@ jobs: # Docker Build # - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "default" + - NODE_VERSION: "10" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "alpine" + - NODE_VERSION: "10" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "slim" + - NODE_VERSION: "10" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "stretch" + - NODE_VERSION: "10" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "default" + - NODE_VERSION: "6" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "alpine" + - NODE_VERSION: "6" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "onbuild" + - NODE_VERSION: "6" + - VARIANT: "onbuild" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "slim" + - NODE_VERSION: "6" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "stretch" + - NODE_VERSION: "6" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "default" + - NODE_VERSION: "8" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "alpine" + - NODE_VERSION: "8" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "onbuild" + - NODE_VERSION: "8" + - VARIANT: "onbuild" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "slim" + - NODE_VERSION: "8" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "stretch" + - NODE_VERSION: "8" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "default" + - NODE_VERSION: "9" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "alpine" + - NODE_VERSION: "9" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "onbuild" + - NODE_VERSION: "9" + - VARIANT: "onbuild" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "slim" + - NODE_VERSION: "9" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "stretch" + - NODE_VERSION: "9" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "chakracore/10" - - VARIANT: "default" + - NODE_VERSION: "chakracore/10" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "chakracore/8" - - VARIANT: "default" + - NODE_VERSION: "chakracore/8" + - VARIANT: "default" diff --git a/docs/BestPractices.md b/docs/BestPractices.md index f543d8e5f..261a14cf6 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -105,7 +105,7 @@ RUN deluser --remove-home node \ ## Memory -By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host you should limit how much memory they can consume. +By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host you should limit how much memory they can consume. ``` -m "300M" --memory-swap "1G" diff --git a/update.sh b/update.sh index 3170a6979..9a751a814 100755 --- a/update.sh +++ b/update.sh @@ -79,8 +79,8 @@ function add_stage() { echo ' - stage: Build env: - - NODE_VERSION: "'"$version"'" - - VARIANT: "'"$variant"'" + - NODE_VERSION: "'"$version"'" + - VARIANT: "'"$variant"'" ' >>.travis.yml }