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.

Sign up for GitHub

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

Jump to bottom

Node: update 12.18.3, 14.6.0, remove EOL Jessie variants, update Stretch LTS arches #8442

Merged
merged 1 commit into from
Jul 28, 2020
Merged

Node: update 12.18.3, 14.6.0, remove EOL Jessie variants, update Stretch LTS arches #8442

merged 1 commit into from
Jul 28, 2020

Conversation

nodejs-github-bot
Copy link
Contributor

@nodejs-github-bot nodejs-github-bot mentioned this pull request Jul 28, 2020
Merged
@SimenB
Copy link
Contributor

SimenB commented Jul 28, 2020

I don't understand why the script sometimes uses a shitty name 😞 We should probably tweak it to handle squash merges and start using that - in this case it might be because there was mutliple commits in the merge?

@github-actions
Copy link

Diff for a6c5f12: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e5c594c..10d3aad 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -26,97 +26,87 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 744e358d7ddee039618e304f98b9f979152ecced
 Directory: 10/buster-slim
 
-Tags: 10.22.0-jessie, 10.22-jessie, 10-jessie, dubnium-jessie
-Architectures: amd64, arm32v7
-GitCommit: 744e358d7ddee039618e304f98b9f979152ecced
-Directory: 10/jessie
-
-Tags: 10.22.0-jessie-slim, 10.22-jessie-slim, 10-jessie-slim, dubnium-jessie-slim
-Architectures: amd64, arm32v7
-GitCommit: 744e358d7ddee039618e304f98b9f979152ecced
-Directory: 10/jessie-slim
-
 Tags: 10.22.0-stretch, 10.22-stretch, 10-stretch, dubnium-stretch, 10.22.0, 10.22, 10, dubnium
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+Architectures: amd64, arm32v7, arm64v8
 GitCommit: 744e358d7ddee039618e304f98b9f979152ecced
 Directory: 10/stretch
 
 Tags: 10.22.0-stretch-slim, 10.22-stretch-slim, 10-stretch-slim, dubnium-stretch-slim, 10.22.0-slim, 10.22-slim, 10-slim, dubnium-slim
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+Architectures: amd64, arm32v7, arm64v8
 GitCommit: 744e358d7ddee039618e304f98b9f979152ecced
 Directory: 10/stretch-slim
 
-Tags: 12.18.2-alpine3.9, 12.18-alpine3.9, 12-alpine3.9, erbium-alpine3.9, lts-alpine3.9
+Tags: 12.18.3-alpine3.9, 12.18-alpine3.9, 12-alpine3.9, erbium-alpine3.9, lts-alpine3.9
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/alpine3.9
 
-Tags: 12.18.2-alpine3.10, 12.18-alpine3.10, 12-alpine3.10, erbium-alpine3.10, lts-alpine3.10
+Tags: 12.18.3-alpine3.10, 12.18-alpine3.10, 12-alpine3.10, erbium-alpine3.10, lts-alpine3.10
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/alpine3.10
 
-Tags: 12.18.2-alpine3.11, 12.18-alpine3.11, 12-alpine3.11, erbium-alpine3.11, lts-alpine3.11, 12.18.2-alpine, 12.18-alpine, 12-alpine, erbium-alpine, lts-alpine
+Tags: 12.18.3-alpine3.11, 12.18-alpine3.11, 12-alpine3.11, erbium-alpine3.11, lts-alpine3.11, 12.18.3-alpine, 12.18-alpine, 12-alpine, erbium-alpine, lts-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/alpine3.11
 
-Tags: 12.18.2-alpine3.12, 12.18-alpine3.12, 12-alpine3.12, erbium-alpine3.12, lts-alpine3.12
+Tags: 12.18.3-alpine3.12, 12.18-alpine3.12, 12-alpine3.12, erbium-alpine3.12, lts-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/alpine3.12
 
-Tags: 12.18.2-buster, 12.18-buster, 12-buster, erbium-buster, lts-buster
+Tags: 12.18.3-buster, 12.18-buster, 12-buster, erbium-buster, lts-buster
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/buster
 
-Tags: 12.18.2-buster-slim, 12.18-buster-slim, 12-buster-slim, erbium-buster-slim, lts-buster-slim
+Tags: 12.18.3-buster-slim, 12.18-buster-slim, 12-buster-slim, erbium-buster-slim, lts-buster-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/buster-slim
 
-Tags: 12.18.2-stretch, 12.18-stretch, 12-stretch, erbium-stretch, lts-stretch, 12.18.2, 12.18, 12, erbium, lts
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+Tags: 12.18.3-stretch, 12.18-stretch, 12-stretch, erbium-stretch, lts-stretch, 12.18.3, 12.18, 12, erbium, lts
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/stretch
 
-Tags: 12.18.2-stretch-slim, 12.18-stretch-slim, 12-stretch-slim, erbium-stretch-slim, lts-stretch-slim, 12.18.2-slim, 12.18-slim, 12-slim, erbium-slim, lts-slim
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1f26041ed1cdbe7df00004006c4105e6b960fc3e
+Tags: 12.18.3-stretch-slim, 12.18-stretch-slim, 12-stretch-slim, erbium-stretch-slim, lts-stretch-slim, 12.18.3-slim, 12.18-slim, 12-slim, erbium-slim, lts-slim
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: fdd2b251827817ac7bb4f0b2b082483abff8ea77
 Directory: 12/stretch-slim
 
-Tags: 14.5.0-alpine3.10, 14.5-alpine3.10, 14-alpine3.10, alpine3.10, current-alpine3.10
+Tags: 14.6.0-alpine3.10, 14.6-alpine3.10, 14-alpine3.10, alpine3.10, current-alpine3.10
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1d6a051d71e817f3947612a260ddcb02e48c2f74
+GitCommit: 77bc184f0c0a642a74cb44687e89a475d06ec20b
 Directory: 14/alpine3.10
 
-Tags: 14.5.0-alpine3.11, 14.5-alpine3.11, 14-alpine3.11, alpine3.11, current-alpine3.11, 14.5.0-alpine, 14.5-alpine, 14-alpine, alpine, current-alpine
+Tags: 14.6.0-alpine3.11, 14.6-alpine3.11, 14-alpine3.11, alpine3.11, current-alpine3.11, 14.6.0-alpine, 14.6-alpine, 14-alpine, alpine, current-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1d6a051d71e817f3947612a260ddcb02e48c2f74
+GitCommit: 77bc184f0c0a642a74cb44687e89a475d06ec20b
 Directory: 14/alpine3.11
 
-Tags: 14.5.0-alpine3.12, 14.5-alpine3.12, 14-alpine3.12, alpine3.12, current-alpine3.12
+Tags: 14.6.0-alpine3.12, 14.6-alpine3.12, 14-alpine3.12, alpine3.12, current-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1d6a051d71e817f3947612a260ddcb02e48c2f74
+GitCommit: 77bc184f0c0a642a74cb44687e89a475d06ec20b
 Directory: 14/alpine3.12
 
-Tags: 14.5.0-buster, 14.5-buster, 14-buster, buster, current-buster
+Tags: 14.6.0-buster, 14.6-buster, 14-buster, buster, current-buster
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1d6a051d71e817f3947612a260ddcb02e48c2f74
+GitCommit: 77bc184f0c0a642a74cb44687e89a475d06ec20b
 Directory: 14/buster
 
-Tags: 14.5.0-buster-slim, 14.5-buster-slim, 14-buster-slim, buster-slim, current-buster-slim
+Tags: 14.6.0-buster-slim, 14.6-buster-slim, 14-buster-slim, buster-slim, current-buster-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1d6a051d71e817f3947612a260ddcb02e48c2f74
+GitCommit: 77bc184f0c0a642a74cb44687e89a475d06ec20b
 Directory: 14/buster-slim
 
-Tags: 14.5.0-stretch, 14.5-stretch, 14-stretch, stretch, current-stretch, 14.5.0, 14.5, 14, latest, current
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1d6a051d71e817f3947612a260ddcb02e48c2f74
+Tags: 14.6.0-stretch, 14.6-stretch, 14-stretch, stretch, current-stretch, 14.6.0, 14.6, 14, latest, current
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: 77bc184f0c0a642a74cb44687e89a475d06ec20b
 Directory: 14/stretch
 
-Tags: 14.5.0-stretch-slim, 14.5-stretch-slim, 14-stretch-slim, stretch-slim, current-stretch-slim, 14.5.0-slim, 14.5-slim, 14-slim, slim, current-slim
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1d6a051d71e817f3947612a260ddcb02e48c2f74
+Tags: 14.6.0-stretch-slim, 14.6-stretch-slim, 14-stretch-slim, stretch-slim, current-stretch-slim, 14.6.0-slim, 14.6-slim, 14-slim, slim, current-slim
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: 77bc184f0c0a642a74cb44687e89a475d06ec20b
 Directory: 14/stretch-slim
diff --git a/_bashbrew-list b/_bashbrew-list
index d22c85d..0f3470a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,8 +5,6 @@ node:10-alpine3.10
 node:10-alpine3.11
 node:10-buster
 node:10-buster-slim
-node:10-jessie
-node:10-jessie-slim
 node:10-slim
 node:10-stretch
 node:10-stretch-slim
@@ -17,8 +15,6 @@ node:10.22-alpine3.10
 node:10.22-alpine3.11
 node:10.22-buster
 node:10.22-buster-slim
-node:10.22-jessie
-node:10.22-jessie-slim
 node:10.22-slim
 node:10.22-stretch
 node:10.22-stretch-slim
@@ -29,8 +25,6 @@ node:10.22.0-alpine3.10
 node:10.22.0-alpine3.11
 node:10.22.0-buster
 node:10.22.0-buster-slim
-node:10.22.0-jessie
-node:10.22.0-jessie-slim
 node:10.22.0-slim
 node:10.22.0-stretch
 node:10.22.0-stretch-slim
@@ -56,17 +50,17 @@ node:12.18-buster-slim
 node:12.18-slim
 node:12.18-stretch
 node:12.18-stretch-slim
-node:12.18.2
-node:12.18.2-alpine
-node:12.18.2-alpine3.9
-node:12.18.2-alpine3.10
-node:12.18.2-alpine3.11
-node:12.18.2-alpine3.12
-node:12.18.2-buster
-node:12.18.2-buster-slim
-node:12.18.2-slim
-node:12.18.2-stretch
-node:12.18.2-stretch-slim
+node:12.18.3
+node:12.18.3-alpine
+node:12.18.3-alpine3.9
+node:12.18.3-alpine3.10
+node:12.18.3-alpine3.11
+node:12.18.3-alpine3.12
+node:12.18.3-buster
+node:12.18.3-buster-slim
+node:12.18.3-slim
+node:12.18.3-stretch
+node:12.18.3-stretch-slim
 node:14
 node:14-alpine
 node:14-alpine3.10
@@ -77,26 +71,26 @@ node:14-buster-slim
 node:14-slim
 node:14-stretch
 node:14-stretch-slim
-node:14.5
-node:14.5-alpine
-node:14.5-alpine3.10
-node:14.5-alpine3.11
-node:14.5-alpine3.12
-node:14.5-buster
-node:14.5-buster-slim
-node:14.5-slim
-node:14.5-stretch
-node:14.5-stretch-slim
-node:14.5.0
-node:14.5.0-alpine
-node:14.5.0-alpine3.10
-node:14.5.0-alpine3.11
-node:14.5.0-alpine3.12
-node:14.5.0-buster
-node:14.5.0-buster-slim
-node:14.5.0-slim
-node:14.5.0-stretch
-node:14.5.0-stretch-slim
+node:14.6
+node:14.6-alpine
+node:14.6-alpine3.10
+node:14.6-alpine3.11
+node:14.6-alpine3.12
+node:14.6-buster
+node:14.6-buster-slim
+node:14.6-slim
+node:14.6-stretch
+node:14.6-stretch-slim
+node:14.6.0
+node:14.6.0-alpine
+node:14.6.0-alpine3.10
+node:14.6.0-alpine3.11
+node:14.6.0-alpine3.12
+node:14.6.0-buster
+node:14.6.0-buster-slim
+node:14.6.0-slim
+node:14.6.0-stretch
+node:14.6.0-stretch-slim
 node:alpine
 node:alpine3.10
 node:alpine3.11
@@ -120,8 +114,6 @@ node:dubnium-alpine3.10
 node:dubnium-alpine3.11
 node:dubnium-buster
 node:dubnium-buster-slim
-node:dubnium-jessie
-node:dubnium-jessie-slim
 node:dubnium-slim
 node:dubnium-stretch
 node:dubnium-stretch-slim
diff --git a/node_current-alpine/Dockerfile b/node_current-alpine/Dockerfile
index cedcc29..41b5331 100644
--- a/node_current-alpine/Dockerfile
+++ b/node_current-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.11
 
-ENV NODE_VERSION 14.5.0
+ENV NODE_VERSION 14.6.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="06cd37ebff802dda592aee08c2ca015650d8a134dd95e945b7bd78c4b73a8bd5" \
+          CHECKSUM="3bf72b8895b508f91880f816705428933aea44b1f57dbe3f1fef7d7595b64872" \
           ;; \
         *) ;; \
       esac \
@@ -47,6 +47,7 @@ RUN addgroup -g 1000 node \
       4ED778F539E3634C779C87C6D7062848A1AB005C \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
     ; 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" || \
diff --git a/node_current-alpine3.10/Dockerfile b/node_current-alpine3.10/Dockerfile
index d9091f8..3ec4ee4 100644
--- a/node_current-alpine3.10/Dockerfile
+++ b/node_current-alpine3.10/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.10
 
-ENV NODE_VERSION 14.5.0
+ENV NODE_VERSION 14.6.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="06cd37ebff802dda592aee08c2ca015650d8a134dd95e945b7bd78c4b73a8bd5" \
+          CHECKSUM="3bf72b8895b508f91880f816705428933aea44b1f57dbe3f1fef7d7595b64872" \
           ;; \
         *) ;; \
       esac \
@@ -47,6 +47,7 @@ RUN addgroup -g 1000 node \
       4ED778F539E3634C779C87C6D7062848A1AB005C \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
     ; 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" || \
diff --git a/node_current-alpine3.12/Dockerfile b/node_current-alpine3.12/Dockerfile
index 3f742d5..7a31115 100644
--- a/node_current-alpine3.12/Dockerfile
+++ b/node_current-alpine3.12/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.12
 
-ENV NODE_VERSION 14.5.0
+ENV NODE_VERSION 14.6.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="06cd37ebff802dda592aee08c2ca015650d8a134dd95e945b7bd78c4b73a8bd5" \
+          CHECKSUM="3bf72b8895b508f91880f816705428933aea44b1f57dbe3f1fef7d7595b64872" \
           ;; \
         *) ;; \
       esac \
@@ -47,6 +47,7 @@ RUN addgroup -g 1000 node \
       4ED778F539E3634C779C87C6D7062848A1AB005C \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
     ; 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" || \
diff --git a/node_current-buster-slim/Dockerfile b/node_current-buster-slim/Dockerfile
index 2fe6b63..39f48c7 100644
--- a/node_current-buster-slim/Dockerfile
+++ b/node_current-buster-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:buster-slim
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 14.5.0
+ENV NODE_VERSION 14.6.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
@@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       4ED778F539E3634C779C87C6D7062848A1AB005C \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
     ; 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" || \
diff --git a/node_current-buster/Dockerfile b/node_current-buster/Dockerfile
index 2b5d614..201e3e5 100644
--- a/node_current-buster/Dockerfile
+++ b/node_current-buster/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:buster
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 14.5.0
+ENV NODE_VERSION 14.6.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -29,6 +29,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     4ED778F539E3634C779C87C6D7062848A1AB005C \
     A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
     B9E2F5981AA6E0CD28160D9FF13993A75599653C \
+    C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
   ; 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" || \
diff --git a/node_current-slim/Dockerfile b/node_current-slim/Dockerfile
index 66e1734..b8f30c6 100644
--- a/node_current-slim/Dockerfile
+++ b/node_current-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:stretch-slim
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 14.5.0
+ENV NODE_VERSION 14.6.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
@@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
       4ED778F539E3634C779C87C6D7062848A1AB005C \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
     ; 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" || \
diff --git a/node_current/Dockerfile b/node_current/Dockerfile
index 58aabea..dc66a49 100644
--- a/node_current/Dockerfile
+++ b/node_current/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
 
-ENV NODE_VERSION 14.5.0
+ENV NODE_VERSION 14.6.0
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -29,6 +29,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     4ED778F539E3634C779C87C6D7062848A1AB005C \
     A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
     B9E2F5981AA6E0CD28160D9FF13993A75599653C \
+    C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
   ; 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" || \
diff --git a/node_dubnium-jessie-slim/Dockerfile b/node_dubnium-jessie-slim/Dockerfile
deleted file mode 100644
index e1729be..0000000
diff --git a/node_dubnium-jessie-slim/docker-entrypoint.sh b/node_dubnium-jessie-slim/docker-entrypoint.sh
deleted file mode 100755
index de6fa8a..0000000
diff --git a/node_dubnium-jessie/Dockerfile b/node_dubnium-jessie/Dockerfile
deleted file mode 100644
index c3ba688..0000000
diff --git a/node_dubnium-jessie/docker-entrypoint.sh b/node_dubnium-jessie/docker-entrypoint.sh
deleted file mode 100755
index de6fa8a..0000000
diff --git a/node_lts-alpine/Dockerfile b/node_lts-alpine/Dockerfile
index 688c3a2..ffb0467 100644
--- a/node_lts-alpine/Dockerfile
+++ b/node_lts-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.11
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \
+          CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \
           ;; \
         *) ;; \
       esac \
@@ -36,15 +36,13 @@ RUN addgroup -g 1000 node \
         python \
     # gpg keys listed at https://github.com/nodejs/node#release-keys
     && for key in \
+      4ED778F539E3634C779C87C6D7062848A1AB005C \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      FD3A5288F042B6850C66B31F09FE44734EB7990E \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-      B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-      77984A986EBC2AA786BC0F66B01FBB92821C587A \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      4ED778F539E3634C779C87C6D7062848A1AB005C \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
diff --git a/node_lts-alpine3.10/Dockerfile b/node_lts-alpine3.10/Dockerfile
index e41cebe..38d63ee 100644
--- a/node_lts-alpine3.10/Dockerfile
+++ b/node_lts-alpine3.10/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.10
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \
+          CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \
           ;; \
         *) ;; \
       esac \
@@ -36,15 +36,13 @@ RUN addgroup -g 1000 node \
         python \
     # gpg keys listed at https://github.com/nodejs/node#release-keys
     && for key in \
+      4ED778F539E3634C779C87C6D7062848A1AB005C \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      FD3A5288F042B6850C66B31F09FE44734EB7990E \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-      B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-      77984A986EBC2AA786BC0F66B01FBB92821C587A \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      4ED778F539E3634C779C87C6D7062848A1AB005C \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
diff --git a/node_lts-alpine3.12/Dockerfile b/node_lts-alpine3.12/Dockerfile
index d4e2aae..053935b 100644
--- a/node_lts-alpine3.12/Dockerfile
+++ b/node_lts-alpine3.12/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.12
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \
+          CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \
           ;; \
         *) ;; \
       esac \
@@ -36,15 +36,13 @@ RUN addgroup -g 1000 node \
         python \
     # gpg keys listed at https://github.com/nodejs/node#release-keys
     && for key in \
+      4ED778F539E3634C779C87C6D7062848A1AB005C \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      FD3A5288F042B6850C66B31F09FE44734EB7990E \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-      B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-      77984A986EBC2AA786BC0F66B01FBB92821C587A \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      4ED778F539E3634C779C87C6D7062848A1AB005C \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
diff --git a/node_lts-alpine3.9/Dockerfile b/node_lts-alpine3.9/Dockerfile
index fc8124e..dce084d 100644
--- a/node_lts-alpine3.9/Dockerfile
+++ b/node_lts-alpine3.9/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.9
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
       && case "${alpineArch##*-}" in \
         x86_64) \
           ARCH='x64' \
-          CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \
+          CHECKSUM="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \
           ;; \
         *) ;; \
       esac \
@@ -36,15 +36,13 @@ RUN addgroup -g 1000 node \
         python \
     # gpg keys listed at https://github.com/nodejs/node#release-keys
     && for key in \
+      4ED778F539E3634C779C87C6D7062848A1AB005C \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      FD3A5288F042B6850C66B31F09FE44734EB7990E \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-      B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-      77984A986EBC2AA786BC0F66B01FBB92821C587A \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      4ED778F539E3634C779C87C6D7062848A1AB005C \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
diff --git a/node_lts-buster-slim/Dockerfile b/node_lts-buster-slim/Dockerfile
index 02da40b..bf17ae2 100644
--- a/node_lts-buster-slim/Dockerfile
+++ b/node_lts-buster-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:buster-slim
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
@@ -20,15 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
     && for key in \
+      4ED778F539E3634C779C87C6D7062848A1AB005C \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      FD3A5288F042B6850C66B31F09FE44734EB7990E \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-      B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-      77984A986EBC2AA786BC0F66B01FBB92821C587A \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      4ED778F539E3634C779C87C6D7062848A1AB005C \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
diff --git a/node_lts-buster/Dockerfile b/node_lts-buster/Dockerfile
index 0f0a3b5..339a818 100644
--- a/node_lts-buster/Dockerfile
+++ b/node_lts-buster/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:buster
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -18,15 +18,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   # gpg keys listed at https://github.com/nodejs/node#release-keys
   && set -ex \
   && for key in \
+    4ED778F539E3634C779C87C6D7062848A1AB005C \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-    FD3A5288F042B6850C66B31F09FE44734EB7990E \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-    77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-    4ED778F539E3634C779C87C6D7062848A1AB005C \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
     A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
     B9E2F5981AA6E0CD28160D9FF13993A75599653C \
   ; do \
diff --git a/node_lts-slim/Dockerfile b/node_lts-slim/Dockerfile
index a51c3aa..ec32edc 100644
--- a/node_lts-slim/Dockerfile
+++ b/node_lts-slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:stretch-slim
 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && case "${dpkgArch##*-}" in \
@@ -20,15 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
     && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
     && for key in \
+      4ED778F539E3634C779C87C6D7062848A1AB005C \
       94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      FD3A5288F042B6850C66B31F09FE44734EB7990E \
       71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-      B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-      77984A986EBC2AA786BC0F66B01FBB92821C587A \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      4ED778F539E3634C779C87C6D7062848A1AB005C \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
       A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       B9E2F5981AA6E0CD28160D9FF13993A75599653C \
     ; do \
diff --git a/node_lts/Dockerfile b/node_lts/Dockerfile
index 773bea8..8475f9e 100644
--- a/node_lts/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
 
-ENV NODE_VERSION 12.18.2
+ENV NODE_VERSION 12.18.3
 
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   && case "${dpkgArch##*-}" in \
@@ -18,15 +18,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
   # gpg keys listed at https://github.com/nodejs/node#release-keys
   && set -ex \
   && for key in \
+    4ED778F539E3634C779C87C6D7062848A1AB005C \
     94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-    FD3A5288F042B6850C66B31F09FE44734EB7990E \
     71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    B9AE9905FFD7803F25714661B63B535A4C206CA9 \
-    77984A986EBC2AA786BC0F66B01FBB92821C587A \
     8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-    4ED778F539E3634C779C87C6D7062848A1AB005C \
+    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+    C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+    DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
     A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
     B9E2F5981AA6E0CD28160D9FF13993A75599653C \
   ; do \

@yosifkit yosifkit changed the title Node: Merge pull request #1298 from tianon/debian-eol Node: update 12.18.3, 14.6.0, remove EOL Jessie variants, update Stretch LTS arches Jul 28, 2020
@yosifkit yosifkit merged commit fb1c8b8 into docker-library:master Jul 28, 2020
@nschonni nschonni deleted the travis-177427293 branch January 5, 2021 00:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/node
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nodejs-github-bot @SimenB @yosifkit