Merge pull request nodejs#578 from nodejs/update-node-6.12

PeterDaveHello · web-flow · commit d9c1f0d40d8b · 2017-11-08T09:15:33.000+08:00
Update node.js v6.x to v6.12 with Yarn v1.3.2
diff --git a/6.12/Dockerfile b/6.12/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
   done
 
-ENV NODE_VERSION 6.11.5
+ENV NODE_VERSION 6.12.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.2.1
+ENV YARN_VERSION 1.3.2
 
 RUN set -ex \
   && for key in \
diff --git a/6.12/alpine/Dockerfile b/6.12/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV NODE_VERSION 6.11.5
+ENV NODE_VERSION 6.12.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \
     && rm -Rf "node-v$NODE_VERSION" \
     && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt
 
-ENV YARN_VERSION 1.2.1
+ENV YARN_VERSION 1.3.2
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \
diff --git a/6.12/architectures b/6.12/architectures
diff --git a/6.12/onbuild/Dockerfile b/6.12/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6.11.5
+FROM node:6.12.0
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/6.12/slim/Dockerfile b/6.12/slim/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
   done
 
-ENV NODE_VERSION 6.11.5
+ENV NODE_VERSION 6.12.0
 
 RUN buildDeps='xz-utils' \
     && ARCH= && dpkgArch="$(dpkg --print-architecture)" \
@@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \
     && apt-get purge -y --auto-remove $buildDeps \
     && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.2.1
+ENV YARN_VERSION 1.3.2
 
 RUN set -ex \
   && for key in \
diff --git a/6.12/stretch/Dockerfile b/6.12/stretch/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
   done
 
-ENV NODE_VERSION 6.11.5
+ENV NODE_VERSION 6.12.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.2.1
+ENV YARN_VERSION 1.3.2
 
 RUN set -ex \
   && for key in \
diff --git a/6.12/wheezy/Dockerfile b/6.12/wheezy/Dockerfile
@@ -20,7 +20,7 @@ RUN set -ex \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
   done
 
-ENV NODE_VERSION 6.11.5
+ENV NODE_VERSION 6.12.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -36,7 +36,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
   && ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.2.1
+ENV YARN_VERSION 1.3.2
 
 RUN set -ex \
   && for key in \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -8,11 +8,11 @@ hash git 2>/dev/null || { echo >&2 "git not found, exiting."; }
 # shellcheck disable=SC2034
 array_4_8='4 argon';
 # shellcheck disable=SC2034
-array_6_11='6 boron';
+array_6_12='6 boron';
 # shellcheck disable=SC2034
 array_8_9='8 carbon';
 # shellcheck disable=SC2034
-array_9_0='9 latest';
+array_9_1='9 latest';
 
 cd "$(cd "${0%/*}" && pwd -P)";
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:6.11.5`
	`1`	`+FROM node:6.12.0`
`2`	`2`
`3`	`3`	`RUN mkdir -p /usr/src/app`
`4`	`4`	`WORKDIR /usr/src/app`