nodejs · chorrell · Nov 9, 2017 · Nov 8, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -16,10 +16,10 @@ script:
 
 env:
     - DOCTOCCHECK: true
-    - NODE_VERSION: '4.*'
-    - NODE_VERSION: '6.*'
-    - NODE_VERSION: '8.*'
-    - NODE_VERSION: '9.*'
+    - NODE_VERSION: '4'
+    - NODE_VERSION: '6'
+    - NODE_VERSION: '8'
+    - NODE_VERSION: '9'
 
 matrix:
   include:

diff --git a/4.8/Dockerfile → 4/Dockerfile b/4.8/Dockerfile → 4/Dockerfile
diff --git a/4.8/alpine/Dockerfile → 4/alpine/Dockerfile b/4.8/alpine/Dockerfile → 4/alpine/Dockerfile
diff --git a/4.8/architectures → 4/architectures b/4.8/architectures → 4/architectures
diff --git a/4.8/onbuild/Dockerfile → 4/onbuild/Dockerfile b/4.8/onbuild/Dockerfile → 4/onbuild/Dockerfile
diff --git a/4.8/slim/Dockerfile → 4/slim/Dockerfile b/4.8/slim/Dockerfile → 4/slim/Dockerfile
diff --git a/4.8/stretch/Dockerfile → 4/stretch/Dockerfile b/4.8/stretch/Dockerfile → 4/stretch/Dockerfile
diff --git a/4.8/wheezy/Dockerfile → 4/wheezy/Dockerfile b/4.8/wheezy/Dockerfile → 4/wheezy/Dockerfile
diff --git a/6.12/Dockerfile → 6/Dockerfile b/6.12/Dockerfile → 6/Dockerfile
diff --git a/6.12/alpine/Dockerfile → 6/alpine/Dockerfile b/6.12/alpine/Dockerfile → 6/alpine/Dockerfile
diff --git a/6.12/architectures → 6/architectures b/6.12/architectures → 6/architectures
diff --git a/6.12/onbuild/Dockerfile → 6/onbuild/Dockerfile b/6.12/onbuild/Dockerfile → 6/onbuild/Dockerfile
diff --git a/6.12/slim/Dockerfile → 6/slim/Dockerfile b/6.12/slim/Dockerfile → 6/slim/Dockerfile
diff --git a/6.12/stretch/Dockerfile → 6/stretch/Dockerfile b/6.12/stretch/Dockerfile → 6/stretch/Dockerfile
diff --git a/6.12/wheezy/Dockerfile → 6/wheezy/Dockerfile b/6.12/wheezy/Dockerfile → 6/wheezy/Dockerfile
diff --git a/8.9/Dockerfile → 8/Dockerfile b/8.9/Dockerfile → 8/Dockerfile
diff --git a/8.9/alpine/Dockerfile → 8/alpine/Dockerfile b/8.9/alpine/Dockerfile → 8/alpine/Dockerfile
diff --git a/8.9/onbuild/Dockerfile → 8/onbuild/Dockerfile b/8.9/onbuild/Dockerfile → 8/onbuild/Dockerfile
diff --git a/8.9/slim/Dockerfile → 8/slim/Dockerfile b/8.9/slim/Dockerfile → 8/slim/Dockerfile
diff --git a/8.9/stretch/Dockerfile → 8/stretch/Dockerfile b/8.9/stretch/Dockerfile → 8/stretch/Dockerfile
diff --git a/8.9/wheezy/Dockerfile → 8/wheezy/Dockerfile b/8.9/wheezy/Dockerfile → 8/wheezy/Dockerfile
diff --git a/9.1/Dockerfile → 9/Dockerfile b/9.1/Dockerfile → 9/Dockerfile
diff --git a/9.1/alpine/Dockerfile → 9/alpine/Dockerfile b/9.1/alpine/Dockerfile → 9/alpine/Dockerfile
diff --git a/9.1/onbuild/Dockerfile → 9/onbuild/Dockerfile b/9.1/onbuild/Dockerfile → 9/onbuild/Dockerfile
diff --git a/9.1/slim/Dockerfile → 9/slim/Dockerfile b/9.1/slim/Dockerfile → 9/slim/Dockerfile
diff --git a/9.1/stretch/Dockerfile → 9/stretch/Dockerfile b/9.1/stretch/Dockerfile → 9/stretch/Dockerfile
diff --git a/9.1/wheezy/Dockerfile → 9/wheezy/Dockerfile b/9.1/wheezy/Dockerfile → 9/wheezy/Dockerfile
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -6,13 +6,13 @@ hash git 2>/dev/null || { echo >&2 "git not found, exiting."; }
 
 # Used dynamically: print "$array_" $1
 # shellcheck disable=SC2034
-array_4_8='4 argon';
+array_4='4 argon';
 # shellcheck disable=SC2034
-array_6_12='6 boron';
+array_6='6 boron';
 # shellcheck disable=SC2034
-array_8_9='8 carbon';
+array_8='8 carbon';
 # shellcheck disable=SC2034
-array_9_1='9 latest';
+array_9='9 latest';
 
 cd "$(cd "${0%/*}" && pwd -P)";
 
@@ -47,11 +47,12 @@ for version in "${versions[@]}"; do
 	# Skip "docs" and other non-docker directories
 	[ -f "$version/Dockerfile" ] || continue
 
-	eval stub="$(echo "$version" | awk -F. '{ print "$array_" $1 "_" $2 }')";
+	eval stub="$(echo "$version" | awk -F. '{ print "$array_" $1 }')";
 	commit="$(fileCommit "$version")"
 	fullVersion="$(grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)"
+	minorVersion="$(echo "$fullVersion" | cut -d'.' -f2)"
 
-	versionAliases=( $fullVersion $version ${stub} )
+	versionAliases=( $fullVersion $version.$minorVersion ${stub} )
 	# Get supported architectures for a specific version. See details in function.sh
 	supportedArches=( $(get_supported_arches "$version" "default") )
 

diff --git a/update.sh b/update.sh
@@ -31,7 +31,7 @@ function update_node_version {
 		shift
 	fi
 
-	fullVersion="$(curl -sSL --compressed 'https://nodejs.org/dist' | grep '<a href="v'"$version." | sed -E 's!.*<a href="v([^"/]+)/?".*!\1!' | cut -f 3 -d . | sort -n | tail -1)"
+	fullVersion="$(curl -sSL --compressed 'https://nodejs.org/dist' | grep '<a href="v'"$version." | sed -E 's!.*<a href="v([^"/]+)/?".*!\1!' | cut -d'.' -f2,3| sort -n | tail -1)"
 	(
 		cp "$template" "$dockerfile"
 		local fromprefix=