nodejs
/
docker-node
mirror of https://github.com/nodejs/docker-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #730 from nodejs/editorocnfig 

Introduce EditorConfig
This commit is contained in:
Laurent Goderre 2018-05-15 10:09:12 -04:00 committed by GitHub
parent 85ae047ff3 bbf199c459
commit 42eae256ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 67 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.editorconfig Normal file
View File

@ -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

95
.travis.yml
View File

@ -22,6 +22,17 @@ stages:
jobs: jobs:
include: include:
- stage: Test
env:
- TEST: Editor Config check
language: node_js
node_js:
- lts/*
install:
- npm i -g eclint
script:
- eclint check
- stage: Test - stage: Test
env: env:
- TEST: Doc Toc Check - TEST: Doc Toc Check
@ -53,105 +64,105 @@ jobs:
# Docker Build # # Docker Build #
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "10" - NODE_VERSION: "10"
- VARIANT: "default" - VARIANT: "default"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "10" - NODE_VERSION: "10"
- VARIANT: "alpine" - VARIANT: "alpine"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "10" - NODE_VERSION: "10"
- VARIANT: "slim" - VARIANT: "slim"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "10" - NODE_VERSION: "10"
- VARIANT: "stretch" - VARIANT: "stretch"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "6" - NODE_VERSION: "6"
- VARIANT: "default" - VARIANT: "default"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "6" - NODE_VERSION: "6"
- VARIANT: "alpine" - VARIANT: "alpine"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "6" - NODE_VERSION: "6"
- VARIANT: "onbuild" - VARIANT: "onbuild"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "6" - NODE_VERSION: "6"
- VARIANT: "slim" - VARIANT: "slim"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "6" - NODE_VERSION: "6"
- VARIANT: "stretch" - VARIANT: "stretch"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "8" - NODE_VERSION: "8"
- VARIANT: "default" - VARIANT: "default"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "8" - NODE_VERSION: "8"
- VARIANT: "alpine" - VARIANT: "alpine"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "8" - NODE_VERSION: "8"
- VARIANT: "onbuild" - VARIANT: "onbuild"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "8" - NODE_VERSION: "8"
- VARIANT: "slim" - VARIANT: "slim"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "8" - NODE_VERSION: "8"
- VARIANT: "stretch" - VARIANT: "stretch"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "9" - NODE_VERSION: "9"
- VARIANT: "default" - VARIANT: "default"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "9" - NODE_VERSION: "9"
- VARIANT: "alpine" - VARIANT: "alpine"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "9" - NODE_VERSION: "9"
- VARIANT: "onbuild" - VARIANT: "onbuild"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "9" - NODE_VERSION: "9"
- VARIANT: "slim" - VARIANT: "slim"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "9" - NODE_VERSION: "9"
- VARIANT: "stretch" - VARIANT: "stretch"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "chakracore/10" - NODE_VERSION: "chakracore/10"
- VARIANT: "default" - VARIANT: "default"
- stage: Build - stage: Build
env: env:
- NODE_VERSION: "chakracore/8" - NODE_VERSION: "chakracore/8"
- VARIANT: "default" - VARIANT: "default"

2
docs/BestPractices.md
View File

@ -105,7 +105,7 @@ RUN deluser --remove-home node \
## Memory ## 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" -m "300M" --memory-swap "1G"

4
update.sh
View File

@ -79,8 +79,8 @@ function add_stage() {
echo ' - stage: Build echo ' - stage: Build
env: env:
- NODE_VERSION: "'"$version"'" - NODE_VERSION: "'"$version"'"
- VARIANT: "'"$variant"'" - VARIANT: "'"$variant"'"
' >>.travis.yml ' >>.travis.yml
} }