Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Node to 8.13 #5102

Merged
merged 1 commit into from
Nov 27, 2018
Merged

Update Node to 8.13 #5102

merged 1 commit into from
Nov 27, 2018

Conversation

SimenB
Copy link
Contributor

@SimenB SimenB commented Nov 25, 2018

https://nodejs.org/en/blog/release/v8.13.0/

Also update v10 to default to stretch instead of jessie, and adds extra lts/current tags to v10 and v11.

nodejs/docker-node#921
nodejs/docker-node#913
nodejs/docker-node#930

I think the diff includes v6 because of the later reverted ccache stuff? nodejs/docker-node#933

@tianon
Copy link
Member

tianon commented Nov 26, 2018

It should be fine -- our diff-pr script is smart enough to appropriately ignore things that haven't actually changed so we can review only the salient portions.

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 8be7f5d..706f29d 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -6,63 +6,69 @@ node:alpine @ ppc64le
 node:alpine @ s390x
 node:boron @ amd64
 node:boron @ arm32v7
+node:boron @ arm64v8
 node:boron @ i386
+node:boron @ ppc64le
+node:boron @ s390x
 node:boron-alpine @ amd64
+node:boron-jessie @ amd64
+node:boron-jessie @ arm32v7
+node:boron-jessie @ i386
 node:boron-onbuild @ amd64
 node:boron-onbuild @ arm32v7
 node:boron-onbuild @ i386
 node:boron-slim @ amd64
 node:boron-slim @ arm32v7
 node:boron-slim @ i386
-node:boron-stretch @ amd64
-node:boron-stretch @ arm32v7
-node:boron-stretch @ arm64v8
-node:boron-stretch @ i386
-node:boron-stretch @ ppc64le
-node:boron-stretch @ s390x
 node:carbon @ amd64
 node:carbon @ arm32v7
+node:carbon @ arm64v8
 node:carbon @ i386
+node:carbon @ ppc64le
+node:carbon @ s390x
 node:carbon-alpine @ amd64
 node:carbon-alpine @ arm32v6
 node:carbon-alpine @ arm64v8
 node:carbon-alpine @ i386
 node:carbon-alpine @ ppc64le
 node:carbon-alpine @ s390x
+node:carbon-jessie @ amd64
+node:carbon-jessie @ arm32v7
+node:carbon-jessie @ i386
 node:carbon-onbuild @ amd64
 node:carbon-onbuild @ arm32v7
+node:carbon-onbuild @ arm64v8
 node:carbon-onbuild @ i386
+node:carbon-onbuild @ ppc64le
+node:carbon-onbuild @ s390x
 node:carbon-slim @ amd64
 node:carbon-slim @ arm32v7
+node:carbon-slim @ arm64v8
 node:carbon-slim @ i386
-node:carbon-stretch @ amd64
-node:carbon-stretch @ arm32v7
-node:carbon-stretch @ arm64v8
-node:carbon-stretch @ i386
-node:carbon-stretch @ ppc64le
-node:carbon-stretch @ s390x
+node:carbon-slim @ ppc64le
+node:carbon-slim @ s390x
 node:chakracore @ amd64
 node:chakracore-8 @ amd64
-node:dubnium @ amd64
-node:dubnium @ arm32v7
-node:dubnium-alpine @ amd64
-node:dubnium-alpine @ arm32v6
-node:dubnium-alpine @ arm64v8
-node:dubnium-alpine @ i386
-node:dubnium-alpine @ ppc64le
-node:dubnium-alpine @ s390x
-node:dubnium-slim @ amd64
-node:dubnium-slim @ arm32v7
-node:dubnium-stretch @ amd64
-node:dubnium-stretch @ arm32v7
-node:dubnium-stretch @ arm64v8
-node:dubnium-stretch @ ppc64le
-node:dubnium-stretch @ s390x
 node:latest @ amd64
 node:latest @ arm32v7
 node:latest @ arm64v8
 node:latest @ ppc64le
 node:latest @ s390x
+node:lts @ amd64
+node:lts @ arm32v7
+node:lts @ arm64v8
+node:lts @ ppc64le
+node:lts @ s390x
+node:lts-alpine @ amd64
+node:lts-alpine @ arm32v6
+node:lts-alpine @ arm64v8
+node:lts-alpine @ i386
+node:lts-alpine @ ppc64le
+node:lts-alpine @ s390x
+node:lts-jessie @ amd64
+node:lts-jessie @ arm32v7
+node:lts-slim @ amd64
+node:lts-slim @ arm32v7
 node:slim @ amd64
 node:slim @ arm32v7
 node:slim @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index a4e9bdf..eb16646 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -22,18 +22,18 @@ node:8-jessie
 node:8-onbuild
 node:8-slim
 node:8-stretch
-node:8.12
-node:8.12-alpine
-node:8.12-jessie
-node:8.12-onbuild
-node:8.12-slim
-node:8.12-stretch
-node:8.12.0
-node:8.12.0-alpine
-node:8.12.0-jessie
-node:8.12.0-onbuild
-node:8.12.0-slim
-node:8.12.0-stretch
+node:8.13
+node:8.13-alpine
+node:8.13-jessie
+node:8.13-onbuild
+node:8.13-slim
+node:8.13-stretch
+node:8.13.0
+node:8.13.0-alpine
+node:8.13.0-jessie
+node:8.13.0-onbuild
+node:8.13.0-slim
+node:8.13.0-stretch
 node:10
 node:10-alpine
 node:10-jessie
@@ -81,11 +81,20 @@ node:chakracore-8.11.1
 node:chakracore-10
 node:chakracore-10.13
 node:chakracore-10.13.0
+node:current
+node:current-alpine
+node:current-slim
+node:current-stretch
 node:dubnium
 node:dubnium-alpine
 node:dubnium-jessie
 node:dubnium-slim
 node:dubnium-stretch
 node:latest
+node:lts
+node:lts-alpine
+node:lts-jessie
+node:lts-slim
+node:lts-stretch
 node:slim
 node:stretch
diff --git a/node_alpine/Dockerfile b/node_alpine/Dockerfile
index e144655..b3ba9da 100644
--- a/node_alpine/Dockerfile
+++ b/node_alpine/Dockerfile
@@ -28,9 +28,9 @@ RUN addgroup -g 1000 node \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -52,9 +52,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_boron-alpine/Dockerfile b/node_boron-alpine/Dockerfile
index 107a9af..319aa99 100644
--- a/node_boron-alpine/Dockerfile
+++ b/node_boron-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN addgroup -g 1000 node \
         linux-headers \
         make \
         python \
-  # gpg keys listed at https://github.com/nodejs/node#release-team
+  # gpg keys listed at https://github.com/nodejs/node#release-keys
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     FD3A5288F042B6850C66B31F09FE44734EB7990E \
@@ -28,9 +28,9 @@ RUN addgroup -g 1000 node \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -52,9 +52,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_boron-stretch/Dockerfile b/node_boron-jessie/Dockerfile
similarity index 79%
rename from node_boron-stretch/Dockerfile
rename to node_boron-jessie/Dockerfile
index 17b227b..88aa054 100644
--- a/node_boron-stretch/Dockerfile
+++ b/node_boron-jessie/Dockerfile
@@ -1,9 +1,9 @@
-FROM buildpack-deps:stretch
+FROM buildpack-deps:jessie
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
+# gpg keys listed at https://github.com/nodejs/node#release-keys
 RUN set -ex \
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -16,9 +16,9 @@ RUN set -ex \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done
 
 ENV NODE_VERSION 6.14.4
@@ -47,9 +47,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_boron-slim/Dockerfile b/node_boron-slim/Dockerfile
index 3e13b9e..10a8e81 100644
--- a/node_boron-slim/Dockerfile
+++ b/node_boron-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:jessie-slim
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
+# gpg keys listed at https://github.com/nodejs/node#release-keys
 RUN set -ex \
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -16,9 +16,9 @@ RUN set -ex \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done
 
 ENV NODE_VERSION 6.14.4
@@ -52,9 +52,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_boron/Dockerfile b/node_boron/Dockerfile
index b4acb81..b86bf27 100644
--- a/node_boron/Dockerfile
+++ b/node_boron/Dockerfile
@@ -1,9 +1,9 @@
-FROM buildpack-deps:jessie
+FROM buildpack-deps:stretch
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
+# gpg keys listed at https://github.com/nodejs/node#release-keys
 RUN set -ex \
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -16,9 +16,9 @@ RUN set -ex \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done
 
 ENV NODE_VERSION 6.14.4
@@ -47,9 +47,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_carbon-alpine/Dockerfile b/node_carbon-alpine/Dockerfile
index ebb0ec2..5b8de8d 100644
--- a/node_carbon-alpine/Dockerfile
+++ b/node_carbon-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.8
 
-ENV NODE_VERSION 8.12.0
+ENV NODE_VERSION 8.13.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -16,7 +16,7 @@ RUN addgroup -g 1000 node \
         linux-headers \
         make \
         python \
-  # gpg keys listed at https://github.com/nodejs/node#release-team
+  # gpg keys listed at https://github.com/nodejs/node#release-keys
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     FD3A5288F042B6850C66B31F09FE44734EB7990E \
@@ -28,9 +28,9 @@ RUN addgroup -g 1000 node \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -46,15 +46,15 @@ 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.9.4
+ENV YARN_VERSION 1.12.3
 
 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_latest/Dockerfile b/node_carbon-jessie/Dockerfile
similarity index 80%
copy from node_latest/Dockerfile
copy to node_carbon-jessie/Dockerfile
index f755150..ae8b16a 100644
--- a/node_latest/Dockerfile
+++ b/node_carbon-jessie/Dockerfile
@@ -1,9 +1,9 @@
-FROM buildpack-deps:stretch
+FROM buildpack-deps:jessie
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 11.2.0
+ENV NODE_VERSION 8.13.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -28,9 +28,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -46,9 +46,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_carbon-onbuild/Dockerfile b/node_carbon-onbuild/Dockerfile
index ce8907b..37fbfc7 100644
--- a/node_carbon-onbuild/Dockerfile
+++ b/node_carbon-onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.12.0-jessie
+FROM node:8.13.0-stretch
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/node_carbon-slim/Dockerfile b/node_carbon-slim/Dockerfile
index f2df83b..8f3fc75 100644
--- a/node_carbon-slim/Dockerfile
+++ b/node_carbon-slim/Dockerfile
@@ -1,27 +1,9 @@
-FROM debian:jessie-slim
+FROM debian:stretch-slim
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
-RUN set -ex \
-  && for key in \
-    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-    FD3A5288F042B6850C66B31F09FE44734EB7990E \
-    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-    56730D5401028683275BD23C23EFEFE93C4CFFFE \
-    77984A986EBC2AA786BC0F66B01FBB92821C587A \
-    8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-  ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
-  done
-
-ENV NODE_VERSION 8.12.0
+ENV NODE_VERSION 8.13.0
 
 RUN buildDeps='xz-utils' \
     && ARCH= && dpkgArch="$(dpkg --print-architecture)" \
@@ -34,9 +16,24 @@ RUN buildDeps='xz-utils' \
       i386) ARCH='x86';; \
       *) echo "unsupported architecture"; exit 1 ;; \
     esac \
-    && set -x \
-    && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \
+    && set -ex \
+    && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
+    && for key in \
+      94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+      FD3A5288F042B6850C66B31F09FE44734EB7990E \
+      71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+      56730D5401028683275BD23C23EFEFE93C4CFFFE \
+      77984A986EBC2AA786BC0F66B01FBB92821C587A \
+      8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
+    ; do \
+      gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+      gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+      gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    done \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
     && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
@@ -46,15 +43,15 @@ 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.9.4
+ENV YARN_VERSION 1.12.3
 
 RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_carbon-stretch/Dockerfile b/node_carbon-stretch/Dockerfile
deleted file mode 100644
index bbd97f0..0000000
diff --git a/node_carbon/Dockerfile b/node_carbon/Dockerfile
index 8b7fef5..85d7e5a 100644
--- a/node_carbon/Dockerfile
+++ b/node_carbon/Dockerfile
@@ -1,27 +1,9 @@
-FROM buildpack-deps:jessie
+FROM buildpack-deps:stretch
 
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
-RUN set -ex \
-  && for key in \
-    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-    FD3A5288F042B6850C66B31F09FE44734EB7990E \
-    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-    56730D5401028683275BD23C23EFEFE93C4CFFFE \
-    77984A986EBC2AA786BC0F66B01FBB92821C587A \
-    8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-  ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
-  done
-
-ENV NODE_VERSION 8.12.0
+ENV NODE_VERSION 8.13.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -33,6 +15,23 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     i386) ARCH='x86';; \
     *) echo "unsupported architecture"; exit 1 ;; \
   esac \
+  # gpg keys listed at https://github.com/nodejs/node#release-keys
+  && set -ex \
+  && for key in \
+    94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+    FD3A5288F042B6850C66B31F09FE44734EB7990E \
+    71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+    56730D5401028683275BD23C23EFEFE93C4CFFFE \
+    77984A986EBC2AA786BC0F66B01FBB92821C587A \
+    8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
+  ; do \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+  done \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
   && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
@@ -41,15 +40,15 @@ 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.9.4
+ENV YARN_VERSION 1.12.3
 
 RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_chakracore-8/Dockerfile b/node_chakracore-8/Dockerfile
index f0913eb..b268bee 100644
--- a/node_chakracore-8/Dockerfile
+++ b/node_chakracore-8/Dockerfile
@@ -23,9 +23,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_latest/Dockerfile b/node_latest/Dockerfile
index f755150..699ea2b 100644
--- a/node_latest/Dockerfile
+++ b/node_latest/Dockerfile
@@ -28,9 +28,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
   && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -46,9 +46,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_dubnium-alpine/Dockerfile b/node_lts-alpine/Dockerfile
similarity index 80%
rename from node_dubnium-alpine/Dockerfile
rename to node_lts-alpine/Dockerfile
index f5c22ab..df71708 100644
--- a/node_dubnium-alpine/Dockerfile
+++ b/node_lts-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN addgroup -g 1000 node \
         linux-headers \
         make \
         python \
-  # gpg keys listed at https://github.com/nodejs/node#release-team
+  # gpg keys listed at https://github.com/nodejs/node#release-keys
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
     FD3A5288F042B6850C66B31F09FE44734EB7990E \
@@ -28,9 +28,9 @@ RUN addgroup -g 1000 node \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -52,9 +52,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_dubnium/Dockerfile b/node_lts-jessie/Dockerfile
similarity index 80%
rename from node_dubnium/Dockerfile
rename to node_lts-jessie/Dockerfile
index 100af7a..136020c 100644
--- a/node_dubnium/Dockerfile
+++ b/node_lts-jessie/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:jessie
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
+# gpg keys listed at https://github.com/nodejs/node#release-keys
 RUN set -ex \
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -16,9 +16,9 @@ RUN set -ex \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done
 
 ENV NODE_VERSION 10.13.0
@@ -47,9 +47,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_dubnium-slim/Dockerfile b/node_lts-slim/Dockerfile
similarity index 81%
rename from node_dubnium-slim/Dockerfile
rename to node_lts-slim/Dockerfile
index 20c9cb8..a40442e 100644
--- a/node_dubnium-slim/Dockerfile
+++ b/node_lts-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:jessie-slim
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
+# gpg keys listed at https://github.com/nodejs/node#release-keys
 RUN set -ex \
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -16,9 +16,9 @@ RUN set -ex \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done
 
 ENV NODE_VERSION 10.13.0
@@ -52,9 +52,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_dubnium-stretch/Dockerfile b/node_lts/Dockerfile
similarity index 80%
rename from node_dubnium-stretch/Dockerfile
rename to node_lts/Dockerfile
index c9ad9bb..f1519c4 100644
--- a/node_dubnium-stretch/Dockerfile
+++ b/node_lts/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:stretch
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-# gpg keys listed at https://github.com/nodejs/node#release-team
+# gpg keys listed at https://github.com/nodejs/node#release-keys
 RUN set -ex \
   && for key in \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
@@ -16,9 +16,9 @@ RUN set -ex \
     77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done
 
 ENV NODE_VERSION 10.13.0
@@ -47,9 +47,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
diff --git a/node_slim/Dockerfile b/node_slim/Dockerfile
index e77b190..05f8464 100644
--- a/node_slim/Dockerfile
+++ b/node_slim/Dockerfile
@@ -30,9 +30,9 @@ RUN buildDeps='xz-utils' \
       77984A986EBC2AA786BC0F66B01FBB92821C587A \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
     ; do \
-      gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-      gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-      gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+      gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+      gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+      gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
     done \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
     && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -49,9 +49,9 @@ RUN set -ex \
   && for key in \
     6A010C5166006599AA17F08146C2130DFD2497F5 \
   ; do \
-    gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
-    gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
-    gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    gpg --batch --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
   done \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \

@tianon
Copy link
Member

tianon commented Nov 26, 2018

LGTM

Build test of #5102; eacdc59; amd64 (node):

$ bashbrew build node:8.13.0-jessie
Building bashbrew/cache:90ddc1fe54a6e8d94d6c4bc95fcd023ea5c2d3c2ee1980500ea4183d19c4a002 (node:8.13.0-jessie)
Tagging node:8.13.0-jessie
Tagging node:8.13-jessie
Tagging node:8-jessie
Tagging node:carbon-jessie

$ test/run.sh node:8.13.0-jessie
testing node:8.13.0-jessie
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:8.13.0-alpine
Building bashbrew/cache:cadca5f0239daf4e0b8a1ae140a42ef9c0ac0a93ce975d158abb290a53c58cd5 (node:8.13.0-alpine)
Tagging node:8.13.0-alpine
Tagging node:8.13-alpine
Tagging node:8-alpine
Tagging node:carbon-alpine

$ test/run.sh node:8.13.0-alpine
testing node:8.13.0-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:8.13.0-slim
Building bashbrew/cache:8f30915895cbb883c9b214d85a8fc1d1f1c39b0a3a23d521397e0dbdc11fddd4 (node:8.13.0-slim)
Tagging node:8.13.0-slim
Tagging node:8.13-slim
Tagging node:8-slim
Tagging node:carbon-slim

$ test/run.sh node:8.13.0-slim
testing node:8.13.0-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:8.13.0-stretch
Building bashbrew/cache:16de8eb723e624cb69cd96a6a089a11ed4300c303d1c203d3bf6feec73157610 (node:8.13.0-stretch)
Tagging node:8.13.0-stretch
Tagging node:8.13-stretch
Tagging node:8-stretch
Tagging node:carbon-stretch
Tagging node:8.13.0
Tagging node:8.13
Tagging node:8
Tagging node:carbon

$ test/run.sh node:8.13.0-stretch
testing node:8.13.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-jessie
Building bashbrew/cache:6513d19ddc2f4abad72773afbbf9c39b65688196251e33f6f4052bb2a10be691 (node:6.14.4-jessie)
Tagging node:6.14.4-jessie
Tagging node:6.14-jessie
Tagging node:6-jessie
Tagging node:boron-jessie

$ test/run.sh node:6.14.4-jessie
testing node:6.14.4-jessie
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-alpine
Building bashbrew/cache:ceb0d81e160f7b53156f38953d082ed75da9a626d1c6ae84af03ac271d26c73c (node:6.14.4-alpine)
Tagging node:6.14.4-alpine
Tagging node:6.14-alpine
Tagging node:6-alpine
Tagging node:boron-alpine

$ test/run.sh node:6.14.4-alpine
testing node:6.14.4-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-onbuild
Building bashbrew/cache:8ac6a9cc162f359f547e278b07fbd551b000caa3c8b04e819ccbcc7c721845ef (node:6.14.4-onbuild)
Tagging node:6.14.4-onbuild
Tagging node:6.14-onbuild
Tagging node:6-onbuild
Tagging node:boron-onbuild

$ test/run.sh node:6.14.4-onbuild
testing node:6.14.4-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build node:6.14.4-slim
Building bashbrew/cache:73c51e53f31861798705c8dfcaf9ab9d938245e506c9a4cfa99da994841c0267 (node:6.14.4-slim)
Tagging node:6.14.4-slim
Tagging node:6.14-slim
Tagging node:6-slim
Tagging node:boron-slim

$ test/run.sh node:6.14.4-slim
testing node:6.14.4-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:6.14.4-stretch
Building bashbrew/cache:0a5b3ccb7b2453f0aec51e3d66f898d74b5a500a8b2fefdbe726267dd4f49c0e (node:6.14.4-stretch)
Tagging node:6.14.4-stretch
Tagging node:6.14-stretch
Tagging node:6-stretch
Tagging node:boron-stretch
Tagging node:6.14.4
Tagging node:6.14
Tagging node:6
Tagging node:boron

$ test/run.sh node:6.14.4-stretch
testing node:6.14.4-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:11.2.0-alpine
Building bashbrew/cache:9ffd61e316f9e2021780a215047a9605f6f75ee8bd1d99047007d4883e09ee5d (node:11.2.0-alpine)
Tagging node:11.2.0-alpine
Tagging node:11.2-alpine
Tagging node:11-alpine
Tagging node:current-alpine
Tagging node:alpine

$ test/run.sh node:11.2.0-alpine
testing node:11.2.0-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:11.2.0-slim
Building bashbrew/cache:7b35424d7fbf6916d77dd78d4659b791167a6505962f2fa148a173afb9d83438 (node:11.2.0-slim)
Tagging node:11.2.0-slim
Tagging node:11.2-slim
Tagging node:11-slim
Tagging node:current-slim
Tagging node:slim

$ test/run.sh node:11.2.0-slim
testing node:11.2.0-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:11.2.0-stretch
Building bashbrew/cache:4a03c89041a7519186251ebf8437b8ccd7e3760db8dd9a1cc0d9ae91728b73b0 (node:11.2.0-stretch)
Tagging node:11.2.0-stretch
Tagging node:11.2-stretch
Tagging node:11-stretch
Tagging node:current-stretch
Tagging node:stretch
Tagging node:11.2.0
Tagging node:11.2
Tagging node:11
Tagging node:current
Tagging node:latest

$ test/run.sh node:11.2.0-stretch
testing node:11.2.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-jessie
Building bashbrew/cache:051cd4b51072482fcb462ffe89da298cb155acbe91cc72a56a7b6113a5cc988a (node:10.13.0-jessie)
Tagging node:10.13.0-jessie
Tagging node:10.13-jessie
Tagging node:10-jessie
Tagging node:dubnium-jessie
Tagging node:lts-jessie

$ test/run.sh node:10.13.0-jessie
testing node:10.13.0-jessie
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-alpine
Building bashbrew/cache:447ffd4baaeb096e52f4e071a41b0f8091cb53632cd8080cbd09dac9d99a2ce6 (node:10.13.0-alpine)
Tagging node:10.13.0-alpine
Tagging node:10.13-alpine
Tagging node:10-alpine
Tagging node:dubnium-alpine
Tagging node:lts-alpine

$ test/run.sh node:10.13.0-alpine
testing node:10.13.0-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-slim
Building bashbrew/cache:fd33aecd68c17620852ab3c27ba4be873cfa0489f384faa4806ee2342009f305 (node:10.13.0-slim)
Tagging node:10.13.0-slim
Tagging node:10.13-slim
Tagging node:10-slim
Tagging node:dubnium-slim
Tagging node:lts-slim

$ test/run.sh node:10.13.0-slim
testing node:10.13.0-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:10.13.0-stretch
Building bashbrew/cache:ded093b3bdaaca18b8acb782a02f369fdd2b07e22ae1dcb150b8bddc4c0c4c75 (node:10.13.0-stretch)
Tagging node:10.13.0-stretch
Tagging node:10.13-stretch
Tagging node:10-stretch
Tagging node:dubnium-stretch
Tagging node:lts-stretch
Tagging node:10.13.0
Tagging node:10.13
Tagging node:10
Tagging node:dubnium
Tagging node:lts

$ test/run.sh node:10.13.0-stretch
testing node:10.13.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:chakracore-8.11.1
Building bashbrew/cache:89b34f484f61eaf3954655c0ecd96a96ac1e9430eed085a4dcd90be119b08f29 (node:chakracore-8.11.1)
Tagging node:chakracore-8.11.1
Tagging node:chakracore-8.11
Tagging node:chakracore-8

$ test/run.sh node:chakracore-8.11.1
testing node:chakracore-8.11.1
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:chakracore-10.13.0
Using bashbrew/cache:eba42e60073f10e6ae5fc65655613e64c84b2bd1f3994303c7df2912487a55d4 (node:chakracore-10.13.0)
Tagging node:chakracore-10.13.0
Tagging node:chakracore-10.13
Tagging node:chakracore-10
Tagging node:chakracore

$ test/run.sh node:chakracore-10.13.0
testing node:chakracore-10.13.0
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'node-hello-world' [5/5]...passed


$ bashbrew build node:8.13.0-onbuild
Building bashbrew/cache:e72e225d5b0b07c5aaa203145758a77a51c4123bb4450494b005ed3149fb7add (node:8.13.0-onbuild)
Tagging node:8.13.0-onbuild
Tagging node:8.13-onbuild
Tagging node:8-onbuild
Tagging node:carbon-onbuild

$ test/run.sh node:8.13.0-onbuild
testing node:8.13.0-onbuild
	'override-cmd' [1/1]...passed

@tianon
Copy link
Member

tianon commented Nov 26, 2018

What's the purpose of the node:current alias? Isn't that already what node:latest is?

@SimenB
Copy link
Contributor Author

SimenB commented Nov 27, 2018

current is the name used by node itself to describe what's latest in the docker world. See https://github.com/nodejs/Release/blob/master/README.md.

@tianon
Copy link
Member

tianon commented Nov 27, 2018

Ok, fair enough; thanks for the link.

@tianon tianon merged commit 3528bea into docker-library:master Nov 27, 2018
@SimenB SimenB deleted the patch-2 branch November 27, 2018 00:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants