From d524d54982b1335af396c8d5d3b8ebda6efda9e8 Mon Sep 17 00:00:00 2001 From: Shane O'Grady Date: Wed, 16 Mar 2022 17:36:58 -0700 Subject: [PATCH 1/3] chore: update GPG keys for Node.js Releasers --- 16/alpine3.14/Dockerfile | 1 + 16/alpine3.15/Dockerfile | 1 + 16/bullseye-slim/Dockerfile | 1 + 16/bullseye/Dockerfile | 1 + 16/buster-slim/Dockerfile | 1 + 16/buster/Dockerfile | 1 + 16/stretch-slim/Dockerfile | 1 + 16/stretch/Dockerfile | 1 + 8 files changed, 8 insertions(+) diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 9dcb0dac2..e5ce2960b 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -37,6 +37,7 @@ RUN addgroup -g 1000 node \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index c69ca8f2d..653955df2 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -37,6 +37,7 @@ RUN addgroup -g 1000 node \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 633cd0c08..fb4a68bc5 100644 --- a/16/bullseye-slim/Dockerfile +++ b/16/bullseye-slim/Dockerfile @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 2415a89cb..866bea265 100644 --- a/16/bullseye/Dockerfile +++ b/16/bullseye/Dockerfile @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index bf4b78aa2..e1a3f5dd0 100644 --- a/16/buster-slim/Dockerfile +++ b/16/buster-slim/Dockerfile @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 3ab2bae01..f6b3db75e 100644 --- a/16/buster/Dockerfile +++ b/16/buster/Dockerfile @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 15511482c..d1ea15a23 100644 --- a/16/stretch-slim/Dockerfile +++ b/16/stretch-slim/Dockerfile @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index d366502c9..791a47885 100644 --- a/16/stretch/Dockerfile +++ b/16/stretch/Dockerfile @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ From c5a23164566689bc9f774d25bc3cc42bfd95877e Mon Sep 17 00:00:00 2001 From: Shane O'Grady Date: Wed, 16 Mar 2022 17:38:09 -0700 Subject: [PATCH 2/3] chore: update to Node.js v16.14.1 --- 16/alpine3.14/Dockerfile | 4 ++-- 16/alpine3.15/Dockerfile | 4 ++-- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index e5ce2960b..4e0c85214 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.14.0 +ENV NODE_VERSION 16.14.1 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="36708b3daa37f9eda5f732cec40690d1338c3c376c0f0ec3c9cb46c6cdf52f1b" \ + CHECKSUM="89b4ece76436344fdb9f646a238ef99734a9fc0913c2a2402766e3039700e008" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index 653955df2..e43039fc6 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.14.0 +ENV NODE_VERSION 16.14.1 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="36708b3daa37f9eda5f732cec40690d1338c3c376c0f0ec3c9cb46c6cdf52f1b" \ + CHECKSUM="89b4ece76436344fdb9f646a238ef99734a9fc0913c2a2402766e3039700e008" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index fb4a68bc5..c84522424 100644 --- a/16/bullseye-slim/Dockerfile +++ b/16/bullseye-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bullseye-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 16.14.0 +ENV NODE_VERSION 16.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 866bea265..f5ac42a29 100644 --- a/16/bullseye/Dockerfile +++ b/16/bullseye/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bullseye RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 16.14.0 +ENV NODE_VERSION 16.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index e1a3f5dd0..f35cdb0f0 100644 --- a/16/buster-slim/Dockerfile +++ b/16/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 16.14.0 +ENV NODE_VERSION 16.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index f6b3db75e..6e1398887 100644 --- a/16/buster/Dockerfile +++ b/16/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 16.14.0 +ENV NODE_VERSION 16.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index d1ea15a23..4bedbd5de 100644 --- a/16/stretch-slim/Dockerfile +++ b/16/stretch-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 16.14.0 +ENV NODE_VERSION 16.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 791a47885..ca1ac857c 100644 --- a/16/stretch/Dockerfile +++ b/16/stretch/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 16.14.0 +ENV NODE_VERSION 16.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f75491bbd10a20c3b83dd973d162ab00d6f55280 Mon Sep 17 00:00:00 2001 From: Shane O'Grady Date: Wed, 16 Mar 2022 20:00:08 -0700 Subject: [PATCH 3/3] chore: update Yarn to 1.22.18 --- 16/alpine3.14/Dockerfile | 2 +- 16/alpine3.15/Dockerfile | 2 +- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 4e0c85214..9536a045a 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index e43039fc6..220b8d564 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index c84522424..a2207c300 100644 --- a/16/bullseye-slim/Dockerfile +++ b/16/bullseye-slim/Dockerfile @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index f5ac42a29..ad0140d33 100644 --- a/16/bullseye/Dockerfile +++ b/16/bullseye/Dockerfile @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && for key in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index f35cdb0f0..a8297c9ec 100644 --- a/16/buster-slim/Dockerfile +++ b/16/buster-slim/Dockerfile @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 6e1398887..a1fdb99b1 100644 --- a/16/buster/Dockerfile +++ b/16/buster/Dockerfile @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && for key in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 4bedbd5de..5e9aa284a 100644 --- a/16/stretch-slim/Dockerfile +++ b/16/stretch-slim/Dockerfile @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index ca1ac857c..d09a70301 100644 --- a/16/stretch/Dockerfile +++ b/16/stretch/Dockerfile @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && for key in \