Merge branch 'master' into drop-7.10-ci

Author: chorrell

.travis.yml

@@ -3,19 +3,29 @@ sudo: required
 services:
     - docker
 
-addons:
-  apt:
-    sources:
-      - debian-sid
-    packages:
-      - shellcheck
-
 script:
-    - shellcheck *.sh
-    - ./test-build.sh $NODE_VERSION
+    - if [ "true" = "${SHELLCHECK-}" ]; then shellcheck *.sh ; fi
+    - if [ -n "${NODE_VERSION-}" ]; then ./test-build.sh $NODE_VERSION ; fi
+    - if [ "true" = "${DOCTOCCHECK-}" ]; then
+         nvm install node &&
+         npm i -g doctoc  &&
+         cp README.md README.md.tmp &&
+         doctoc --title='## Table of Contents' --github README.md &&
+         diff -q README.md README.md.tmp;
+      fi
 
 env:
-    matrix :
-        - NODE_VERSION: '4.8'
-        - NODE_VERSION: '6.11'
-        - NODE_VERSION: '8.1'
+    - DOCTOCCHECK: true
+    - NODE_VERSION: '4.8'
+    - NODE_VERSION: '6.11'
+    - NODE_VERSION: '8.1'
+
+matrix:
+  include:
+    env: SHELLCHECK=true
+    addons:
+      apt:
+        sources:
+          - debian-sid
+        packages:
+          - shellcheck

README.md

@@ -7,6 +7,8 @@
 
 The official Node.js docker image, made with love by the node community.
 
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 ## Table of Contents
 
   - [What is Node.js?](#what-is-nodejs)
@@ -30,6 +32,8 @@ The official Node.js docker image, made with love by the node community.
   - [Docker Working Group Members](#docker-working-group-members)
   - [Docker Working Group Collaborators](#docker-working-group-collaborators)
 
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
 ## What is Node.js?
 
 Node.js is a platform built on Chrome's JavaScript runtime for easily building

test-build.sh

@@ -34,16 +34,14 @@ for version in "${versions[@]}"; do
 
   if ! docker build -t node:"$tag" "$version"; then
     fatal "Build of $tag failed!"
-  else
-    info "Build of $tag succeeded."
   fi
+  info "Build of $tag succeeded."
 
   OUTPUT=$(docker run --rm -it node:"$tag" node -e "process.stdout.write(process.versions.node)")
   if [ "$OUTPUT" != "$tag" ]; then
     fatal "Test of $tag failed!"
-  else
-    info "Test of $tag succeeded."
   fi
+  info "Test of $tag succeeded."
 
   variants=$(echo "$version"/*/ | xargs -n1 basename)
 
@@ -55,16 +53,14 @@ for version in "${versions[@]}"; do
 
     if ! docker build -t node:"$tag-$variant" "$version/$variant"; then
       fatal "Build of $tag-$variant failed!"
-    else
-      info "Build of $tag-$variant succeeded."
     fi
+    info "Build of $tag-$variant succeeded."
 
     OUTPUT=$(docker run --rm -it node:"$tag-$variant" node -e "process.stdout.write(process.versions.node)")
     if [ "$OUTPUT" != "$tag" ]; then
       fatal "Test of $tag-$variant failed!"
-    else
-      info "Test of $tag-$variant succeeded."
     fi
+    info "Test of $tag-$variant succeeded."
 
   done