From 5340de62927930f72af2d4a247f86ed7b5cbb524 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sun, 7 Jan 2018 12:40:20 -0500 Subject: [PATCH 001/818] Install newer version of Docker --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5ba13aea57..7a23689d73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,11 @@ sudo: required services: - docker +addons: + apt: + packages: + - docker-ce + script: - if [ "true" = "${SHELLCHECK-}" ]; then shellcheck *.sh ; fi - if [ -n "${NODE_VERSION-}" ]; then ./test-build.sh $NODE_VERSION ; fi From 9139b23119fd72165ce9995a1fa04886ca7666f8 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sun, 7 Jan 2018 12:40:36 -0500 Subject: [PATCH 002/818] Always use Trusty --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7a23689d73..b82e61d5cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: trusty sudo: required services: From 172a33e7e57dd31c406e9eace325608ba2dcf051 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sun, 7 Jan 2018 12:43:37 -0500 Subject: [PATCH 003/818] Set language to node_js and use latest LTS version Also: don't install node for doc check, it's now already installed --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b82e61d5cf..605ca3b0c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ dist: trusty sudo: required +language: node_js +node_js: + - lts/* + services: - docker @@ -13,7 +17,6 @@ script: - if [ "true" = "${SHELLCHECK-}" ]; then shellcheck *.sh ; fi - if [ -n "${NODE_VERSION-}" ]; then ./test-build.sh $NODE_VERSION ; fi - if [ "true" = "${DOCTOCCHECK-}" ]; then - nvm install node && npm i -g doctoc && cp README.md README.md.tmp && doctoc --title='## Table of Contents' --github README.md && From df8782dfddf8c70663f0a7d19942120b1d6977a5 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 11 Jan 2018 00:40:58 +0800 Subject: [PATCH 004/818] Update node.js v9.4.0 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index d7e187b116..15d0d210ad 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.3.0 +ENV NODE_VERSION 9.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index d34081b910..3bc6b2a913 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.3.0 +ENV NODE_VERSION 9.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index 8bec1e4b8d..73b92a1a19 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.3.0 +FROM node:9.4.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 09fa4a523f..96d0ff269b 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.3.0 +ENV NODE_VERSION 9.4.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 02476836f8..a06b2324ff 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.3.0 +ENV NODE_VERSION 9.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 94141d857d..9526fcd4f5 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.3.0 +ENV NODE_VERSION 9.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f7ea65ca68c252bac4731544ce097ce10c5ea87c Mon Sep 17 00:00:00 2001 From: Christian Klaussner Date: Sun, 14 Jan 2018 14:35:55 +0100 Subject: [PATCH 005/818] Fix typo in "Non-root User" section (#612) --- docs/BestPractices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index ffc5e208f4..715994e3f5 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -39,7 +39,7 @@ You can also include Tini [directly in your Dockerfile](https://github.com/krall ## Non-root User -By default, Docker runs container as root which inside of the container can pose as a security issue. You would want to run the container as an unprivileged user wherever possible. The node images provide the `node` user for such purpose. The Docker Image can than be run with the `node` user in the following way: +By default, Docker runs container as root which inside of the container can pose as a security issue. You would want to run the container as an unprivileged user wherever possible. The node images provide the `node` user for such purpose. The Docker Image can then be run with the `node` user in the following way: ``` -u "node" From db3b27c8388136b5e529861d7c3fa12fd8328301 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 31 Jan 2018 20:42:43 -0500 Subject: [PATCH 006/818] Update for Node.js v9.5.0 See: https://nodejs.org/en/blog/release/v9.5.0/ --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 15d0d210ad..bd4a188761 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.4.0 +ENV NODE_VERSION 9.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 3bc6b2a913..0c862498a4 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.4.0 +ENV NODE_VERSION 9.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index 73b92a1a19..ada5992376 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.4.0 +FROM node:9.5.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 96d0ff269b..e246ccf632 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.4.0 +ENV NODE_VERSION 9.5.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index a06b2324ff..d3c0718b39 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.4.0 +ENV NODE_VERSION 9.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 9526fcd4f5..577f8478bf 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.4.0 +ENV NODE_VERSION 9.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 43458812d33a3793052a152f0be2b5e08c6fe108 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 5 Feb 2018 13:52:34 +0100 Subject: [PATCH 007/818] better support of gpg keys installation behind a proxy --- 4/Dockerfile | 12 ++++++------ 4/alpine/Dockerfile | 12 ++++++------ 4/slim/Dockerfile | 12 ++++++------ 4/stretch/Dockerfile | 12 ++++++------ 4/wheezy/Dockerfile | 12 ++++++------ 6/Dockerfile | 12 ++++++------ 6/alpine/Dockerfile | 12 ++++++------ 6/slim/Dockerfile | 12 ++++++------ 6/stretch/Dockerfile | 12 ++++++------ 6/wheezy/Dockerfile | 12 ++++++------ 8/Dockerfile | 12 ++++++------ 8/alpine/Dockerfile | 12 ++++++------ 8/slim/Dockerfile | 12 ++++++------ 8/stretch/Dockerfile | 12 ++++++------ 8/wheezy/Dockerfile | 12 ++++++------ 9/Dockerfile | 12 ++++++------ 9/alpine/Dockerfile | 12 ++++++------ 9/slim/Dockerfile | 12 ++++++------ 9/stretch/Dockerfile | 12 ++++++------ 9/wheezy/Dockerfile | 12 ++++++------ Dockerfile-alpine.template | 12 ++++++------ Dockerfile-slim.template | 12 ++++++------ Dockerfile-stretch.template | 12 ++++++------ Dockerfile-wheezy.template | 12 ++++++------ Dockerfile.template | 12 ++++++------ 25 files changed, 150 insertions(+), 150 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index df4c54f20f..89ed72353d 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 21bd1196a4..4664a00489 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -27,9 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index 996d246295..c710b742c9 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -51,9 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index f3814e9e71..0bec4679ae 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index 3388786a35..dfb50c5db7 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -42,9 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/Dockerfile b/6/Dockerfile index 5763fb6bad..418e6046c9 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 3bffed87e2..05ae4502fe 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -27,9 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 507f1f6501..0d3855d907 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -51,9 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index d02a685717..d232da457f 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 71f6a91753..307a05614f 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -42,9 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/Dockerfile b/8/Dockerfile index abfff08d21..8e17e1c2ca 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index d7a5af7156..0831a59b56 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -27,9 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 5f2ab4aaa2..fba9e71960 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -51,9 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 99c23795e6..00b16c5116 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index 9e32dc0a71..22bb0cef0b 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -42,9 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/Dockerfile b/9/Dockerfile index bd4a188761..444d5f17e4 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 0c862498a4..dcd2242ed0 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -27,9 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index e246ccf632..2a5aac4d26 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -51,9 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index d3c0718b39..1bfa5dcd91 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 577f8478bf..03e77ccbab 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -42,9 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ffd17d9984..9c60467cb8 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -27,9 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -51,9 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index a8c5f7369e..707db22ab4 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -51,9 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 497949439f..4bbda8de41 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 13bd203204..eba6358312 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -42,9 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile.template b/Dockerfile.template index 00c7c48b8e..956c085350 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -15,9 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -46,9 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ From 1429b40e0716806905769113107eccced63fb011 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 5 Feb 2018 23:45:19 +0100 Subject: [PATCH 008/818] fix alpine ipv4 host --- 4/Dockerfile | 6 ++++-- 4/alpine/Dockerfile | 6 ++++-- 4/slim/Dockerfile | 6 ++++-- 4/stretch/Dockerfile | 6 ++++-- 4/wheezy/Dockerfile | 6 ++++-- 6/Dockerfile | 6 ++++-- 6/alpine/Dockerfile | 6 ++++-- 6/slim/Dockerfile | 6 ++++-- 6/stretch/Dockerfile | 6 ++++-- 6/wheezy/Dockerfile | 6 ++++-- 8/Dockerfile | 6 ++++-- 8/alpine/Dockerfile | 6 ++++-- 8/slim/Dockerfile | 3 ++- 8/stretch/Dockerfile | 6 ++++-- 8/wheezy/Dockerfile | 6 ++++-- 9/Dockerfile | 6 ++++-- 9/alpine/Dockerfile | 6 ++++-- 9/slim/Dockerfile | 6 ++++-- 9/stretch/Dockerfile | 6 ++++-- 9/wheezy/Dockerfile | 6 ++++-- 20 files changed, 78 insertions(+), 39 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index 89ed72353d..2d2dba7f48 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 4664a00489..43bb7cf2d4 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -29,7 +29,8 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -53,7 +54,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index c710b742c9..a429690eb9 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -53,7 +54,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index 0bec4679ae..f782a07f48 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index dfb50c5db7..46697073b9 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -44,7 +45,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/Dockerfile b/6/Dockerfile index 418e6046c9..fc4febd2aa 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 05ae4502fe..4d70b1c1c8 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -29,7 +29,8 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -53,7 +54,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 0d3855d907..e9f1c26671 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -53,7 +54,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index d232da457f..6ae07959c7 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 307a05614f..3fb1436ce6 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.12.3 @@ -44,7 +45,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/Dockerfile b/8/Dockerfile index 8e17e1c2ca..f336817158 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 0831a59b56..74c82038ca 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -29,7 +29,8 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -53,7 +54,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index fba9e71960..b897ffceeb 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -53,7 +53,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 00b16c5116..2b167e8234 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index 22bb0cef0b..24fd7aa8cf 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -44,7 +45,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/Dockerfile b/9/Dockerfile index 444d5f17e4..fdabed5364 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index dcd2242ed0..e76cebfc1d 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -29,7 +29,8 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -53,7 +54,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 2a5aac4d26..1a621d3e4e 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -53,7 +54,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 1bfa5dcd91..9e3338dda7 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 03e77ccbab..bdcf4f2a30 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -44,7 +45,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ From fb4d1b39fe8e14310bd0bd6699a9b0e5ef823f3f Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 5 Feb 2018 23:48:07 +0100 Subject: [PATCH 009/818] fix templates --- Dockerfile-alpine.template | 6 ++++-- Dockerfile-slim.template | 6 ++++-- Dockerfile-stretch.template | 6 ++++-- Dockerfile-wheezy.template | 6 ++++-- Dockerfile.template | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9c60467cb8..65e7509e1e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -29,7 +29,8 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -53,7 +54,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 707db22ab4..9d814825b6 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -53,7 +54,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 4bbda8de41..add4cf92b1 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index eba6358312..a3fdf6cbd9 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -44,7 +45,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile.template b/Dockerfile.template index 956c085350..e56ff8e20f 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -48,7 +49,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ From 4e5eda8fedf7fa355de6037f01d5699d414c1da3 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Tue, 6 Feb 2018 17:35:01 +0100 Subject: [PATCH 010/818] remove :80 from ipv4 host --- 4/Dockerfile | 4 ++-- 4/alpine/Dockerfile | 4 ++-- 4/slim/Dockerfile | 4 ++-- 4/stretch/Dockerfile | 4 ++-- 4/wheezy/Dockerfile | 4 ++-- 6/Dockerfile | 5 +++-- 6/alpine/Dockerfile | 4 ++-- 6/slim/Dockerfile | 4 ++-- 6/stretch/Dockerfile | 4 ++-- 6/wheezy/Dockerfile | 4 ++-- 8/Dockerfile | 4 ++-- 8/alpine/Dockerfile | 4 ++-- 8/slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 4 ++-- 8/wheezy/Dockerfile | 4 ++-- 9/Dockerfile | 4 ++-- 9/alpine/Dockerfile | 4 ++-- 9/slim/Dockerfile | 4 ++-- 9/stretch/Dockerfile | 4 ++-- 9/wheezy/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- Dockerfile-slim.template | 4 ++-- Dockerfile-stretch.template | 6 ++++-- Dockerfile-wheezy.template | 4 ++-- Dockerfile.template | 4 ++-- 25 files changed, 52 insertions(+), 49 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index 2d2dba7f48..b92e451268 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 43bb7cf2d4..2383026ee3 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -29,7 +29,7 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ @@ -54,7 +54,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index a429690eb9..2452346815 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -54,7 +54,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index f782a07f48..a18007cfca 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index 46697073b9..d5082d10f6 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -45,7 +45,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/6/Dockerfile b/6/Dockerfile index fc4febd2aa..a880412efb 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,8 +49,9 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 4d70b1c1c8..ff7f0705d3 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -29,7 +29,7 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ @@ -54,7 +54,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index e9f1c26671..3c41b5474d 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -54,7 +54,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 6ae07959c7..1f76975f4e 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 3fb1436ce6..8cf1627d91 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -45,7 +45,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/8/Dockerfile b/8/Dockerfile index f336817158..c34ec17ef8 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 74c82038ca..32da6420e9 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -29,7 +29,7 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ @@ -54,7 +54,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index b897ffceeb..2f5ca737bd 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -53,7 +53,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 2b167e8234..7ce47ff013 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index 24fd7aa8cf..e9ed68457f 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -45,7 +45,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/9/Dockerfile b/9/Dockerfile index fdabed5364..ffc4368a20 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index e76cebfc1d..2b8536f7af 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -29,7 +29,7 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ @@ -54,7 +54,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 1a621d3e4e..cbcfc1704c 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -54,7 +54,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 9e3338dda7..c27a2e15da 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index bdcf4f2a30..fca7448193 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -45,7 +45,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 65e7509e1e..a5a6bc773f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -29,7 +29,7 @@ RUN addgroup -g 1000 node \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ @@ -54,7 +54,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 9d814825b6..342969dd80 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -54,7 +54,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index add4cf92b1..2c94aaf2f3 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,8 +49,10 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + + done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index a3fdf6cbd9..349d6c8057 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -45,7 +45,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ diff --git a/Dockerfile.template b/Dockerfile.template index e56ff8e20f..8e0851d022 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -17,7 +17,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done @@ -49,7 +49,7 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ From c689df6ab17f7c4e4304479ba5c3b249e0d8a702 Mon Sep 17 00:00:00 2001 From: Heechul Ryu Date: Wed, 7 Feb 2018 17:12:11 +0900 Subject: [PATCH 011/818] Add an instruction for adding PATH for global modules (#624) --- docs/BestPractices.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 715994e3f5..0d97f4c505 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -25,6 +25,8 @@ If you need to install global npm dependencies, it is recommended to place those ```Dockerfile ENV NPM_CONFIG_PREFIX=/home/node/.npm-global + +ENV PATH=$PATH:/home/node/.npm-global/bin # optionally if you want to run npm global bin without specifying path ``` ## Handling Kernel Signals From 25f26146ac5b9f74add731b0b078e34411ae5831 Mon Sep 17 00:00:00 2001 From: Kyle Farnung Date: Thu, 8 Feb 2018 09:37:04 -0800 Subject: [PATCH 012/818] Cleanup from #623 Ran the script and noticed a few issues: * Removed whitespace from Dockerfile-stretch.template to match the existing files * Let the script update the other files for consistency --- 6/Dockerfile | 1 - 8/slim/Dockerfile | 3 ++- Dockerfile-stretch.template | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index a880412efb..930f342dda 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -51,7 +51,6 @@ RUN set -ex \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ - done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 2f5ca737bd..4c9734d720 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -17,7 +17,8 @@ RUN set -ex \ ; do \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 2c94aaf2f3..1ab53b2d5b 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -51,8 +51,6 @@ RUN set -ex \ gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ - - done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ From 2cf732a2917db49f29f88e561527e798f84abb2d Mon Sep 17 00:00:00 2001 From: Kyle Farnung Date: Fri, 5 Jan 2018 17:43:28 -0800 Subject: [PATCH 013/818] Adding fork support to the scripts Shared * Moved version parsing/detection to a separate function * Added path/version parameters to various functions * Fixed whitespace metacharacters so they work on both macOS and Linux * Updated tag generation logic to account for forks generate-stackbrew-library.sh * Updated sort algorithm to sort the non-fork versions first test_build.sh * Fixed a bug where it could only handle one version update.sh * Added support for configurable node download URIs * Added some informational and error output * Updated it to use the templates for each fork --- config | 1 + functions.sh | 154 +++++++++++++++++++++++++++++++++- generate-stackbrew-library.sh | 28 ++++--- test-build.sh | 26 ++---- update.sh | 30 ++++--- 5 files changed, 194 insertions(+), 45 deletions(-) create mode 100644 config diff --git a/config b/config new file mode 100644 index 0000000000..31f0b8a992 --- /dev/null +++ b/config @@ -0,0 +1 @@ +baseuri https://nodejs.org/dist diff --git a/functions.sh b/functions.sh index 3779097b9b..175c13960a 100755 --- a/functions.sh +++ b/functions.sh @@ -2,6 +2,17 @@ # Utlity functions +info() { + printf "%s\\n" "$@" +} + +fatal() { + printf "**********\\n" + printf "Fatal Error: %s\\n" "$@" + printf "**********\\n" + exit 1 +} + # Get system architecture # # This is used to get the target architecture for docker image. @@ -40,10 +51,14 @@ function get_arch() { # ,... # ,... function get_variants() { + local dir + dir=${1:-.} + shift + local arch arch=$(get_arch) local variants - variants=$(grep "^$arch" architectures | sed -E 's/'"$arch"'\s*//' | sed -E 's/,/ /g') + variants=$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g') echo "$variants" } @@ -58,15 +73,146 @@ function get_supported_arches () { local version local variant local arches + local lines + local line version="$1"; shift variant="$1"; shift # Get default supported arches - arches=$( grep "$variant" architectures 2>/dev/null | cut -d' ' -f1 ) + lines=$( grep "$variant" "$(dirname "$version")"/architectures 2>/dev/null | cut -d' ' -f1 ) # Get version specific supported architectures if there is specialized information if [ -a "$version"/architectures ]; then - arches=$( grep "$variant" "$version"/architectures 2>/dev/null | cut -d' ' -f1 ) + lines=$( grep "$variant" "$version"/architectures 2>/dev/null | cut -d' ' -f1 ) + fi + + while IFS='' read -r line; do + arches+=( "$line" ) + done <<< "$lines" + + echo "${arches[@]}" +} + +# Get configuration values from the config file +# +# The configuration entries are simple key/value pairs which are whitespace separated. +function get_config () { + local dir + dir=${1:-.} + shift + + local name + name=$1 + shift + + local value + value=$(grep "^$name" "$dir/config" | sed -E 's/'"$name"'[[:space:]]*//') + echo "$value" +} + +# Get available versions for a given path +# +# If full or partial versions are provided then they are processed and +# validated. e.g. "4 chakracore" returns "4 chakracore/8" since it processed the +# chakracore entry and found it to be a fork rather than a complete version. +# +# The result is a list of valid versions. +function get_versions () { + local prefix + prefix=${1:-.} + shift + + local versions + local dirs=( "$@" ) + if [ ${#dirs[@]} -eq 0 ]; then + IFS=' ' read -ra dirs <<< "$(echo "${prefix%/}/"*/)" fi - echo "$arches" + + for dir in "${dirs[@]}"; do + if [ -a "$dir/config" ]; then + local subdirs + IFS=' ' read -ra subdirs <<< "$(get_versions "${dir#./}")" + for subdir in "${subdirs[@]}"; do + versions+=( "$subdir" ) + done + elif [ -a "$dir/Dockerfile" ]; then + versions+=( "${dir#./}" ) + fi + done + + if [ ${#versions[@]} -gt 0 ]; then + echo "${versions[@]%/}" + fi +} + +function get_fork_name () { + local version + version=$1 + shift + + IFS='/' read -ra versionparts <<< "$version" + if [ ${#versionparts[@]} -gt 1 ]; then + echo "${versionparts[0]}" + fi +} + +function get_full_version () { + local version + version=$1 + shift + + grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3 +} + +function get_major_minor_version () { + local version + version=$1 + shift + + local fullversion + fullversion=$(get_full_version "$version") + + echo "$(echo "$fullversion" | cut -d'.' -f1).$(echo "$fullversion" | cut -d'.' -f2)" +} + +function get_tag () { + local version + version=$1 + shift + + local versiontype + versiontype=${1:-full} + shift + + local tagversion + if [ "$versiontype" = full ]; then + tagversion=$(get_full_version "$version") + elif [ "$versiontype" = majorminor ]; then + tagversion=$(get_major_minor_version "$version") + fi + + local tagparts + IFS=' ' read -ra tagparts <<< "$(get_fork_name "$version") $tagversion" + IFS='-'; echo "${tagparts[*]}"; unset IFS +} + +function sort_versions () { + local versions=( "$@" ) + local sorted + local lines + local line + + IFS=$'\n' + lines="${versions[*]}" + unset IFS + + while IFS='' read -r line; do + sorted+=( "$line" ) + done <<< "$(echo "$lines" | grep "^[0-9]" | sort -r)" + + while IFS='' read -r line; do + sorted+=( "$line" ) + done <<< "$(echo "$lines" | grep -v "^[0-9]" | sort -r)" + + echo "${sorted[@]}" } diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 0d74039c01..8a76665da8 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -18,13 +18,10 @@ cd "$(cd "${0%/*}" && pwd -P)"; self="$(basename "${BASH_SOURCE[0]}")" -versions=( */ ) -versions=( "${versions[@]%/}" ) +IFS=' ' read -ra versions <<< "$(get_versions)" +IFS=' ' read -ra versions <<< "$(sort_versions "${versions[@]}")" url='https://github.com/nodejs/docker-node' -# sort version numbers with highest first -IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -r) ); unset IFS - # get the most recent commit which modified any of "$@" fileCommit() { git log -1 --format='format:%H' HEAD -- "$@" @@ -43,18 +40,25 @@ join() { echo "${out#$sep}" } +get_stub() { + local version="$1"; shift + IFS='/' read -ra versionparts <<< "$version" + local stub; eval stub="$(join '_' "${versionparts[@]}" | awk -F. '{ print "$array_" $1 }')"; + echo "$stub" +} + for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories [ -f "$version/Dockerfile" ] || continue - eval stub="$(echo "$version" | awk -F. '{ print "$array_" $1 }')"; + stub=$(get_stub "$version") commit="$(fileCommit "$version")" - fullVersion="$(grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)" - minorVersion="$(echo "$fullVersion" | cut -d'.' -f2)" + fullVersion="$(get_tag "$version" full)" + majorMinorVersion="$(get_tag "$version" majorminor)" - versionAliases=( $fullVersion $version.$minorVersion ${stub} ) + IFS=' ' read -ra versionAliases <<< "$fullVersion $majorMinorVersion $stub" # Get supported architectures for a specific version. See details in function.sh - supportedArches=( $(get_supported_arches "$version" "default") ) + IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "$version" "default")" echo "Tags: $(join ', ' "${versionAliases[@]}")" echo "Architectures: $(join ', ' "${supportedArches[@]}")" @@ -64,7 +68,7 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - variants=$(get_variants | tr ' ' '\n') + variants=$(get_variants "$(dirname "$version")") for variant in $variants; do # Skip non-docker directories [ -f "$version/$variant/Dockerfile" ] || continue @@ -76,7 +80,7 @@ for version in "${versions[@]}"; do variantAliases=( "${variantAliases[@]//latest-/}" ) # Get supported architectures for a specific version and variant. # See details in function.sh - supportedArches=( $(get_supported_arches "$version" "$variant") ) + IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "$version" "$variant")" echo "Tags: $(join ', ' "${variantAliases[@]}")" echo "Architectures: $(join ', ' "${supportedArches[@]}")" diff --git a/test-build.sh b/test-build.sh index e0492e96b2..22b500d937 100755 --- a/test-build.sh +++ b/test-build.sh @@ -3,34 +3,22 @@ # Run a test build for all images. set -uo pipefail -IFS=$'\n\t' . functions.sh -info() { - printf "%s\n" "$@" -} - -fatal() { - printf "**********\n" - printf "%s\n" "$@" - printf "**********\n" - exit 1 -} - cd "$(cd "${0%/*}" && pwd -P)" || exit; -versions=( "$@" ) +IFS=' ' read -ra versions <<< "$(get_versions . "$@")" if [ ${#versions[@]} -eq 0 ]; then - versions=( */ ) + fatal "No valid versions found!" fi -versions=( "${versions[@]%/}" ) for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories [ -f "$version/Dockerfile" ] || continue - tag=$(grep "ENV NODE_VERSION" "$version/Dockerfile" | cut -d' ' -f3) + tag=$(get_tag "$version") + full_version=$(get_full_version "$version") info "Building $tag..." @@ -40,14 +28,14 @@ for version in "${versions[@]}"; do info "Build of $tag succeeded." OUTPUT=$(docker run --rm -it node:"$tag" node -e "process.stdout.write(process.versions.node)") - if [ "$OUTPUT" != "$tag" ]; then + if [ "$OUTPUT" != "$full_version" ]; then fatal "Test of $tag failed!" fi info "Test of $tag succeeded." # Get supported variants according to the target architecture. # See details in function.sh - variants=$(get_variants | tr ' ' '\n') + variants=$(get_variants "$(dirname "$version")") for variant in $variants; do # Skip non-docker directories @@ -61,7 +49,7 @@ for version in "${versions[@]}"; do info "Build of $tag-$variant succeeded." OUTPUT=$(docker run --rm -it node:"$tag-$variant" node -e "process.stdout.write(process.versions.node)") - if [ "$OUTPUT" != "$tag" ]; then + if [ "$OUTPUT" != "$full_version" ]; then fatal "Test of $tag-$variant failed!" fi info "Test of $tag-$variant succeeded." diff --git a/update.sh b/update.sh index 83622ee93b..b9168c4e45 100755 --- a/update.sh +++ b/update.sh @@ -1,15 +1,14 @@ #!/bin/bash -set -e +set -ue . functions.sh cd "$(cd "${0%/*}" && pwd -P)"; -versions=( "$@" ) +IFS=' ' read -ra versions <<< "$(get_versions . "$@")" if [ ${#versions[@]} -eq 0 ]; then - versions=( */ ) + fatal "No valid versions found!" fi -versions=( "${versions[@]%/}" ) # Global variables # Get architecure and use this as target architecture for docker image @@ -21,6 +20,10 @@ yarnVersion="$(curl -sSL --compressed https://yarnpkg.com/latest-version)" function update_node_version { + local baseuri=$1 + shift + local version=$1 + shift local template=$1 shift local dockerfile=$1 @@ -31,12 +34,12 @@ function update_node_version { shift fi - fullVersion="$(curl -sSL --compressed 'https://nodejs.org/dist' | grep ' Date: Fri, 19 Jan 2018 20:18:02 -0800 Subject: [PATCH 014/818] Adding node-chakracore-v8.9.4 https://github.com/nodejs/node-chakracore/releases/tag/node-chakracore-v8.9.4 --- .travis.yml | 1 + chakracore/8/Dockerfile | 40 ++++++++++++++++++++++++++++++++++ chakracore/Dockerfile.template | 40 ++++++++++++++++++++++++++++++++++ chakracore/architectures | 2 ++ chakracore/config | 1 + generate-stackbrew-library.sh | 2 ++ 6 files changed, 86 insertions(+) create mode 100644 chakracore/8/Dockerfile create mode 100644 chakracore/Dockerfile.template create mode 100644 chakracore/architectures create mode 100644 chakracore/config diff --git a/.travis.yml b/.travis.yml index 605ca3b0c5..c9e5073b4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ env: - NODE_VERSION: '6' - NODE_VERSION: '8' - NODE_VERSION: '9' + - NODE_VERSION: 'chakracore/8' matrix: include: diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile new file mode 100644 index 0000000000..efa955738b --- /dev/null +++ b/chakracore/8/Dockerfile @@ -0,0 +1,40 @@ +FROM buildpack-deps:jessie + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 8.9.4 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && curl -SLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.3.2 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template new file mode 100644 index 0000000000..3642c99971 --- /dev/null +++ b/chakracore/Dockerfile.template @@ -0,0 +1,40 @@ +FROM buildpack-deps:jessie + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 0.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && curl -SLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 0.0.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ + gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/chakracore/architectures b/chakracore/architectures new file mode 100644 index 0000000000..43cefa9b9c --- /dev/null +++ b/chakracore/architectures @@ -0,0 +1,2 @@ +bashbrew-arch variants +amd64 default diff --git a/chakracore/config b/chakracore/config new file mode 100644 index 0000000000..116285c2f0 --- /dev/null +++ b/chakracore/config @@ -0,0 +1 @@ +baseuri https://nodejs.org/download/chakracore-release diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 8a76665da8..20d730e241 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -13,6 +13,8 @@ array_6='6 boron'; array_8='8 carbon'; # shellcheck disable=SC2034 array_9='9 latest'; +# shellcheck disable=SC2034 +array_chakracore_8='chakracore-8 chakracore'; cd "$(cd "${0%/*}" && pwd -P)"; From b57e96aea75f8e7960e17b3fb0efded41b295909 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 14 Feb 2018 02:59:35 +0800 Subject: [PATCH 015/818] Update for node.js v6.13.0 --- 6/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 6/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index 930f342dda..652cc794c1 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.12.3 +ENV NODE_VERSION 6.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index ff7f0705d3..7500d002c3 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.12.3 +ENV NODE_VERSION 6.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 417c46565f..c72d486c95 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.12.3 +FROM node:6.13.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 3c41b5474d..870c6c646f 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.12.3 +ENV NODE_VERSION 6.13.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 1f76975f4e..8064b717b9 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.12.3 +ENV NODE_VERSION 6.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 8cf1627d91..87e0933ae7 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.12.3 +ENV NODE_VERSION 6.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 40957a38d33643f1c7abb7881baf41aeda02600c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 12 Feb 2018 13:19:05 +0800 Subject: [PATCH 016/818] Parallelize version update process to speed up --- update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/update.sh b/update.sh index b9168c4e45..d5f6205635 100755 --- a/update.sh +++ b/update.sh @@ -53,6 +53,7 @@ function update_node_version { } for version in "${versions[@]}"; do +{ # Skip "docs" and other non-docker directories [ -f "$version/Dockerfile" ] || continue @@ -73,6 +74,8 @@ for version in "${versions[@]}"; do [ -f "$version/$variant/Dockerfile" ] || continue update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" done +} & done +wait info "Done!" From f2a0737ea9568224e21b3dc7a54b6239ef89f849 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 15 Feb 2018 00:02:40 +0800 Subject: [PATCH 017/818] Use "exit" instead of "continue" to exit subshell in update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index d5f6205635..fe290a64ce 100755 --- a/update.sh +++ b/update.sh @@ -55,7 +55,7 @@ function update_node_version { for version in "${versions[@]}"; do { # Skip "docs" and other non-docker directories - [ -f "$version/Dockerfile" ] || continue + [ -f "$version/Dockerfile" ] || exit info "Updating version $version..." From 9b60d3dab7993a16b83d73cba003eb2da32926ca Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 15 Feb 2018 02:21:06 +0800 Subject: [PATCH 018/818] Futher parallelize update.sh process for different variants (#630) --- update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index fe290a64ce..7d34911455 100755 --- a/update.sh +++ b/update.sh @@ -70,10 +70,13 @@ for version in "${versions[@]}"; do variants=$(get_variants "$parentpath") for variant in $variants; do + { # Skip non-docker directories - [ -f "$version/$variant/Dockerfile" ] || continue + [ -f "$version/$variant/Dockerfile" ] || exit update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" + } & done + wait } & done From 8498ff5302c19506c9edc3ce152f2bd4aa6b26b3 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sun, 18 Feb 2018 10:09:29 -0500 Subject: [PATCH 019/818] Drop keyserver.pgp.com See https://github.com/docker-library/official-images/pull/4006#issuecomment-365420103 Also try pgp.mit.edu last instead of first and try p80.pool.sks-keyservers.net first --- 4/Dockerfile | 10 ++++------ 4/alpine/Dockerfile | 10 ++++------ 4/slim/Dockerfile | 10 ++++------ 4/stretch/Dockerfile | 10 ++++------ 4/wheezy/Dockerfile | 10 ++++------ 6/Dockerfile | 10 ++++------ 6/alpine/Dockerfile | 10 ++++------ 6/slim/Dockerfile | 10 ++++------ 6/stretch/Dockerfile | 10 ++++------ 6/wheezy/Dockerfile | 10 ++++------ 8/Dockerfile | 10 ++++------ 8/alpine/Dockerfile | 10 ++++------ 8/slim/Dockerfile | 10 ++++------ 8/stretch/Dockerfile | 10 ++++------ 8/wheezy/Dockerfile | 10 ++++------ 9/Dockerfile | 10 ++++------ 9/alpine/Dockerfile | 10 ++++------ 9/slim/Dockerfile | 10 ++++------ 9/stretch/Dockerfile | 10 ++++------ 9/wheezy/Dockerfile | 10 ++++------ Dockerfile-alpine.template | 10 ++++------ Dockerfile-slim.template | 10 ++++------ Dockerfile-stretch.template | 10 ++++------ Dockerfile-wheezy.template | 10 ++++------ Dockerfile.template | 10 ++++------ chakracore/8/Dockerfile | 5 ++--- chakracore/Dockerfile.template | 5 ++--- 27 files changed, 104 insertions(+), 156 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index b92e451268..dee60dec60 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 2383026ee3..4f76d1318a 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -27,10 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -52,10 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index 2452346815..519a70e2d5 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -52,10 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index a18007cfca..50698d5cd3 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index d5082d10f6..6a67cd3aad 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 4.8.7 @@ -43,10 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/Dockerfile b/6/Dockerfile index 652cc794c1..66eb3ff77f 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.13.0 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 7500d002c3..1e864c1eb1 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -27,10 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -52,10 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 870c6c646f..b326d48e98 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.13.0 @@ -52,10 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 8064b717b9..960331453d 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.13.0 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 87e0933ae7..0219fe41ef 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 6.13.0 @@ -43,10 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/Dockerfile b/8/Dockerfile index c34ec17ef8..96211198de 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 32da6420e9..cd6fb094ea 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -27,10 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -52,10 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 4c9734d720..2fa838c70d 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -52,10 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 7ce47ff013..f7d5827b68 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index e9ed68457f..313b84c87e 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 8.9.4 @@ -43,10 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/Dockerfile b/9/Dockerfile index ffc4368a20..5c6498a354 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 2b8536f7af..60aa0d187b 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -27,10 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -52,10 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index cbcfc1704c..ce504d2115 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -52,10 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index c27a2e15da..a2adf1a32e 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index fca7448193..6267b70d64 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 9.5.0 @@ -43,10 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index a5a6bc773f..4c5623a024 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -27,10 +27,9 @@ RUN addgroup -g 1000 node \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ @@ -52,10 +51,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 342969dd80..95cf72a606 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -52,10 +51,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 1ab53b2d5b..a9a2fc59d3 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 349d6c8057..397233e3cb 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -43,10 +42,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/Dockerfile.template b/Dockerfile.template index 8e0851d022..c6249db394 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -15,10 +15,9 @@ RUN set -ex \ 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done ENV NODE_VERSION 0.0.0 @@ -47,10 +46,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index efa955738b..30b26defa4 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/Dockerfile @@ -23,10 +23,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index 3642c99971..7b7c57ae2f 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -23,10 +23,9 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ - gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" || \ + 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://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ From 57eb0de9a948cf9d20d42139bc00ac556d80d878 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 23 Feb 2018 01:15:35 +0800 Subject: [PATCH 020/818] Update for node.js v9.6.0 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index ffc4368a20..e39da3530c 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.5.0 +ENV NODE_VERSION 9.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 2b8536f7af..94c876e14a 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.5.0 +ENV NODE_VERSION 9.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index ada5992376..119ba71ae9 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.5.0 +FROM node:9.6.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index cbcfc1704c..e80ddff419 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.5.0 +ENV NODE_VERSION 9.6.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index c27a2e15da..852d7144ff 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.5.0 +ENV NODE_VERSION 9.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index fca7448193..2da4684eac 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.5.0 +ENV NODE_VERSION 9.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From cd2bb38947e51a60df45b71f8637852caffb1c1d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 23 Feb 2018 14:37:04 +0800 Subject: [PATCH 021/818] Update node.js v9.6.0 to v9.6.1 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 1fff65f07f..37ded6a3b7 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.0 +ENV NODE_VERSION 9.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 1b7f5718d4..5e52a7e582 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.6.0 +ENV NODE_VERSION 9.6.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index 119ba71ae9..fc0f3067ee 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.6.0 +FROM node:9.6.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 8d8e9dad81..4474264d3d 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.0 +ENV NODE_VERSION 9.6.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 5281135602..ebc2506e93 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.0 +ENV NODE_VERSION 9.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 3e39f4fb18..ff12441e89 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.0 +ENV NODE_VERSION 9.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6d7fb330d4c838b7be25e2906a92eee3b28f54a3 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 2 Mar 2018 00:49:40 +0800 Subject: [PATCH 022/818] Update node.js v9.x to v9.7 with yarn v1.5.1 --- 9/Dockerfile | 4 ++-- 9/alpine/Dockerfile | 4 ++-- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 4 ++-- 9/stretch/Dockerfile | 4 ++-- 9/wheezy/Dockerfile | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 37ded6a3b7..912b530376 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.1 +ENV NODE_VERSION 9.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 5e52a7e582..3d6fe1c42e 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.6.1 +ENV NODE_VERSION 9.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index fc0f3067ee..c9d9c4631e 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.6.1 +FROM node:9.7.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 4474264d3d..68522bcd3b 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.1 +ENV NODE_VERSION 9.7.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index ebc2506e93..7ed144f9f2 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.1 +ENV NODE_VERSION 9.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index ff12441e89..b1ade2d198 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.6.1 +ENV NODE_VERSION 9.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -36,7 +36,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ From 8306bec7750d0574217e807957096186dcb9f12f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 2 Mar 2018 17:12:47 +0800 Subject: [PATCH 023/818] Update nodejs v9.x to v9.7.1 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 912b530376..275eec1e88 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.0 +ENV NODE_VERSION 9.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 3d6fe1c42e..afbd0ef0f9 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.7.0 +ENV NODE_VERSION 9.7.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index c9d9c4631e..cccf6ba3f5 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.7.0 +FROM node:9.7.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 68522bcd3b..fbc4b64ff8 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.0 +ENV NODE_VERSION 9.7.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 7ed144f9f2..5266d5c62e 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.0 +ENV NODE_VERSION 9.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index b1ade2d198..64f0ffa913 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.0 +ENV NODE_VERSION 9.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From a1b2c2443d5366f109a407556d9011c8bb1162c4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 20 Jan 2018 11:17:21 +0800 Subject: [PATCH 024/818] Fix few typos [ci skip] --- GOVERNANCE.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index a83a6bc264..9397fcd8c5 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -82,7 +82,7 @@ members affiliated with the over-represented employer(s). This working group does not meet. All discussions and decisions happen in the [nodejs/docker-node](https://github.com/nodejs/docker-node) repository -in issues and pull requests. Items that requires a decission by the +in issues and pull requests. Items that requires a decision by the WG can be flagged with the ***WG-agenda*** label. When an issue is tagged with ***WG-agenda***, the WG may invite @@ -96,7 +96,7 @@ Seeking](http://en.wikipedia.org/wiki/Consensus-seeking_decision-making) decision-making model. All proposed changes to the project must be made in the form of a pull -request to the repository (directly commiting to a production branch +request to the repository (directly committing to a production branch of the repository is not permitted). The consensus seeking process will then follow via discussion by the WG members on that pull request. Changes deemed trivial by WG members may be merged instantly diff --git a/README.md b/README.md index f99460668b..d9d7e0f4e2 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ All of the images contain pre-installed versions of `node`, [`npm`](https://www.npmjs.com/), and [`yarn`](https://yarnpkg.com). For each supported architecture, the supported variants are different. In the file: [architectures](./architectures), it lists all supported variants for all of -the architecures that we support now. +the architectures that we support now. ## `node:` From b3d1870b63f312cdd2fbbd37d72496a9aa341821 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 6 Mar 2018 16:37:01 -0500 Subject: [PATCH 025/818] Update for Node.js v6.13.1 Also updates yarn to 1.5.1 --- 6/Dockerfile | 4 ++-- 6/alpine/Dockerfile | 4 ++-- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 4 ++-- 6/stretch/Dockerfile | 4 ++-- 6/wheezy/Dockerfile | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index 66eb3ff77f..46efe89db3 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.0 +ENV NODE_VERSION 6.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 1e864c1eb1..100bbda096 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.13.0 +ENV NODE_VERSION 6.13.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index c72d486c95..966d57935f 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.13.0 +FROM node:6.13.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index b326d48e98..30f62819fb 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.0 +ENV NODE_VERSION 6.13.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 960331453d..eb6c0a618f 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.0 +ENV NODE_VERSION 6.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 0219fe41ef..1726c29072 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.0 +ENV NODE_VERSION 6.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -36,7 +36,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ From 4c7763dc2cb067becf12ea4bd55e88b881ccba2b Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 6 Mar 2018 20:46:39 -0500 Subject: [PATCH 026/818] Update for Node.js v8.10.0 See: https://nodejs.org/en/blog/release/v8.10.0/ Also updates yarn to 1.5.1 --- 8/Dockerfile | 4 ++-- 8/alpine/Dockerfile | 4 ++-- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 4 ++-- 8/stretch/Dockerfile | 4 ++-- 8/wheezy/Dockerfile | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/8/Dockerfile b/8/Dockerfile index 96211198de..66c501fb9e 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.9.4 +ENV NODE_VERSION 8.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index cd6fb094ea..2c1fd6527d 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 8.9.4 +ENV NODE_VERSION 8.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 621cbdaeb8..d65e77bda4 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.9.4 +FROM node:8.10.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 2fa838c70d..8e845347c7 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.9.4 +ENV NODE_VERSION 8.10.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index f7d5827b68..8b1ef392a0 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.9.4 +ENV NODE_VERSION 8.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index 313b84c87e..0581d4b811 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.9.4 +ENV NODE_VERSION 8.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -36,7 +36,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ From 7ce7ea44b56820b967bd6da71dbc3b977ec4c660 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 7 Mar 2018 21:59:13 -0500 Subject: [PATCH 027/818] Update for Node.js v9.8.0 See: https://nodejs.org/en/blog/release/v9.8.0/ --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 275eec1e88..eaed0cb913 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.1 +ENV NODE_VERSION 9.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index afbd0ef0f9..1d5424762d 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.7.1 +ENV NODE_VERSION 9.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index cccf6ba3f5..7366a75e9b 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.7.1 +FROM node:9.8.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index fbc4b64ff8..4e0c0a1ee3 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.1 +ENV NODE_VERSION 9.8.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 5266d5c62e..c680549630 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.1 +ENV NODE_VERSION 9.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 64f0ffa913..0d9414d9c7 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.7.1 +ENV NODE_VERSION 9.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 838d87349884d58ea2c363c631744068bad69a21 Mon Sep 17 00:00:00 2001 From: Eyal Zekaria Date: Fri, 9 Mar 2018 11:38:08 +0100 Subject: [PATCH 028/818] Symlink yarn directory this will allow for an easier upgrade/downgrade of yarn, e.g: ``` FROM node:6-slim ENV YARN_VERSION 1.5.1 RUN curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" &&\ tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ &&\ ln -snf /opt/yarn-v$YARN_VERSION /opt/yarn &&\ rm yarn-v$YARN_VERSION.tar.gz ``` --- Dockerfile-alpine.template | 4 ++-- Dockerfile-slim.template | 4 ++-- Dockerfile-stretch.template | 4 ++-- Dockerfile-wheezy.template | 4 ++-- Dockerfile.template | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 4c5623a024..4422fa4783 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -58,8 +58,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 95cf72a606..ae0793b95b 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -58,8 +58,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index a9a2fc59d3..6f19543bba 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -53,8 +53,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 397233e3cb..42b6bbfa59 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -49,8 +49,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/Dockerfile.template b/Dockerfile.template index c6249db394..d738b50220 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -53,8 +53,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz From 926d446701b9dbffe09e10d49235ee3d26a18321 Mon Sep 17 00:00:00 2001 From: Eyal Zekaria Date: Fri, 9 Mar 2018 11:38:53 +0100 Subject: [PATCH 029/818] Update README.md with an example on how to upgrade/downgrade yarn version --- docs/BestPractices.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 0d97f4c505..d77f37cb21 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -29,6 +29,21 @@ ENV NPM_CONFIG_PREFIX=/home/node/.npm-global ENV PATH=$PATH:/home/node/.npm-global/bin # optionally if you want to run npm global bin without specifying path ``` +## Upgrading/downgrading Yarn + +If you need to upgrade/downgrade `yarn`, you can do so by issuing the following commands in your `Dockerfile`: + +```Dockerfile +FROM node:6 + +ENV YARN_VERSION 1.5.1 + +RUN curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -snf /opt/yarn-v$YARN_VERSION /opt/yarn \ + && rm yarn-v$YARN_VERSION.tar.gz +``` + ## Handling Kernel Signals Node.js was not designed to run as PID 1 which leads to unexpected behaviour when running inside of Docker. For example, a Node.js process running as PID 1 will not respond to `SIGTERM` (`CTRL-C`) and similar signals. As of Docker 1.13, you can use the `--init` flag to wrap your Node.js process with a [lightweight init system](https://github.com/krallin/tini) that properly handles running as PID 1. From 63b1fa17ce8a64261c1a5394e685caa6e083da58 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 16 Mar 2018 00:04:13 +0800 Subject: [PATCH 030/818] Fix yarn directory creation step, cc #639 --- Dockerfile-alpine.template | 1 + Dockerfile-slim.template | 1 + Dockerfile-stretch.template | 1 + Dockerfile-wheezy.template | 1 + Dockerfile.template | 1 + 5 files changed, 5 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 4422fa4783..6a548d6fc0 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -58,6 +58,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index ae0793b95b..c81963f890 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -58,6 +58,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 6f19543bba..42bb17deb7 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -53,6 +53,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 42b6bbfa59..503946c92d 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -49,6 +49,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile.template b/Dockerfile.template index d738b50220..91bf8413d1 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -53,6 +53,7 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt/yarn \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ From ae26d217bca933e72ac5f8de946681c1b5f8b37e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 16 Mar 2018 01:19:02 +0800 Subject: [PATCH 031/818] Update yarn w/ symbolic-linked directory, cc #639 --- 4/Dockerfile | 3 ++- 4/alpine/Dockerfile | 3 ++- 4/slim/Dockerfile | 3 ++- 4/stretch/Dockerfile | 3 ++- 4/wheezy/Dockerfile | 3 ++- 6/Dockerfile | 3 ++- 6/alpine/Dockerfile | 3 ++- 6/slim/Dockerfile | 3 ++- 6/stretch/Dockerfile | 3 ++- 6/wheezy/Dockerfile | 3 ++- 8/Dockerfile | 3 ++- 8/alpine/Dockerfile | 3 ++- 8/slim/Dockerfile | 3 ++- 8/stretch/Dockerfile | 3 ++- 8/wheezy/Dockerfile | 3 ++- 9/Dockerfile | 3 ++- 9/alpine/Dockerfile | 3 ++- 9/slim/Dockerfile | 3 ++- 9/stretch/Dockerfile | 3 ++- 9/wheezy/Dockerfile | 3 ++- 20 files changed, 40 insertions(+), 20 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index dee60dec60..46dfd17c10 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 4f76d1318a..6204c3aff9 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -59,7 +59,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index 519a70e2d5..84d0b4ea2f 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index 50698d5cd3..06f3ea7b48 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index 6a67cd3aad..c0878d9440 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -50,7 +50,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/6/Dockerfile b/6/Dockerfile index 46efe89db3..24ba928d71 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 100bbda096..7414b25599 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -59,7 +59,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 30f62819fb..e57964fa1b 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index eb6c0a618f..10543c6c83 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 1726c29072..1d6430bd8f 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -50,7 +50,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/8/Dockerfile b/8/Dockerfile index 66c501fb9e..d3a40178d6 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 2c1fd6527d..72cb4d5273 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -59,7 +59,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 8e845347c7..3da345118c 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 8b1ef392a0..9938e96162 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index 0581d4b811..155a5212c5 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -50,7 +50,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/9/Dockerfile b/9/Dockerfile index eaed0cb913..7ef95b41ef 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 1d5424762d..116e11fb44 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -59,7 +59,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 4e0c0a1ee3..40bbaa7257 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -59,7 +59,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index c680549630..37338658e0 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -54,7 +54,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 0d9414d9c7..bed682f0fc 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -50,7 +50,8 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz From ab12e9bab43bde5efd2e9fa278d941e4062c6f4a Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Fri, 16 Mar 2018 16:41:21 +0100 Subject: [PATCH 032/818] Fixed symbolic links to yarn and yarnpkg (#650) * Fixed symbolic links to yarn and yarnpkg * Ensures npm and yarn can be run properly --- 4/Dockerfile | 7 +++---- 4/alpine/Dockerfile | 7 +++---- 4/slim/Dockerfile | 7 +++---- 4/stretch/Dockerfile | 7 +++---- 4/wheezy/Dockerfile | 7 +++---- 6/Dockerfile | 7 +++---- 6/alpine/Dockerfile | 7 +++---- 6/slim/Dockerfile | 7 +++---- 6/stretch/Dockerfile | 7 +++---- 6/wheezy/Dockerfile | 7 +++---- 8/Dockerfile | 7 +++---- 8/alpine/Dockerfile | 7 +++---- 8/slim/Dockerfile | 7 +++---- 8/stretch/Dockerfile | 7 +++---- 8/wheezy/Dockerfile | 7 +++---- 9/Dockerfile | 7 +++---- 9/alpine/Dockerfile | 7 +++---- 9/slim/Dockerfile | 7 +++---- 9/stretch/Dockerfile | 7 +++---- 9/wheezy/Dockerfile | 7 +++---- Dockerfile-alpine.template | 7 +++---- Dockerfile-slim.template | 7 +++---- Dockerfile-stretch.template | 7 +++---- Dockerfile-wheezy.template | 7 +++---- Dockerfile.template | 7 +++---- test-build.sh | 14 ++++++++++++-- 26 files changed, 87 insertions(+), 102 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index 46dfd17c10..c2a82b845f 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 6204c3aff9..448c4ec31f 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -58,11 +58,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index 84d0b4ea2f..76210659c9 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -58,11 +58,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index 06f3ea7b48..15fae7e7d6 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index c0878d9440..aff895e6fd 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -49,11 +49,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/6/Dockerfile b/6/Dockerfile index 24ba928d71..df18a857e1 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 7414b25599..ff5dc95a90 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -58,11 +58,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index e57964fa1b..d9058c72c8 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -58,11 +58,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 10543c6c83..8324d2a56a 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 1d6430bd8f..2eba40319d 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -49,11 +49,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/8/Dockerfile b/8/Dockerfile index d3a40178d6..0a0df40543 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 72cb4d5273..5ab4d27aff 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -58,11 +58,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 3da345118c..bf0a36a640 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -58,11 +58,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 9938e96162..0661f0aa21 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index 155a5212c5..3064d07af0 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -49,11 +49,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/9/Dockerfile b/9/Dockerfile index 7ef95b41ef..6337e4108e 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 116e11fb44..30b6e65691 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -58,11 +58,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 40bbaa7257..a546a1cde7 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -58,11 +58,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 37338658e0..654270a714 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index bed682f0fc..7b3e49ba8e 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -49,11 +49,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6a548d6fc0..98d92c7b34 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -58,11 +58,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index c81963f890..437c541fc7 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -58,11 +58,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 42bb17deb7..398e34a28e 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 503946c92d..f7b487427a 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -49,11 +49,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/Dockerfile.template b/Dockerfile.template index 91bf8413d1..e498f07d5d 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -53,11 +53,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ + && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION /opt/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/test-build.sh b/test-build.sh index 22b500d937..9caba7c0a0 100755 --- a/test-build.sh +++ b/test-build.sh @@ -29,9 +29,19 @@ for version in "${versions[@]}"; do OUTPUT=$(docker run --rm -it node:"$tag" node -e "process.stdout.write(process.versions.node)") if [ "$OUTPUT" != "$full_version" ]; then - fatal "Test of $tag failed!" + fatal "Test of $tag for node failed!" fi - info "Test of $tag succeeded." + info "Test of $tag for node succeeded." + + if ! docker run --rm -i node:"$tag" npm --version; then + fatal "Test of $tag for npm failed!" + fi + info "Test of $tag for npm succeeded." + + if ! docker run --rm -i node:"$tag" yarn --version; then + fatal "Test of $tag for yarn failed!" + fi + info "Test of $tag for yarn succeeded." # Get supported variants according to the target architecture. # See details in function.sh From 9caea2f2caf25535c2cef3084567de4e79066d9b Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 21 Mar 2018 07:41:41 -0400 Subject: [PATCH 033/818] Switch the Travis build to stages --- .travis.yml | 64 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9e5073b4a..b9f310bf3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,30 +13,42 @@ addons: packages: - docker-ce -script: - - if [ "true" = "${SHELLCHECK-}" ]; then shellcheck *.sh ; fi - - if [ -n "${NODE_VERSION-}" ]; then ./test-build.sh $NODE_VERSION ; fi - - if [ "true" = "${DOCTOCCHECK-}" ]; then - npm i -g doctoc && - cp README.md README.md.tmp && - doctoc --title='## Table of Contents' --github README.md && - diff -q README.md README.md.tmp; - fi - -env: - - DOCTOCCHECK: true - - NODE_VERSION: '4' - - NODE_VERSION: '6' - - NODE_VERSION: '8' - - NODE_VERSION: '9' - - NODE_VERSION: 'chakracore/8' - -matrix: +script: ./test-build.sh $NODE_VERSION + +jobs: include: - env: SHELLCHECK=true - addons: - apt: - sources: - - debian-sid - packages: - - shellcheck + - stage: Doc TOC Check + install: npm i -g doctoc + script: + - cp README.md README.md.tmp && + doctoc --title='## Table of Contents' --github README.md && + diff -q README.md README.md.tmp + + - stage: Shell Check + script: shellcheck *.sh + addons: + apt: + sources: + - debian-sid + packages: + - shellcheck + + - stage: Build + env: + - NODE_VERSION: '4' + + - stage: Build + env: + - NODE_VERSION: '6' + + - stage: Build + env: + - NODE_VERSION: '8' + + - stage: Build + env: + - NODE_VERSION: '9' + + - stage: Build + env: + - NODE_VERSION: 'chakracore/8' From a79c59b7b3e81c1fedb419531fce01f1a4726a39 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 22 Mar 2018 00:09:47 +0800 Subject: [PATCH 034/818] Update node.js v9.x to v9.9.0 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 6337e4108e..7e8d8da0df 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.8.0 +ENV NODE_VERSION 9.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 30b6e65691..e4e0421ff7 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.8.0 +ENV NODE_VERSION 9.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index 7366a75e9b..edf4ffeaa7 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.8.0 +FROM node:9.9.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index a546a1cde7..f863b2f37c 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.8.0 +ENV NODE_VERSION 9.9.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 654270a714..6b8722d6c0 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.8.0 +ENV NODE_VERSION 9.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 7b3e49ba8e..61ffd3cb34 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.8.0 +ENV NODE_VERSION 9.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 41c8c43a2625726077e3dcfa1d59a54cc15f069e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 22 Mar 2018 00:10:56 +0800 Subject: [PATCH 035/818] Update chakracore to v8.10.0 with yarn v1.5.1 --- chakracore/8/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index 30b26defa4..6db43198a7 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/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 -ENV NODE_VERSION 8.9.4 +ENV NODE_VERSION 8.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ From fb8c0910205944cb81b8bae291f72a4a54eb2426 Mon Sep 17 00:00:00 2001 From: Kyle Farnung Date: Wed, 21 Mar 2018 11:13:29 -0700 Subject: [PATCH 036/818] Update yarn script for chakracore Matched the behavior used for node-v8 --- chakracore/8/Dockerfile | 8 ++++---- chakracore/Dockerfile.template | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index 6db43198a7..b15e93684c 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/Dockerfile @@ -30,10 +30,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index 7b7c57ae2f..d0b73e60f7 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -30,10 +30,10 @@ RUN set -ex \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt/yarn \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz CMD [ "node" ] From 4712f343debda17ed9c2e9bb8ef07335e8d4b141 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 21 Mar 2018 08:46:04 -0400 Subject: [PATCH 037/818] Optimized the build stages --- .travis.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9f310bf3f..cbee8a1e8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,25 @@ dist: trusty sudo: required -language: node_js -node_js: - - lts/* - -services: - - docker - -addons: - apt: - packages: - - docker-ce +language: generic script: ./test-build.sh $NODE_VERSION jobs: include: - - stage: Doc TOC Check + - stage: Test + env: + - TEST: Doc Toc Check + language: node_js install: npm i -g doctoc script: - cp README.md README.md.tmp && doctoc --title='## Table of Contents' --github README.md && diff -q README.md README.md.tmp - - stage: Shell Check + - stage: Test + env: + - TEST: Shell Check script: shellcheck *.sh addons: apt: @@ -34,6 +29,12 @@ jobs: - shellcheck - stage: Build + services: + - docker + addons: + apt: + packages: + - docker-ce env: - NODE_VERSION: '4' From 193e04ae6bfe5e318a238f86cf03965aa27ecd81 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 23 Mar 2018 10:59:15 -0400 Subject: [PATCH 038/818] Moved image test to a script to be run in the image --- test-build.sh | 23 ++--------------------- test-image.sh | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) create mode 100755 test-image.sh diff --git a/test-build.sh b/test-build.sh index 9caba7c0a0..873097ea5a 100755 --- a/test-build.sh +++ b/test-build.sh @@ -27,21 +27,7 @@ for version in "${versions[@]}"; do fi info "Build of $tag succeeded." - OUTPUT=$(docker run --rm -it node:"$tag" node -e "process.stdout.write(process.versions.node)") - if [ "$OUTPUT" != "$full_version" ]; then - fatal "Test of $tag for node failed!" - fi - info "Test of $tag for node succeeded." - - if ! docker run --rm -i node:"$tag" npm --version; then - fatal "Test of $tag for npm failed!" - fi - info "Test of $tag for npm succeeded." - - if ! docker run --rm -i node:"$tag" yarn --version; then - fatal "Test of $tag for yarn failed!" - fi - info "Test of $tag for yarn succeeded." + docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"$tag" test.sh "$full_version" # Get supported variants according to the target architecture. # See details in function.sh @@ -58,12 +44,7 @@ for version in "${versions[@]}"; do fi info "Build of $tag-$variant succeeded." - OUTPUT=$(docker run --rm -it node:"$tag-$variant" node -e "process.stdout.write(process.versions.node)") - if [ "$OUTPUT" != "$full_version" ]; then - fatal "Test of $tag-$variant failed!" - fi - info "Test of $tag-$variant succeeded." - + docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"$tag-$variant" test.sh "$full_version" done done diff --git a/test-image.sh b/test-image.sh new file mode 100755 index 0000000000..9c5d0a25d0 --- /dev/null +++ b/test-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh +if [ "$(node -e "process.stdout.write(process.versions.node)")" != "$1" ]; then + echo "Test for node failed!" + exit 1 +fi +echo "Test for node succeeded." + +if ! npm --version > /dev/null; then + echo "Test for npm failed!" + exit 2 +fi +echo "Test for npm succeeded." + +if ! yarn --version > /dev/null; then + echo "Test of yarn failed!" + exit 3 +fi +echo "Test for yarn succeeded." From 42541fe0fb5cf1e96d52b0c50f160104227d4f36 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 23 Mar 2018 13:39:30 -0400 Subject: [PATCH 039/818] Added a build function to test-build.sh --- test-build.sh | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/test-build.sh b/test-build.sh index 873097ea5a..632351b70f 100755 --- a/test-build.sh +++ b/test-build.sh @@ -6,6 +6,35 @@ set -uo pipefail . functions.sh +function build () { + local version + local tag + local variant + local full_tag + local path + version="$1"; shift + variant="$1"; shift + tag="$1"; shift + + if [ -z "$variant" ]; then + full_tag="$tag" + path="$version/$variant" + else + full_tag="$tag-$variant" + path="$version/$variant" + fi + + info "Building $full_tag..." + + if ! docker build -t node:"$full_tag" "$path"; then + fatal "Build of $full_tag failed!" + fi + info "Build of $full_tag succeeded." + + info "Testing $full_tag" + docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"$full_tag" test.sh "$full_version" +} + cd "$(cd "${0%/*}" && pwd -P)" || exit; IFS=' ' read -ra versions <<< "$(get_versions . "$@")" @@ -20,14 +49,7 @@ for version in "${versions[@]}"; do tag=$(get_tag "$version") full_version=$(get_full_version "$version") - info "Building $tag..." - - if ! docker build -t node:"$tag" "$version"; then - fatal "Build of $tag failed!" - fi - info "Build of $tag succeeded." - - docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"$tag" test.sh "$full_version" + build "$version" "" "$tag" # Get supported variants according to the target architecture. # See details in function.sh @@ -37,14 +59,7 @@ for version in "${versions[@]}"; do # Skip non-docker directories [ -f "$version/$variant/Dockerfile" ] || continue - info "Building $tag-$variant variant..." - - if ! docker build -t node:"$tag-$variant" "$version/$variant"; then - fatal "Build of $tag-$variant failed!" - fi - info "Build of $tag-$variant succeeded." - - docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"$tag-$variant" test.sh "$full_version" + build "$version" "$variant" "$tag" done done From a1f30ea9b655bf3cd2882ac1a780211636a43269 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 23 Mar 2018 08:57:02 -0400 Subject: [PATCH 040/818] Added a build stage for each variant of each version [skip ci] --- .travis.yml | 134 ++++++++++++++++++++++++++++++++++++++++---- functions.sh | 2 +- travis.yml.template | 38 +++++++++++++ update.sh | 33 ++++++++--- 4 files changed, 185 insertions(+), 22 deletions(-) create mode 100644 travis.yml.template diff --git a/.travis.yml b/.travis.yml index cbee8a1e8e..5dc73074bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,18 @@ +#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### + dist: trusty sudo: required language: generic -script: ./test-build.sh $NODE_VERSION +services: + - docker +addons: + apt: + packages: + - docker-ce + +script: ./test-build.sh $NODE_VERSION $VARIANT jobs: include: @@ -28,28 +37,129 @@ jobs: packages: - shellcheck + # Docker Build # + - stage: Build + env: + - NODE_VERSION: "4" + - VARIANT: "default" + + - stage: Build + env: + - NODE_VERSION: "4" + - VARIANT: "alpine" + + - stage: Build + env: + - NODE_VERSION: "4" + - VARIANT: "onbuild" + + - stage: Build + env: + - NODE_VERSION: "4" + - VARIANT: "slim" + + - stage: Build + env: + - NODE_VERSION: "4" + - VARIANT: "stretch" + + - stage: Build + env: + - NODE_VERSION: "4" + - VARIANT: "wheezy" + + - stage: Build + env: + - NODE_VERSION: "6" + - VARIANT: "default" + + - stage: Build + env: + - NODE_VERSION: "6" + - VARIANT: "alpine" + + - stage: Build + env: + - NODE_VERSION: "6" + - VARIANT: "onbuild" + + - stage: Build + env: + - NODE_VERSION: "6" + - VARIANT: "slim" + + - stage: Build + env: + - NODE_VERSION: "6" + - VARIANT: "stretch" + + - stage: Build + env: + - NODE_VERSION: "6" + - VARIANT: "wheezy" + + - stage: Build + env: + - NODE_VERSION: "8" + - VARIANT: "default" + + - stage: Build + env: + - NODE_VERSION: "8" + - VARIANT: "alpine" + + - stage: Build + env: + - NODE_VERSION: "8" + - VARIANT: "onbuild" + - stage: Build - services: - - docker - addons: - apt: - packages: - - docker-ce env: - - NODE_VERSION: '4' + - NODE_VERSION: "8" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: '6' + - NODE_VERSION: "8" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: '8' + - NODE_VERSION: "8" + - VARIANT: "wheezy" - stage: Build env: - - NODE_VERSION: '9' + - NODE_VERSION: "9" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: 'chakracore/8' + - NODE_VERSION: "9" + - VARIANT: "alpine" + + - stage: Build + env: + - NODE_VERSION: "9" + - VARIANT: "onbuild" + + - stage: Build + env: + - NODE_VERSION: "9" + - VARIANT: "slim" + + - stage: Build + env: + - NODE_VERSION: "9" + - VARIANT: "stretch" + + - stage: Build + env: + - NODE_VERSION: "9" + - VARIANT: "wheezy" + + - stage: Build + env: + - NODE_VERSION: "chakracore/8" + - VARIANT: "default" + diff --git a/functions.sh b/functions.sh index 175c13960a..8e30976753 100755 --- a/functions.sh +++ b/functions.sh @@ -201,7 +201,7 @@ function sort_versions () { local sorted local lines local line - + IFS=$'\n' lines="${versions[*]}" unset IFS diff --git a/travis.yml.template b/travis.yml.template new file mode 100644 index 0000000000..4aecb7a528 --- /dev/null +++ b/travis.yml.template @@ -0,0 +1,38 @@ +dist: trusty +sudo: required + +language: generic + +services: + - docker +addons: + apt: + packages: + - docker-ce + +script: ./test-build.sh $NODE_VERSION $VARIANT + +jobs: + include: + - stage: Test + env: + - TEST: Doc Toc Check + language: node_js + install: npm i -g doctoc + script: + - cp README.md README.md.tmp && + doctoc --title='## Table of Contents' --github README.md && + diff -q README.md README.md.tmp + + - stage: Test + env: + - TEST: Shell Check + script: shellcheck *.sh + addons: + apt: + sources: + - debian-sid + packages: + - shellcheck + + # Docker Build # diff --git a/update.sh b/update.sh index 7d34911455..214524a07a 100755 --- a/update.sh +++ b/update.sh @@ -52,10 +52,27 @@ function update_node_version { ) } +function add_stage { + local baseuri=$1 + shift + local version=$1 + shift + local variant=$1 + shift + + echo ' - stage: Build + env: + - NODE_VERSION: "'"$version"'" + - VARIANT: "'"$variant"'" +' >> .travis.yml +} + +echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### +' | cat - travis.yml.template > .travis.yml + for version in "${versions[@]}"; do -{ # Skip "docs" and other non-docker directories - [ -f "$version/Dockerfile" ] || exit + [ -f "$version/Dockerfile" ] || continue info "Updating version $version..." @@ -63,21 +80,19 @@ for version in "${versions[@]}"; do versionnum=$(basename "$version") baseuri=$(get_config "$parentpath" "baseuri") - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" + add_stage "$baseuri" "$version" "default" + update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" & # Get supported variants according the target architecture # See details in function.sh variants=$(get_variants "$parentpath") for variant in $variants; do - { # Skip non-docker directories - [ -f "$version/$variant/Dockerfile" ] || exit - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" - } & + [ -f "$version/$variant/Dockerfile" ] || continue + add_stage "$baseuri" "$version" "$variant" + update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" & done - wait -} & done wait From 6888da31897a80d7e67113674be5b37a631171ae Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Sun, 25 Mar 2018 13:23:06 -0400 Subject: [PATCH 041/818] Modified test-build to accept comma separated versions [skip ci] --- test-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-build.sh b/test-build.sh index 632351b70f..b0a7bf5bd6 100755 --- a/test-build.sh +++ b/test-build.sh @@ -37,7 +37,7 @@ function build () { cd "$(cd "${0%/*}" && pwd -P)" || exit; -IFS=' ' read -ra versions <<< "$(get_versions . "$@")" +IFS=' ' read -ra versions <<< "$(IFS=','; get_versions . "$1")" if [ ${#versions[@]} -eq 0 ]; then fatal "No valid versions found!" fi From e839bbbb50d4969cfe68f95136354b0a6221ca7b Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 26 Mar 2018 10:18:32 -0400 Subject: [PATCH 042/818] Modified the test build to accept a list of variants to slimit the build --- functions.sh | 25 ++++++++++++++++++++++--- generate-stackbrew-library.sh | 4 ++-- test-build.sh | 4 ++-- update.sh | 4 ++-- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/functions.sh b/functions.sh index 8e30976753..f2e1ae8689 100755 --- a/functions.sh +++ b/functions.sh @@ -56,10 +56,29 @@ function get_variants() { shift local arch - arch=$(get_arch) + local availablevariants + local variantsfilter local variants - variants=$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g') - echo "$variants" + + arch=$(get_arch) + variantsfilter=( "$@" ) + IFS=' ' read -ra availablevariants <<< "$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')" + + if [ ${#variantsfilter[@]} -gt 0 ]; then + for variant1 in "${availablevariants[@]}"; do + for variant2 in "${variantsfilter[@]}"; do + if [[ "$variant1" = "$variant2" ]]; then + variants+=("$variant1") + fi + done + done + + if [ ${#variants[@]} -gt 0 ]; then + echo "${variants[@]}" + fi + else + echo "${availablevariants[@]}" + fi } # Get supported architectures for a specific version and variant diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 20d730e241..f892cf0021 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -70,8 +70,8 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - variants=$(get_variants "$(dirname "$version")") - for variant in $variants; do + IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")")" + for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "$version/$variant/Dockerfile" ] || continue diff --git a/test-build.sh b/test-build.sh index b0a7bf5bd6..004bac3ae4 100755 --- a/test-build.sh +++ b/test-build.sh @@ -53,9 +53,9 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - variants=$(get_variants "$(dirname "$version")") + IFS=' ' read -ra variants <<< "$(IFS=','; get_variants "$(dirname "$version")" "$2")" - for variant in $variants; do + for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "$version/$variant/Dockerfile" ] || continue diff --git a/update.sh b/update.sh index 214524a07a..d23d9df021 100755 --- a/update.sh +++ b/update.sh @@ -85,9 +85,9 @@ for version in "${versions[@]}"; do # Get supported variants according the target architecture # See details in function.sh - variants=$(get_variants "$parentpath") + IFS=' ' read -ra variants <<< "$(get_variants "$parentpath")" - for variant in $variants; do + for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "$version/$variant/Dockerfile" ] || continue add_stage "$baseuri" "$version" "$variant" From 9d428986bacceaadd98bc774a443c873a5baebdb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 29 Mar 2018 00:27:21 +0800 Subject: [PATCH 043/818] Update node.js v4.x to v4.9.0 with yarn v1.5.1 --- 4/Dockerfile | 4 ++-- 4/alpine/Dockerfile | 4 ++-- 4/onbuild/Dockerfile | 2 +- 4/slim/Dockerfile | 4 ++-- 4/stretch/Dockerfile | 4 ++-- 4/wheezy/Dockerfile | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index c2a82b845f..ad51f0bcfa 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.8.7 +ENV NODE_VERSION 4.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 448c4ec31f..5536abdd69 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 4.8.7 +ENV NODE_VERSION 4.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/4/onbuild/Dockerfile b/4/onbuild/Dockerfile index 135274eb28..a20fbb07e8 100644 --- a/4/onbuild/Dockerfile +++ b/4/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:4.8.7 +FROM node:4.9.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index 76210659c9..3de01cc9d6 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.8.7 +ENV NODE_VERSION 4.9.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index 15fae7e7d6..4ad4ab2b77 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.8.7 +ENV NODE_VERSION 4.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index aff895e6fd..0bdfc27bc8 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.8.7 +ENV NODE_VERSION 4.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -36,7 +36,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.3.2 +ENV YARN_VERSION 1.5.1 RUN set -ex \ && for key in \ From ebb4816d0d1424fcabe30f41c4d7c38b8db1f426 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 29 Mar 2018 00:27:33 +0800 Subject: [PATCH 044/818] Update node.js v6.x to v6.14.10 --- 6/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 6/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index df18a857e1..2c1d95e8eb 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.1 +ENV NODE_VERSION 6.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index ff5dc95a90..0b6639cd73 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.13.1 +ENV NODE_VERSION 6.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 966d57935f..9425156ce3 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.13.1 +FROM node:6.14.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index d9058c72c8..9d060efd6c 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.1 +ENV NODE_VERSION 6.14.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 8324d2a56a..8448869deb 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.1 +ENV NODE_VERSION 6.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 2eba40319d..b8f625346e 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.13.1 +ENV NODE_VERSION 6.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 2b11af24b4bf75cc051ce2fc21e796e7e9425fd0 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 29 Mar 2018 00:27:45 +0800 Subject: [PATCH 045/818] Update node.js v8.x to v8.11.0 --- 8/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 8/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8/Dockerfile b/8/Dockerfile index 0a0df40543..fcf5ba3c11 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.10.0 +ENV NODE_VERSION 8.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 5ab4d27aff..f061386658 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 8.10.0 +ENV NODE_VERSION 8.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index d65e77bda4..57b3abc26f 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.10.0 +FROM node:8.11.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index bf0a36a640..c264852b02 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.10.0 +ENV NODE_VERSION 8.11.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 0661f0aa21..9a62b13784 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.10.0 +ENV NODE_VERSION 8.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index 3064d07af0..a0c47e3dcf 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.10.0 +ENV NODE_VERSION 8.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From ab66de01f88284c5226ebb963ac70f038f97fab9 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 29 Mar 2018 00:28:46 +0800 Subject: [PATCH 046/818] Update node.js v9.x to v9.11.0 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 7e8d8da0df..7b00899d83 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.9.0 +ENV NODE_VERSION 9.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index e4e0421ff7..10b8f90fa0 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.9.0 +ENV NODE_VERSION 9.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index edf4ffeaa7..5bf53f0ec2 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.9.0 +FROM node:9.10.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index f863b2f37c..55e3bf4080 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.9.0 +ENV NODE_VERSION 9.10.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 6b8722d6c0..dd25a1ef72 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.9.0 +ENV NODE_VERSION 9.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 61ffd3cb34..1a64fea3e3 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.9.0 +ENV NODE_VERSION 9.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f56c21260109ad432ec3ea5ba96dbd3b9daa4ea7 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 30 Mar 2018 11:25:22 +0800 Subject: [PATCH 047/818] Update node.js v4.9.0 to v4.9.1 --- 4/Dockerfile | 2 +- 4/alpine/Dockerfile | 2 +- 4/onbuild/Dockerfile | 2 +- 4/slim/Dockerfile | 2 +- 4/stretch/Dockerfile | 2 +- 4/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/4/Dockerfile b/4/Dockerfile index ad51f0bcfa..c4bceeb670 100644 --- a/4/Dockerfile +++ b/4/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.9.0 +ENV NODE_VERSION 4.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 5536abdd69..630feaf3f0 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 4.9.0 +ENV NODE_VERSION 4.9.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/4/onbuild/Dockerfile b/4/onbuild/Dockerfile index a20fbb07e8..e0e3cdd690 100644 --- a/4/onbuild/Dockerfile +++ b/4/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:4.9.0 +FROM node:4.9.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile index 3de01cc9d6..0a8329b7d0 100644 --- a/4/slim/Dockerfile +++ b/4/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.9.0 +ENV NODE_VERSION 4.9.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile index 4ad4ab2b77..f6ac153716 100644 --- a/4/stretch/Dockerfile +++ b/4/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.9.0 +ENV NODE_VERSION 4.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile index 0bdfc27bc8..de3d1a80a6 100644 --- a/4/wheezy/Dockerfile +++ b/4/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 4.9.0 +ENV NODE_VERSION 4.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 987139fc2385fc985aaa2545f7aeeef255eced79 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 30 Mar 2018 11:31:24 +0800 Subject: [PATCH 048/818] Update node.js v6.14.0 to v6.14.1 --- 6/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 6/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index 2c1d95e8eb..15b51ea2ab 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.0 +ENV NODE_VERSION 6.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 0b6639cd73..0a433bdd99 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.14.0 +ENV NODE_VERSION 6.14.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 9425156ce3..428910a7b9 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.14.0 +FROM node:6.14.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 9d060efd6c..3ad5aa64eb 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.0 +ENV NODE_VERSION 6.14.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 8448869deb..5192ca212a 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.0 +ENV NODE_VERSION 6.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index b8f625346e..232ca18619 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.0 +ENV NODE_VERSION 6.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b3ca6573b5c179148b446107386ae96ac6204ad3 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 30 Mar 2018 11:33:21 +0800 Subject: [PATCH 049/818] Update node.js v8.11.0 to v8.11.1 --- 8/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 8/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8/Dockerfile b/8/Dockerfile index fcf5ba3c11..2147bdef19 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.0 +ENV NODE_VERSION 8.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index f061386658..583f901b3e 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 8.11.0 +ENV NODE_VERSION 8.11.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 57b3abc26f..690d95ca00 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.11.0 +FROM node:8.11.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index c264852b02..abb369ee74 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.0 +ENV NODE_VERSION 8.11.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 9a62b13784..3dc7f20a7c 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.0 +ENV NODE_VERSION 8.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile index a0c47e3dcf..eac6fba85a 100644 --- a/8/wheezy/Dockerfile +++ b/8/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.0 +ENV NODE_VERSION 8.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From d5badac9d19e01d12d446a556c344aba66ed6b96 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 30 Mar 2018 11:34:35 +0800 Subject: [PATCH 050/818] Update node.js v9.10.0 to v9.10.1 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 7b00899d83..90351a058f 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.0 +ENV NODE_VERSION 9.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 10b8f90fa0..aa8b41cfb4 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.10.0 +ENV NODE_VERSION 9.10.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index 5bf53f0ec2..ad1359552d 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.10.0 +FROM node:9.10.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 55e3bf4080..83abe60b2a 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.0 +ENV NODE_VERSION 9.10.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index dd25a1ef72..b4862c3e8e 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.0 +ENV NODE_VERSION 9.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 1a64fea3e3..772c47563c 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.0 +ENV NODE_VERSION 9.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f385ece941d90a80507f6bd46f87ef7c17d1cc03 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 3 Apr 2018 15:11:56 -0400 Subject: [PATCH 051/818] Prevent the building of the default variant for each Travis stage --- test-build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test-build.sh b/test-build.sh index 004bac3ae4..85f7320015 100755 --- a/test-build.sh +++ b/test-build.sh @@ -49,12 +49,14 @@ for version in "${versions[@]}"; do tag=$(get_tag "$version") full_version=$(get_full_version "$version") - build "$version" "" "$tag" - # Get supported variants according to the target architecture. # See details in function.sh IFS=' ' read -ra variants <<< "$(IFS=','; get_variants "$(dirname "$version")" "$2")" + if [[ "${variants[*]}" =~ "default" ]]; then + build "$version" "" "$tag" + fi + for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "$version/$variant/Dockerfile" ] || continue From e00c234f6313f40855e65f5d588b86977291fa09 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 3 Apr 2018 21:28:00 -0400 Subject: [PATCH 052/818] Fixed the test-build treatment of commq seperated versions and variants --- test-build.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test-build.sh b/test-build.sh index 85f7320015..c58a7ccb1f 100755 --- a/test-build.sh +++ b/test-build.sh @@ -6,6 +6,12 @@ set -uo pipefail . functions.sh +# Convert comma delimited cli arguments to arrays +# E.g. ./test-build.sh 4,6 slim,onbuild +# "4,6" becomes "4 6" and "slim,onbuild" becomes "slim onbuild" +IFS=',' read -ra versions_arg <<< "${1:-}" +IFS=',' read -ra variant_arg <<< "${2:-}" + function build () { local version local tag @@ -37,7 +43,7 @@ function build () { cd "$(cd "${0%/*}" && pwd -P)" || exit; -IFS=' ' read -ra versions <<< "$(IFS=','; get_versions . "$1")" +IFS=' ' read -ra versions <<< "$(get_versions . "${versions_arg[@]}")" if [ ${#versions[@]} -eq 0 ]; then fatal "No valid versions found!" fi @@ -51,8 +57,9 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - IFS=' ' read -ra variants <<< "$(IFS=','; get_variants "$(dirname "$version")" "$2")" + IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")" "${variant_arg[@]}")" + # Only build the default Dockerfile if "default" is in the variant list if [[ "${variants[*]}" =~ "default" ]]; then build "$version" "" "$tag" fi From c99d3b9038cd41a2abe11095bfe4744abf8e2e67 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 5 Apr 2018 05:17:27 +0800 Subject: [PATCH 053/818] Update node.js v9.x to v9.11.0 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 90351a058f..0952b348d6 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.1 +ENV NODE_VERSION 9.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index aa8b41cfb4..bb2d52be66 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.10.1 +ENV NODE_VERSION 9.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index ad1359552d..21c11ff62e 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.10.1 +FROM node:9.11.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 83abe60b2a..8899336490 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.1 +ENV NODE_VERSION 9.11.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index b4862c3e8e..23b6b208e5 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.1 +ENV NODE_VERSION 9.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 772c47563c..4f319057a1 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.10.1 +ENV NODE_VERSION 9.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9023f588717d236a92d91a8483ff0582484c22d1 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 5 Apr 2018 13:24:34 +0800 Subject: [PATCH 054/818] Update node.js v9.x to v9.11.1 --- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 9/wheezy/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/9/Dockerfile b/9/Dockerfile index 0952b348d6..342577a228 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.11.0 +ENV NODE_VERSION 9.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index bb2d52be66..f7f0d3a4aa 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.11.0 +ENV NODE_VERSION 9.11.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index 21c11ff62e..b04d80bd0a 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.11.0 +FROM node:9.11.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 8899336490..aecbfbad49 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.11.0 +ENV NODE_VERSION 9.11.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 23b6b208e5..65169c28b8 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.11.0 +ENV NODE_VERSION 9.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile index 4f319057a1..38527c72ec 100644 --- a/9/wheezy/Dockerfile +++ b/9/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.11.0 +ENV NODE_VERSION 9.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 455313ccdcae5364aa6fcf27fcd1a02375e43193 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 5 Apr 2018 17:35:37 -0400 Subject: [PATCH 055/818] Fixed the onbuild build broken by build stages --- test-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-build.sh b/test-build.sh index c58a7ccb1f..e2e36f70e5 100755 --- a/test-build.sh +++ b/test-build.sh @@ -60,7 +60,7 @@ for version in "${versions[@]}"; do IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")" "${variant_arg[@]}")" # Only build the default Dockerfile if "default" is in the variant list - if [[ "${variants[*]}" =~ "default" ]]; then + if [[ "${variants[*]}" =~ "default" ]] || [[ "${variants[*]}" =~ "onbuild" ]] ; then build "$version" "" "$tag" fi From a13ad42828553776ed1a4de2fae45187cd2a1b29 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 27 Mar 2018 10:27:13 -0400 Subject: [PATCH 056/818] Added a deploy stage to automate the deployment to the official images repo --- .travis.yml | 9 +++++++++ travis.yml.template | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5dc73074bc..3a733cf437 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,12 @@ addons: script: ./test-build.sh $NODE_VERSION $VARIANT +stages: + - Test + - Build + - name: Deploy + if: branch = master + jobs: include: - stage: Test @@ -37,6 +43,9 @@ jobs: packages: - shellcheck + - stage: Deploy + script: ./generate-stackbrew-library.sh + # Docker Build # - stage: Build env: diff --git a/travis.yml.template b/travis.yml.template index 4aecb7a528..394fce79da 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -12,6 +12,12 @@ addons: script: ./test-build.sh $NODE_VERSION $VARIANT +stages: + - Test + - Build + - name: Deploy + if: branch = master + jobs: include: - stage: Test @@ -35,4 +41,7 @@ jobs: packages: - shellcheck + - stage: Deploy + script: ./generate-stackbrew-library.sh + # Docker Build # From 78407116065b2be42d88a8d2d853305f4c6807e9 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 27 Mar 2018 12:27:15 -0400 Subject: [PATCH 057/818] Added script to create the PR to the official-images repo Co-authored-by: Hank Brekke Co-authored-by: Laurent Goderre --- .travis.yml | 4 +- generate-stackbrew-pr.sh | 105 +++++++++++++++++++++++++++++++++++++++ travis.yml.template | 4 +- 3 files changed, 109 insertions(+), 4 deletions(-) create mode 100755 generate-stackbrew-pr.sh diff --git a/.travis.yml b/.travis.yml index 3a733cf437..5779ea350c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ stages: - Test - Build - name: Deploy - if: branch = master + if: branch = master AND type IN (push) jobs: include: @@ -44,7 +44,7 @@ jobs: - shellcheck - stage: Deploy - script: ./generate-stackbrew-library.sh + script: ./generate-stackbrew-pr.sh # Docker Build # - stage: Build diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh new file mode 100755 index 0000000000..d7c55abf6d --- /dev/null +++ b/generate-stackbrew-pr.sh @@ -0,0 +1,105 @@ +#!/bin/bash +set -e +. functions.sh + +GITHUB_USERNAME="nodejs-github-bot" +gitpath="../docker-images" +IMAGES_FILE="library/node" +REPO_NAME="official-images" +BRANCH_NAME="travis-$TRAVIS_BUILD_ID" +ORIGIN_SLUG="$GITHUB_USERNAME/$REPO_NAME" +UPSTREAM_SLUG="docker-library/$REPO_NAME" + +function updated() { + local versions + local images_changed + + IFS=' ' read -ra versions <<< "$(IFS=','; get_versions)" + images_changed=$(git show --name-only "$TRAVIS_COMMIT" "${versions[@]}") + + if [ -z "$images_changed" ]; then + return 1 + else + return 0 + fi +} + +function permission_check() { + auth="$(curl -H "Authorization: token $GITHUB_API_TOKEN" \ + -s \ + "https://api.github.com")" + if [ "$(echo "$auth" | jq .message)" = "\"Bad credentials\"" ]; then + fatal "Authentication Failed! Invalid \$GITHUB_API_TOKEN" + fi + + auth="$(curl -H "Authorization: token $GITHUB_API_TOKEN" \ + -s \ + "https://api.github.com/repos/$ORIGIN_SLUG/collaborators/$GITHUB_USERNAME/permission")" + if [ "$(echo "$auth" | jq .message)" != "null" ]; then + fatal "\$GITHUB_API_TOKEN can't push to https://github.com/$ORIGIN_SLUG.git" + fi +} + +function setup_git_author() { + GIT_AUTHOR_NAME="$(git show -s --format="%aN" "$TRAVIS_COMMIT")" + GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "$TRAVIS_COMMIT")" + GIT_COMMITTER_NAME="$(git show -s --format="%cN" "$TRAVIS_COMMIT")" + GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "$TRAVIS_COMMIT")" + + export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL +} + +function message() { + echo "Node: $TRAVIS_COMMIT_MESSAGE" +} + +function pr_payload() { + local escaped_message + IFS=' ' read -ra escaped_message <<< "$TRAVIS_COMMIT_MESSAGE" + escaped_message="$(printf '%q ' "${escaped_message[@]}")" + echo '{ + "title": "Node: '"$escaped_message"'", + "body": "Commit: nodejs/docker-node@'"$TRAVIS_COMMIT"'", + "head": "'"$GITHUB_USERNAME"':'"$BRANCH_NAME"'", + "base": "master" + }' +} + +if updated; then + + permission_check + + # Set Git User Info + setup_git_author + + info "Cloning..." + git clone --depth 50 https://github.com/docker-library/official-images.git $gitpath 2> /dev/null + + ./generate-stackbrew-library.sh > "$gitpath/$IMAGES_FILE" + + cd $gitpath + + git checkout -b "$BRANCH_NAME" + git add "$IMAGES_FILE" + git commit -m "$(message)" + + info "Pushing..." + git push "https://$GITHUB_API_TOKEN:x-oauth-basic@github.com/$ORIGIN_SLUG.git" -f "$BRANCH_NAME" 2> /dev/null || fatal "Error pushing the updated stackbrew" + + info "Creating Pull request" + response_payload="$(curl -H "Authorization: token $GITHUB_API_TOKEN" \ + -s \ + -X POST \ + -d "$(pr_payload)" \ + "https://api.github.com/repos/$UPSTREAM_SLUG/pulls")" + + url="$(echo "$response_payload" | jq .html_url)" + if [ "$url" != "null" ]; then + info "Pull request created at $url" + else + error_message=$(echo "$response_payload" | jq .message) + fatal "Error creating pull request ($error_message)" + fi +else + info "No change!" +fi diff --git a/travis.yml.template b/travis.yml.template index 394fce79da..806862961d 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -16,7 +16,7 @@ stages: - Test - Build - name: Deploy - if: branch = master + if: branch = master AND type IN (push) jobs: include: @@ -42,6 +42,6 @@ jobs: - shellcheck - stage: Deploy - script: ./generate-stackbrew-library.sh + script: ./generate-stackbrew-pr.sh # Docker Build # From 11f3cab3a3804720b56394d6bd7434a3255b32de Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 4 Apr 2018 08:17:31 -0400 Subject: [PATCH 058/818] Added the secured variable --- .travis.yml | 4 +++- travis.yml.template | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5779ea350c..6cff24bcb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ stages: - Test - Build - name: Deploy - if: branch = master AND type IN (push) + if: branch = build-test AND type IN (push) jobs: include: @@ -45,6 +45,8 @@ jobs: - stage: Deploy script: ./generate-stackbrew-pr.sh + env: + secure: "HkgYgawkr/hkg2vURHGOb/JmF6U1e71QQsd0HXJ1UJh6WBiFJOrjomCMHZGHnpyopdRna++up8dISBqM2X+EiLAr9yWdRXy72oMP9X42M0ccnja/3E5KYYXMkETS50JnUhMCOt2xRZW5/ojqrHukqRo0YIjIu+P0U0VsZ4QIsng=" # Docker Build # - stage: Build diff --git a/travis.yml.template b/travis.yml.template index 806862961d..4b0447afd2 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -16,7 +16,7 @@ stages: - Test - Build - name: Deploy - if: branch = master AND type IN (push) + if: branch = build-test AND type IN (push) jobs: include: @@ -43,5 +43,7 @@ jobs: - stage: Deploy script: ./generate-stackbrew-pr.sh + env: + secure: "HkgYgawkr/hkg2vURHGOb/JmF6U1e71QQsd0HXJ1UJh6WBiFJOrjomCMHZGHnpyopdRna++up8dISBqM2X+EiLAr9yWdRXy72oMP9X42M0ccnja/3E5KYYXMkETS50JnUhMCOt2xRZW5/ojqrHukqRo0YIjIu+P0U0VsZ4QIsng=" # Docker Build # From 7877ff66c39eb99ee7786846d2eee65c2969a5ff Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 5 Apr 2018 09:16:15 -0400 Subject: [PATCH 059/818] Switched TRavis to container based infrastructure --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5dc73074bc..f949732195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ #### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### dist: trusty -sudo: required +sudo: false language: generic diff --git a/travis.yml.template b/travis.yml.template index 4aecb7a528..69afd9f925 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -1,5 +1,5 @@ dist: trusty -sudo: required +sudo: false language: generic From d9db6792fd72f1cda4306e868ef6841abb9af081 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 5 Apr 2018 10:15:42 -0400 Subject: [PATCH 060/818] Added multiple CPU docker build --- test-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-build.sh b/test-build.sh index e2e36f70e5..240c191ce0 100755 --- a/test-build.sh +++ b/test-build.sh @@ -32,7 +32,7 @@ function build () { info "Building $full_tag..." - if ! docker build -t node:"$full_tag" "$path"; then + if ! docker build --cpuset-cpus="0,1" -t node:"$full_tag" "$path"; then fatal "Build of $full_tag failed!" fi info "Build of $full_tag succeeded." From 364fba4b39716d5ca867cba4fccca66eb5dce4ad Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Sun, 8 Apr 2018 23:11:17 -0400 Subject: [PATCH 061/818] Modified the stackbrew pr script to enable running it manually --- generate-stackbrew-pr.sh | 58 +++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index d7c55abf6d..d3bfd09f76 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -2,20 +2,32 @@ set -e . functions.sh -GITHUB_USERNAME="nodejs-github-bot" -gitpath="../docker-images" +if [ -z "$1" ]; then + COMMIT_ID="$TRAVIS_COMMIT" + COMMIT_MESSAGE="$TRAVIS_COMMIT_MESSAGE" + BRANCH_NAME="travis-$TRAVIS_BUILD_ID" + GITHUB_USERNAME="nodejs-github-bot" +else + COMMIT_ID="$1" + COMMIT_MESSAGE="$(git show -s --format=%B "$1")" + BRANCH_NAME="travis-$(date +%s)" + if [[ "$(git remote get-url origin)" =~ github.com/([^/]*)/docker-node.git ]]; then + GITHUB_USERNAME="${BASH_REMATCH[1]}" + fi +fi + IMAGES_FILE="library/node" REPO_NAME="official-images" -BRANCH_NAME="travis-$TRAVIS_BUILD_ID" ORIGIN_SLUG="$GITHUB_USERNAME/$REPO_NAME" UPSTREAM_SLUG="docker-library/$REPO_NAME" +gitpath="$REPO_NAME" function updated() { local versions local images_changed IFS=' ' read -ra versions <<< "$(IFS=','; get_versions)" - images_changed=$(git show --name-only "$TRAVIS_COMMIT" "${versions[@]}") + images_changed=$(git show --name-only "$COMMIT_ID" "${versions[@]}") if [ -z "$images_changed" ]; then return 1 @@ -24,15 +36,24 @@ function updated() { fi } +function auth_header() { + echo "Authorization: token $GITHUB_API_TOKEN" +} + function permission_check() { - auth="$(curl -H "Authorization: token $GITHUB_API_TOKEN" \ + if [ -z "$GITHUB_API_TOKEN" ]; then + fatal "Environment variable \$GITHUB_API_TOKEN is missing or empty" + fi + + auth="$(curl -H "$(auth_header)" \ -s \ "https://api.github.com")" + if [ "$(echo "$auth" | jq .message)" = "\"Bad credentials\"" ]; then fatal "Authentication Failed! Invalid \$GITHUB_API_TOKEN" fi - auth="$(curl -H "Authorization: token $GITHUB_API_TOKEN" \ + auth="$(curl -H "$(auth_header)" \ -s \ "https://api.github.com/repos/$ORIGIN_SLUG/collaborators/$GITHUB_USERNAME/permission")" if [ "$(echo "$auth" | jq .message)" != "null" ]; then @@ -41,25 +62,25 @@ function permission_check() { } function setup_git_author() { - GIT_AUTHOR_NAME="$(git show -s --format="%aN" "$TRAVIS_COMMIT")" - GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "$TRAVIS_COMMIT")" - GIT_COMMITTER_NAME="$(git show -s --format="%cN" "$TRAVIS_COMMIT")" - GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "$TRAVIS_COMMIT")" + GIT_AUTHOR_NAME="$(git show -s --format="%aN" "$COMMIT_ID")" + GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "$COMMIT_ID")" + GIT_COMMITTER_NAME="$(git show -s --format="%cN" "$COMMIT_ID")" + GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "$COMMIT_ID")" export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL } function message() { - echo "Node: $TRAVIS_COMMIT_MESSAGE" + echo "Node: $COMMIT_MESSAGE" } function pr_payload() { local escaped_message - IFS=' ' read -ra escaped_message <<< "$TRAVIS_COMMIT_MESSAGE" + IFS=' ' read -ra escaped_message <<< "$COMMIT_MESSAGE" escaped_message="$(printf '%q ' "${escaped_message[@]}")" echo '{ "title": "Node: '"$escaped_message"'", - "body": "Commit: nodejs/docker-node@'"$TRAVIS_COMMIT"'", + "body": "Commit: nodejs/docker-node@'"$COMMIT_ID"'", "head": "'"$GITHUB_USERNAME"':'"$BRANCH_NAME"'", "base": "master" }' @@ -73,12 +94,13 @@ if updated; then setup_git_author info "Cloning..." - git clone --depth 50 https://github.com/docker-library/official-images.git $gitpath 2> /dev/null + git clone --depth 50 "https://github.com/$UPSTREAM_SLUG.git" $gitpath 2> /dev/null - ./generate-stackbrew-library.sh > "$gitpath/$IMAGES_FILE" + stackbrew="$(./generate-stackbrew-library.sh)" cd $gitpath + echo "$stackbrew" > "$IMAGES_FILE" git checkout -b "$BRANCH_NAME" git add "$IMAGES_FILE" git commit -m "$(message)" @@ -87,17 +109,17 @@ if updated; then git push "https://$GITHUB_API_TOKEN:x-oauth-basic@github.com/$ORIGIN_SLUG.git" -f "$BRANCH_NAME" 2> /dev/null || fatal "Error pushing the updated stackbrew" info "Creating Pull request" - response_payload="$(curl -H "Authorization: token $GITHUB_API_TOKEN" \ + pr_response_payload="$(curl -H "$(auth_header)" \ -s \ -X POST \ -d "$(pr_payload)" \ "https://api.github.com/repos/$UPSTREAM_SLUG/pulls")" - url="$(echo "$response_payload" | jq .html_url)" + url="$(echo "$pr_response_payload" | jq .html_url)" if [ "$url" != "null" ]; then info "Pull request created at $url" else - error_message=$(echo "$response_payload" | jq .message) + error_message=$(echo "$pr_response_payload" | jq .message) fatal "Error creating pull request ($error_message)" fi else From 3f5fd506b2c272c2c4a328515925a7bdc71eed0b Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 11 Apr 2018 13:25:34 -0400 Subject: [PATCH 062/818] Add a commit comment when creating an upstream PR via script --- generate-stackbrew-pr.sh | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index d3bfd09f76..097dc06b4e 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -20,6 +20,7 @@ IMAGES_FILE="library/node" REPO_NAME="official-images" ORIGIN_SLUG="$GITHUB_USERNAME/$REPO_NAME" UPSTREAM_SLUG="docker-library/$REPO_NAME" +DOCKER_SLUG="nodejs/docker-node" gitpath="$REPO_NAME" function updated() { @@ -86,6 +87,14 @@ function pr_payload() { }' } +function comment_payload() { + local pr_url + pr_url="$1" + echo '{ + "body": "Created PR to the '"$REPO_NAME"' repo ('"$pr_url"')" + }' +} + if updated; then permission_check @@ -108,6 +117,8 @@ if updated; then info "Pushing..." git push "https://$GITHUB_API_TOKEN:x-oauth-basic@github.com/$ORIGIN_SLUG.git" -f "$BRANCH_NAME" 2> /dev/null || fatal "Error pushing the updated stackbrew" + cd - && rm -rf $gitpath + info "Creating Pull request" pr_response_payload="$(curl -H "$(auth_header)" \ -s \ @@ -115,9 +126,23 @@ if updated; then -d "$(pr_payload)" \ "https://api.github.com/repos/$UPSTREAM_SLUG/pulls")" - url="$(echo "$pr_response_payload" | jq .html_url)" + url="$(echo "$pr_response_payload" | jq -r .html_url)" if [ "$url" != "null" ]; then info "Pull request created at $url" + + info "Creating Commit Comment" + commit_response_payload="$(curl -H "$(auth_header)" \ + -s \ + -X POST \ + -d "$(comment_payload "$url")" \ + "https://api.github.com/repos/$DOCKER_SLUG/commits/$COMMIT_ID/comments")" + + if [ "$(echo "$commit_response_payload" | jq .message)" != "null" ]; then + fatal "Error linking the pull request ($error_message)" + else + comment_url="$(echo "$commit_response_payload" | jq -r .html_url)" + info "Created comment at $comment_url" + fi else error_message=$(echo "$pr_response_payload" | jq .message) fatal "Error creating pull request ($error_message)" From 22ec85d15fc0e0c48a49bf4cb58f8cc8391ebe23 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 12 Apr 2018 11:25:22 -0400 Subject: [PATCH 063/818] Added better support for the automated stackbrew script on PR merges --- generate-stackbrew-pr.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 097dc06b4e..d7bd8bc96b 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -16,6 +16,13 @@ else fi fi +if [[ "$COMMIT_MESSAGE" =~ Merge\ pull\ request\ \#([0-9]*) ]]; then + + # This is a merge from a pull request + PR_NUMBER="${BASH_REMATCH[1]}" + COMMIT_MESSAGE="$(printf "%s" "$COMMIT_MESSAGE" | tail -n 1)" +fi + IMAGES_FILE="library/node" REPO_NAME="official-images" ORIGIN_SLUG="$GITHUB_USERNAME/$REPO_NAME" @@ -130,12 +137,18 @@ if updated; then if [ "$url" != "null" ]; then info "Pull request created at $url" + if [ ! -z "$PR_NUMBER" ]; then + comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/issues/$PR_NUMBER/comments" + else + comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/commits/$COMMIT_ID/comments" + fi + info "Creating Commit Comment" commit_response_payload="$(curl -H "$(auth_header)" \ -s \ -X POST \ -d "$(comment_payload "$url")" \ - "https://api.github.com/repos/$DOCKER_SLUG/commits/$COMMIT_ID/comments")" + "$comment_endpoint")" if [ "$(echo "$commit_response_payload" | jq .message)" != "null" ]; then fatal "Error linking the pull request ($error_message)" From a3e869bad16096a2ec4f06c6a77a8a9ccd5973b2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Apr 2018 05:57:23 +0800 Subject: [PATCH 064/818] Remove manual ShellCheck installation on Travis CI (#697) Travis CI started to provide ShellCheck directly for a while, we can save both time and resources to manually install it now! --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d90a7ca6b..29110a624e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,12 +36,6 @@ jobs: env: - TEST: Shell Check script: shellcheck *.sh - addons: - apt: - sources: - - debian-sid - packages: - - shellcheck - stage: Deploy script: ./generate-stackbrew-pr.sh From 7d444c7cb8a11c7a61cf29392b15ddd7eb5f0dc3 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Apr 2018 11:24:15 +0800 Subject: [PATCH 065/818] Update update.sh, use Alpine v3.7 for node.js >= v10 --- update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index d23d9df021..53d5d3dafd 100755 --- a/update.sh +++ b/update.sh @@ -45,7 +45,10 @@ function update_node_version { sed -E -i.bak 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "$dockerfile" && rm "$dockerfile".bak sed -E -i.bak 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"$version.${fullVersion:-0}"'/' "$dockerfile" && rm "$dockerfile".bak sed -E -i.bak 's/^(ENV YARN_VERSION ).*/\1'"$yarnVersion"'/' "$dockerfile" && rm "$dockerfile".bak - if [[ "${version/.*/}" -ge 8 || "$arch" = "ppc64le" || "$arch" = "s390x" || "$arch" = "arm64" || "$arch" = "arm32v7" ]]; then + if [[ "${version/.*/}" -ge 10 ]]; then + sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.7/' "$dockerfile" + rm "$dockerfile.bak" + elif [[ "${version/.*/}" -ge 8 || "$arch" = "ppc64le" || "$arch" = "s390x" || "$arch" = "arm64" || "$arch" = "arm32v7" ]]; then sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.6/' "$dockerfile" rm "$dockerfile.bak" fi From 132d8ef8c12eda103714ab62c5128d1116652582 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Apr 2018 11:25:29 +0800 Subject: [PATCH 066/818] Update travis.yml.template, remove manual ShellCheck installation cc #697 --- travis.yml.template | 6 ------ 1 file changed, 6 deletions(-) diff --git a/travis.yml.template b/travis.yml.template index 6c24e99852..6d86cafb41 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -34,12 +34,6 @@ jobs: env: - TEST: Shell Check script: shellcheck *.sh - addons: - apt: - sources: - - debian-sid - packages: - - shellcheck - stage: Deploy script: ./generate-stackbrew-pr.sh From 80814e984e9faa5e9195f9a61632e1898f6633d9 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Apr 2018 03:42:35 +0800 Subject: [PATCH 067/818] [New version] Add node.js v10.0.0 with Yarn v1.6.0 --- .travis.yml | 30 +++++++++++++++++++ 10/Dockerfile | 62 +++++++++++++++++++++++++++++++++++++++ 10/alpine/Dockerfile | 68 +++++++++++++++++++++++++++++++++++++++++++ 10/slim/Dockerfile | 67 ++++++++++++++++++++++++++++++++++++++++++ 10/stretch/Dockerfile | 62 +++++++++++++++++++++++++++++++++++++++ 10/wheezy/Dockerfile | 58 ++++++++++++++++++++++++++++++++++++ 6 files changed, 347 insertions(+) create mode 100644 10/Dockerfile create mode 100644 10/alpine/Dockerfile create mode 100644 10/slim/Dockerfile create mode 100644 10/stretch/Dockerfile create mode 100644 10/wheezy/Dockerfile diff --git a/.travis.yml b/.travis.yml index 29110a624e..bbe05134b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,36 @@ jobs: secure: "HkgYgawkr/hkg2vURHGOb/JmF6U1e71QQsd0HXJ1UJh6WBiFJOrjomCMHZGHnpyopdRna++up8dISBqM2X+EiLAr9yWdRXy72oMP9X42M0ccnja/3E5KYYXMkETS50JnUhMCOt2xRZW5/ojqrHukqRo0YIjIu+P0U0VsZ4QIsng=" # Docker Build # + - stage: Build + env: + - NODE_VERSION: "10" + - VARIANT: "default" + + - stage: Build + env: + - NODE_VERSION: "10" + - VARIANT: "alpine" + + - stage: Build + env: + - NODE_VERSION: "10" + - VARIANT: "onbuild" + + - stage: Build + env: + - NODE_VERSION: "10" + - VARIANT: "slim" + + - stage: Build + env: + - NODE_VERSION: "10" + - VARIANT: "stretch" + + - stage: Build + env: + - NODE_VERSION: "10" + - VARIANT: "wheezy" + - stage: Build env: - NODE_VERSION: "4" diff --git a/10/Dockerfile b/10/Dockerfile new file mode 100644 index 0000000000..8520834b80 --- /dev/null +++ b/10/Dockerfile @@ -0,0 +1,62 @@ +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 +RUN set -ex \ + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + ; 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 10.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.6.0 + +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" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile new file mode 100644 index 0000000000..6b470a5572 --- /dev/null +++ b/10/alpine/Dockerfile @@ -0,0 +1,68 @@ +FROM alpine:3.7 + +ENV NODE_VERSION 10.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + binutils-gold \ + curl \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-team + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + ; 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 \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ + && apk del .build-deps \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + +ENV YARN_VERSION 1.6.0 + +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" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +CMD [ "node" ] diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile new file mode 100644 index 0000000000..9bb00e621e --- /dev/null +++ b/10/slim/Dockerfile @@ -0,0 +1,67 @@ +FROM buildpack-deps:jessie-curl + +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 \ + ; 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 10.0.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -x \ + && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.6.0 + +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" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile new file mode 100644 index 0000000000..37f0f7e814 --- /dev/null +++ b/10/stretch/Dockerfile @@ -0,0 +1,62 @@ +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 \ + ; 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 10.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.6.0 + +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" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/10/wheezy/Dockerfile b/10/wheezy/Dockerfile new file mode 100644 index 0000000000..b3c3b13836 --- /dev/null +++ b/10/wheezy/Dockerfile @@ -0,0 +1,58 @@ +FROM buildpack-deps:wheezy + +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 \ + ; 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 10.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.6.0 + +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" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] From eca9e8f34ca78bdba691e1d5ead82840e2673705 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Apr 2018 16:30:35 +0800 Subject: [PATCH 068/818] Update chakracore v8.10.0 to v8.11.1 w/ Yarn 1.6.0 --- chakracore/8/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index b15e93684c..b824a26b16 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/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 -ENV NODE_VERSION 8.10.0 +ENV NODE_VERSION 8.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ From f713f15abe3ff05635326ba9716b7755c9d5f1aa Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Apr 2018 16:31:02 +0800 Subject: [PATCH 069/818] [New version] Add node.js chakracore v10.0.0 w/ Yarn v1.6.0 --- .travis.yml | 5 +++++ chakracore/10/Dockerfile | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 chakracore/10/Dockerfile diff --git a/.travis.yml b/.travis.yml index bbe05134b9..04a0b8945a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -193,6 +193,11 @@ jobs: - NODE_VERSION: "9" - VARIANT: "wheezy" + - stage: Build + env: + - NODE_VERSION: "chakracore/10" + - VARIANT: "default" + - stage: Build env: - NODE_VERSION: "chakracore/8" diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile new file mode 100644 index 0000000000..c18b08bbc9 --- /dev/null +++ b/chakracore/10/Dockerfile @@ -0,0 +1,39 @@ +FROM buildpack-deps:jessie + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 10.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && curl -SLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -SLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.6.0 + +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" ; \ + done \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] From b7ce08bb6df848c848bde911ccd693ec5f583bc4 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 26 Apr 2018 03:56:19 -0400 Subject: [PATCH 070/818] Fixed the stackbrew PR not being created on master --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04a0b8945a..28c7f42c42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ stages: - Test - Build - name: Deploy - if: branch = build-test AND type IN (push) + if: branch = master AND type IN (push) jobs: include: diff --git a/travis.yml.template b/travis.yml.template index 6d86cafb41..d1d087cbbc 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -16,7 +16,7 @@ stages: - Test - Build - name: Deploy - if: branch = build-test AND type IN (push) + if: branch = master AND type IN (push) jobs: include: From 61f0d675fcba56f0d0a02f280ecd72926a3f97b5 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 26 Apr 2018 11:30:29 -0400 Subject: [PATCH 071/818] Finish the removal of onbuild for node 10 --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04a0b8945a..2d43afdd66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,11 +53,6 @@ jobs: - NODE_VERSION: "10" - VARIANT: "alpine" - - stage: Build - env: - - NODE_VERSION: "10" - - VARIANT: "onbuild" - - stage: Build env: - NODE_VERSION: "10" From c3baf8491ef0967ac32ee7b20afc66a32e2c4c73 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 28 Apr 2018 08:46:35 +0200 Subject: [PATCH 072/818] fix node 10 tags (#705) --- generate-stackbrew-library.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index f892cf0021..8c75720ff6 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -12,9 +12,13 @@ array_6='6 boron'; # shellcheck disable=SC2034 array_8='8 carbon'; # shellcheck disable=SC2034 -array_9='9 latest'; +array_9='9'; # shellcheck disable=SC2034 -array_chakracore_8='chakracore-8 chakracore'; +array_10='10 latest'; +# shellcheck disable=SC2034 +array_chakracore_8='chakracore-8'; +# shellcheck disable=SC2034 +array_chakracore_10='chakracore-10 chakracore'; cd "$(cd "${0%/*}" && pwd -P)"; From 3c442887867d89b4c816cda9a7d7f84dc11a65bd Mon Sep 17 00:00:00 2001 From: Janeene Beeforth Date: Mon, 30 Apr 2018 20:23:03 +1000 Subject: [PATCH 073/818] Update "Upgrading/downgrading Yarn" guide in BestPractices doc (#708) Update documentation on installing a custom yarn version to specify that the /usr/local/bin/yarn* links need updating. --- docs/BestPractices.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index d77f37cb21..f543d8e5f7 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -40,7 +40,8 @@ ENV YARN_VERSION 1.5.1 RUN curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -snf /opt/yarn-v$YARN_VERSION /opt/yarn \ + && ln -snf /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -snf /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz ``` From 36135d58af893b99c4b95517deb499eb34afc7cc Mon Sep 17 00:00:00 2001 From: Seth Westphal Date: Mon, 30 Apr 2018 09:26:41 -0500 Subject: [PATCH 074/818] Remove Node.js 4. --- .travis.yml | 30 ---------------- 4/Dockerfile | 62 -------------------------------- 4/alpine/Dockerfile | 68 ----------------------------------- 4/architectures | 6 ---- 4/onbuild/Dockerfile | 12 ------- 4/slim/Dockerfile | 67 ---------------------------------- 4/stretch/Dockerfile | 62 -------------------------------- 4/wheezy/Dockerfile | 58 ------------------------------ README.md | 4 +-- functions.sh | 2 +- generate-stackbrew-library.sh | 2 -- test-build.sh | 4 +-- 12 files changed, 5 insertions(+), 372 deletions(-) delete mode 100644 4/Dockerfile delete mode 100644 4/alpine/Dockerfile delete mode 100644 4/architectures delete mode 100644 4/onbuild/Dockerfile delete mode 100644 4/slim/Dockerfile delete mode 100644 4/stretch/Dockerfile delete mode 100644 4/wheezy/Dockerfile diff --git a/.travis.yml b/.travis.yml index 71adcb4f6b..7901fcc0c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,36 +68,6 @@ jobs: - NODE_VERSION: "10" - VARIANT: "wheezy" - - stage: Build - env: - - NODE_VERSION: "4" - - VARIANT: "default" - - - stage: Build - env: - - NODE_VERSION: "4" - - VARIANT: "alpine" - - - stage: Build - env: - - NODE_VERSION: "4" - - VARIANT: "onbuild" - - - stage: Build - env: - - NODE_VERSION: "4" - - VARIANT: "slim" - - - stage: Build - env: - - NODE_VERSION: "4" - - VARIANT: "stretch" - - - stage: Build - env: - - NODE_VERSION: "4" - - VARIANT: "wheezy" - - stage: Build env: - NODE_VERSION: "6" diff --git a/4/Dockerfile b/4/Dockerfile deleted file mode 100644 index c4bceeb670..0000000000 --- a/4/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -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 -RUN set -ex \ - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - ; 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 4.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.5.1 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile deleted file mode 100644 index 630feaf3f0..0000000000 --- a/4/alpine/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM alpine:3.4 - -ENV NODE_VERSION 4.9.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - binutils-gold \ - curl \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-team - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - ; 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 \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && make install \ - && apk del .build-deps \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt - -ENV YARN_VERSION 1.5.1 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -CMD [ "node" ] diff --git a/4/architectures b/4/architectures deleted file mode 100644 index c892e4f2c4..0000000000 --- a/4/architectures +++ /dev/null @@ -1,6 +0,0 @@ -bashbrew-arch variants -amd64 default,alpine,onbuild,slim,stretch,wheezy -ppc64le default,onbuild,slim,stretch -arm64v8 default,onbuild,slim,stretch -arm32v7 default,onbuild,slim,stretch -i386 default,onbuild,slim,stretch diff --git a/4/onbuild/Dockerfile b/4/onbuild/Dockerfile deleted file mode 100644 index e0e3cdd690..0000000000 --- a/4/onbuild/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:4.9.1 - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD ARG NODE_ENV -ONBUILD ENV NODE_ENV $NODE_ENV -ONBUILD COPY package.json /usr/src/app/ -ONBUILD RUN npm install && npm cache clean --force -ONBUILD COPY . /usr/src/app - -CMD [ "npm", "start" ] diff --git a/4/slim/Dockerfile b/4/slim/Dockerfile deleted file mode 100644 index 0a8329b7d0..0000000000 --- a/4/slim/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM buildpack-deps:jessie-curl - -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 \ - ; 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 4.9.1 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.5.1 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/4/stretch/Dockerfile b/4/stretch/Dockerfile deleted file mode 100644 index f6ac153716..0000000000 --- a/4/stretch/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -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 \ - ; 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 4.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.5.1 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/4/wheezy/Dockerfile b/4/wheezy/Dockerfile deleted file mode 100644 index de3d1a80a6..0000000000 --- a/4/wheezy/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -FROM buildpack-deps:wheezy - -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 \ - ; 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 4.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.5.1 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/README.md b/README.md index d9d7e0f4e2..7e60ad11d2 100644 --- a/README.md +++ b/README.md @@ -99,12 +99,12 @@ complete `Dockerfile`. In such cases, you can run a Node.js script by using the Node.js Docker image directly: ```console -$ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app -w /usr/src/app node:4 node your-daemon-or-script.js +$ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app -w /usr/src/app node:8 node your-daemon-or-script.js ``` ## Verbosity -Prior to 8.7.0, 6.11.4 and 4.8.4 the docker images overrode the default npm log +Prior to 8.7.0 and 6.11.4 the docker images overrode the default npm log level from `warn` to `info`. However due to improvements to npm and new Docker patterns (e.g. multi-stage builds) the working group reached a [consensus](https://github.com/nodejs/docker-node/issues/528) to revert the log level to npm defaults. If you need more verbose output, please diff --git a/functions.sh b/functions.sh index f2e1ae8689..86eb306212 100755 --- a/functions.sh +++ b/functions.sh @@ -132,7 +132,7 @@ function get_config () { # Get available versions for a given path # # If full or partial versions are provided then they are processed and -# validated. e.g. "4 chakracore" returns "4 chakracore/8" since it processed the +# validated. e.g. "6 chakracore" returns "6 chakracore/8" since it processed the # chakracore entry and found it to be a fork rather than a complete version. # # The result is a list of valid versions. diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 8c75720ff6..a5609fa120 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -6,8 +6,6 @@ hash git 2>/dev/null || { echo >&2 "git not found, exiting."; } # Used dynamically: print "$array_" $1 # shellcheck disable=SC2034 -array_4='4 argon'; -# shellcheck disable=SC2034 array_6='6 boron'; # shellcheck disable=SC2034 array_8='8 carbon'; diff --git a/test-build.sh b/test-build.sh index 240c191ce0..c03607f19b 100755 --- a/test-build.sh +++ b/test-build.sh @@ -7,8 +7,8 @@ set -uo pipefail . functions.sh # Convert comma delimited cli arguments to arrays -# E.g. ./test-build.sh 4,6 slim,onbuild -# "4,6" becomes "4 6" and "slim,onbuild" becomes "slim onbuild" +# E.g. ./test-build.sh 8,10 slim,onbuild +# "8,10" becomes "8 10" and "slim,onbuild" becomes "slim onbuild" IFS=',' read -ra versions_arg <<< "${1:-}" IFS=',' read -ra variant_arg <<< "${2:-}" From bb49c321f761c333ba87b18770121651f0a3004c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 1 May 2018 01:50:19 +0800 Subject: [PATCH 075/818] Update node.js v6.x to 6.14.2 with Yarn v1.6.0 --- 6/Dockerfile | 4 ++-- 6/alpine/Dockerfile | 4 ++-- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 4 ++-- 6/stretch/Dockerfile | 4 ++-- 6/wheezy/Dockerfile | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index 15b51ea2ab..f0b9d526ad 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.1 +ENV NODE_VERSION 6.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 0a433bdd99..cade2af485 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.14.1 +ENV NODE_VERSION 6.14.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 428910a7b9..175902050b 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.14.1 +FROM node:6.14.2 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 3ad5aa64eb..b88edcceaa 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.1 +ENV NODE_VERSION 6.14.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 5192ca212a..75e627e8e1 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.1 +ENV NODE_VERSION 6.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile index 232ca18619..544277e612 100644 --- a/6/wheezy/Dockerfile +++ b/6/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.1 +ENV NODE_VERSION 6.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -36,7 +36,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ From 16282e9e30793fad57d42d9c6ab31fb3ac1fa1da Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 30 Apr 2018 21:22:43 -0400 Subject: [PATCH 076/818] Improved the change detection logic for the stackbre PR script --- generate-stackbrew-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index d7bd8bc96b..2566b13f68 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -35,7 +35,7 @@ function updated() { local images_changed IFS=' ' read -ra versions <<< "$(IFS=','; get_versions)" - images_changed=$(git show --name-only "$COMMIT_ID" "${versions[@]}") + images_changed=$(git diff --name-only "$COMMIT_ID".."$COMMIT_ID"~1 "${versions[@]}") if [ -z "$images_changed" ]; then return 1 From 9e436c3176a26d7758daaa565486bc45f1608882 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 7 May 2018 22:39:08 -0400 Subject: [PATCH 077/818] Insert GPG keys on update --- Dockerfile-alpine.template | 11 ++--------- Dockerfile-slim.template | 11 ++--------- Dockerfile-stretch.template | 11 ++--------- Dockerfile-wheezy.template | 11 ++--------- Dockerfile.template | 11 ++--------- keys/node.keys | 8 ++++++++ keys/yarn.keys | 1 + update.sh | 16 ++++++++++++++++ 8 files changed, 35 insertions(+), 45 deletions(-) create mode 100644 keys/node.keys create mode 100644 keys/yarn.keys diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 98d92c7b34..a96ebf9c65 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -18,14 +18,7 @@ RUN addgroup -g 1000 node \ python \ # gpg keys listed at https://github.com/nodejs/node#release-team && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + "${NODE_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ @@ -49,7 +42,7 @@ ENV YARN_VERSION 0.0.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ + "${YARN_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 437c541fc7..c65f224659 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -6,14 +6,7 @@ RUN groupadd --gid 1000 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 \ + "${NODE_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ @@ -49,7 +42,7 @@ ENV YARN_VERSION 0.0.0 RUN set -ex \ && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ + "${YARN_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 398e34a28e..54034a44f0 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -6,14 +6,7 @@ RUN groupadd --gid 1000 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 \ + "${NODE_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ @@ -44,7 +37,7 @@ ENV YARN_VERSION 0.0.0 RUN set -ex \ && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ + "${YARN_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index f7b487427a..6ff8fe0657 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -6,14 +6,7 @@ RUN groupadd --gid 1000 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 \ + "${NODE_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ @@ -40,7 +33,7 @@ ENV YARN_VERSION 0.0.0 RUN set -ex \ && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ + "${YARN_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/Dockerfile.template b/Dockerfile.template index e498f07d5d..689b80a515 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -6,14 +6,7 @@ RUN groupadd --gid 1000 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 \ + "${NODE_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ @@ -44,7 +37,7 @@ ENV YARN_VERSION 0.0.0 RUN set -ex \ && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ + "${YARN_KEYS[@]}" ; do \ gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ diff --git a/keys/node.keys b/keys/node.keys new file mode 100644 index 0000000000..cf989eca57 --- /dev/null +++ b/keys/node.keys @@ -0,0 +1,8 @@ +94AE36675C464D64BAFA68DD7434390BDBE9B9C5 +FD3A5288F042B6850C66B31F09FE44734EB7990E +71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 +DD8F2338BAE7501E3DD5AC78C273792F7D83545D +C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 +B9AE9905FFD7803F25714661B63B535A4C206CA9 +56730D5401028683275BD23C23EFEFE93C4CFFFE +77984A986EBC2AA786BC0F66B01FBB92821C587A diff --git a/keys/yarn.keys b/keys/yarn.keys new file mode 100644 index 0000000000..6b0feed13c --- /dev/null +++ b/keys/yarn.keys @@ -0,0 +1 @@ +6A010C5166006599AA17F08146C2130DFD2497F5 diff --git a/update.sh b/update.sh index 53d5d3dafd..8252cae9f1 100755 --- a/update.sh +++ b/update.sh @@ -45,6 +45,22 @@ function update_node_version { sed -E -i.bak 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "$dockerfile" && rm "$dockerfile".bak sed -E -i.bak 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"$version.${fullVersion:-0}"'/' "$dockerfile" && rm "$dockerfile".bak sed -E -i.bak 's/^(ENV YARN_VERSION ).*/\1'"$yarnVersion"'/' "$dockerfile" && rm "$dockerfile".bak + + # shellcheck disable=SC1004 + new_line=' \\\ +' + + # Add GPG keys + for key_type in "node" "yarn" + do + while read -r line + do + pattern="\"\\$\\{$(echo "$key_type" | tr '[:lower:]' '[:upper:]')_KEYS\\[@\\]\\}\"" + sed -E -i.bak -e "s/([ \\t]*)($pattern)/\\1${line}${new_line}\\1\\2/" "$dockerfile" && rm "$dockerfile".bak + done < "keys/$key_type.keys" + sed -E -i.bak "/$pattern/d" "$dockerfile" && rm "$dockerfile".bak + done + if [[ "${version/.*/}" -ge 10 ]]; then sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.7/' "$dockerfile" rm "$dockerfile.bak" From 2ecc9e8579f519ae3d267b5b497b8c04d6c7040d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 9 May 2018 13:52:11 +0800 Subject: [PATCH 078/818] Update node.js v10.0.0 to v10.1.0 (#722) --- 10/Dockerfile | 2 +- 10/alpine/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 10/wheezy/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index 8520834b80..86733a5642 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.0.0 +ENV NODE_VERSION 10.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 6b470a5572..9b0205a3b3 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.0.0 +ENV NODE_VERSION 10.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 9bb00e621e..ccd8ece964 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.0.0 +ENV NODE_VERSION 10.1.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 37f0f7e814..e757e1446a 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.0.0 +ENV NODE_VERSION 10.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/wheezy/Dockerfile b/10/wheezy/Dockerfile index b3c3b13836..62d4223bf9 100644 --- a/10/wheezy/Dockerfile +++ b/10/wheezy/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.0.0 +ENV NODE_VERSION 10.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From bfc5832ca666f89a27473fbce642617e6a109302 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 9 May 2018 10:04:19 -0400 Subject: [PATCH 079/818] Fix the escaping of commit message in the stackbrew pr script Switch to using sed as a safer approach --- generate-stackbrew-pr.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 2566b13f68..52e62c9264 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -84,8 +84,7 @@ function message() { function pr_payload() { local escaped_message - IFS=' ' read -ra escaped_message <<< "$COMMIT_MESSAGE" - escaped_message="$(printf '%q ' "${escaped_message[@]}")" + escaped_message="$(echo "$COMMIT_MESSAGE" | sed -E -e "s/\"/\\\\\"/g")" echo '{ "title": "Node: '"$escaped_message"'", "body": "Commit: nodejs/docker-node@'"$COMMIT_ID"'", From 773be66016fd1ff4a860529a80af61277f75c7e2 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 1 Nov 2017 10:34:11 -0400 Subject: [PATCH 080/818] Drop wheezy variant Full support for wheezy ended on April 26, 2016. LTS support will drop in May 2018: https://wiki.debian.org/DebianReleases#Production_Releases We may want to wait until the LTS drop date. However, given the recent release of Stretch the timing seems appropriate to do it sooner. Also worth noting is that LTS is not supported by the Debian Security team but by volunteers and interested companies: https://wiki.debian.org/LTS --- .travis.yml | 21 -------------- 10/wheezy/Dockerfile | 58 -------------------------------------- 6/architectures | 2 +- 6/wheezy/Dockerfile | 58 -------------------------------------- 8/wheezy/Dockerfile | 58 -------------------------------------- 9/wheezy/Dockerfile | 58 -------------------------------------- Dockerfile-wheezy.template | 51 --------------------------------- architectures | 2 +- 8 files changed, 2 insertions(+), 306 deletions(-) delete mode 100644 10/wheezy/Dockerfile delete mode 100644 6/wheezy/Dockerfile delete mode 100644 8/wheezy/Dockerfile delete mode 100644 9/wheezy/Dockerfile delete mode 100644 Dockerfile-wheezy.template diff --git a/.travis.yml b/.travis.yml index 7901fcc0c5..18f169a470 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,11 +63,6 @@ jobs: - NODE_VERSION: "10" - VARIANT: "stretch" - - stage: Build - env: - - NODE_VERSION: "10" - - VARIANT: "wheezy" - - stage: Build env: - NODE_VERSION: "6" @@ -93,11 +88,6 @@ jobs: - NODE_VERSION: "6" - VARIANT: "stretch" - - stage: Build - env: - - NODE_VERSION: "6" - - VARIANT: "wheezy" - - stage: Build env: - NODE_VERSION: "8" @@ -123,11 +113,6 @@ jobs: - NODE_VERSION: "8" - VARIANT: "stretch" - - stage: Build - env: - - NODE_VERSION: "8" - - VARIANT: "wheezy" - - stage: Build env: - NODE_VERSION: "9" @@ -153,11 +138,6 @@ jobs: - NODE_VERSION: "9" - VARIANT: "stretch" - - stage: Build - env: - - NODE_VERSION: "9" - - VARIANT: "wheezy" - - stage: Build env: - NODE_VERSION: "chakracore/10" @@ -167,4 +147,3 @@ jobs: env: - NODE_VERSION: "chakracore/8" - VARIANT: "default" - diff --git a/10/wheezy/Dockerfile b/10/wheezy/Dockerfile deleted file mode 100644 index 62d4223bf9..0000000000 --- a/10/wheezy/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -FROM buildpack-deps:wheezy - -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 \ - ; 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 10.1.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.6.0 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/6/architectures b/6/architectures index f531c557d2..4af17c2a85 100644 --- a/6/architectures +++ b/6/architectures @@ -1,5 +1,5 @@ bashbrew-arch variants -amd64 default,alpine,onbuild,slim,stretch,wheezy +amd64 default,alpine,onbuild,slim,stretch ppc64le default,onbuild,slim,stretch s390x default,onbuild,slim,stretch arm64v8 default,onbuild,slim,stretch diff --git a/6/wheezy/Dockerfile b/6/wheezy/Dockerfile deleted file mode 100644 index 544277e612..0000000000 --- a/6/wheezy/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -FROM buildpack-deps:wheezy - -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 \ - ; 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 6.14.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.6.0 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/8/wheezy/Dockerfile b/8/wheezy/Dockerfile deleted file mode 100644 index eac6fba85a..0000000000 --- a/8/wheezy/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -FROM buildpack-deps:wheezy - -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 \ - ; 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.11.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.5.1 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/9/wheezy/Dockerfile b/9/wheezy/Dockerfile deleted file mode 100644 index 38527c72ec..0000000000 --- a/9/wheezy/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -FROM buildpack-deps:wheezy - -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 \ - ; 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 9.11.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.5.1 - -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" ; \ - done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template deleted file mode 100644 index 6ff8fe0657..0000000000 --- a/Dockerfile-wheezy.template +++ /dev/null @@ -1,51 +0,0 @@ -FROM buildpack-deps:wheezy - -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 \ - "${NODE_KEYS[@]}" - ; 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 0.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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 0.0.0 - -RUN set -ex \ - && for key in \ - "${YARN_KEYS[@]}" - ; 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 \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/architectures b/architectures index 4378f73d86..814e0c14fe 100644 --- a/architectures +++ b/architectures @@ -1,5 +1,5 @@ bashbrew-arch variants -amd64 default,alpine,onbuild,slim,stretch,wheezy +amd64 default,alpine,onbuild,slim,stretch ppc64le default,alpine,onbuild,slim,stretch s390x default,alpine,onbuild,slim,stretch arm64v8 default,alpine,onbuild,slim,stretch From 65b8d4dd384b5cfc17784194ff9ea704b04e1ce2 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 11 May 2018 11:45:51 -0400 Subject: [PATCH 081/818] Fixed the stackbrew PR causing invalid stackbrew library entries Clones the official-images repo in the parent repo instead of the current one to avoid the clone folder being picked up by the stackbrew-library script. --- generate-stackbrew-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 52e62c9264..14b43179bf 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -28,7 +28,7 @@ REPO_NAME="official-images" ORIGIN_SLUG="$GITHUB_USERNAME/$REPO_NAME" UPSTREAM_SLUG="docker-library/$REPO_NAME" DOCKER_SLUG="nodejs/docker-node" -gitpath="$REPO_NAME" +gitpath="../$REPO_NAME" function updated() { local versions From 0d0dcfd379dbcdaadd99b93e08e260e754e82697 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 14 May 2018 19:25:46 +0800 Subject: [PATCH 082/818] Add shfmt check on Travis CI --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7901fcc0c5..7ce03f7a95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,14 @@ jobs: doctoc --title='## Table of Contents' --github README.md && diff -q README.md README.md.tmp + - stage: Test + env: + - TEST: shfmt check + script: + - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt -i 2 -l -w -ci . + - git diff --color + - git diff --stat=220 --color --exit-code + - stage: Test env: - TEST: Shell Check From f384c2b6f19164bc89f7a579b92c417442c99c8c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 14 May 2018 19:29:13 +0800 Subject: [PATCH 083/818] Format shell scripts with shfmt -i 2 -ci -l -w -f --- functions.sh | 346 +++++++++++++++++----------------- generate-stackbrew-library.sh | 118 ++++++------ generate-stackbrew-pr.sh | 241 +++++++++++------------ test-build.sh | 23 ++- test-image.sh | 16 +- update.sh | 156 ++++++++------- 6 files changed, 456 insertions(+), 444 deletions(-) diff --git a/functions.sh b/functions.sh index 86eb306212..c54e847907 100755 --- a/functions.sh +++ b/functions.sh @@ -3,14 +3,14 @@ # Utlity functions info() { - printf "%s\\n" "$@" + printf "%s\\n" "$@" } fatal() { - printf "**********\\n" - printf "Fatal Error: %s\\n" "$@" - printf "**********\\n" - exit 1 + printf "**********\\n" + printf "Fatal Error: %s\\n" "$@" + printf "**********\\n" + exit 1 } # Get system architecture @@ -19,30 +19,30 @@ fatal() { # For crossing building, we need a way to specify the target # architecutre manually. function get_arch() { - local arch - case $(uname -m) in - x86_64) - arch="amd64" - ;; - ppc64le) - arch="ppc64le" - ;; - s390x) - arch="s390x" - ;; - aarch64) - arch="arm64" - ;; - armv7l) - arch="arm32v7" - ;; - *) - echo "$0 does not support architecture $arch ... aborting" - exit 1 - ;; - esac - - echo "$arch" + local arch + case $(uname -m) in + x86_64) + arch="amd64" + ;; + ppc64le) + arch="ppc64le" + ;; + s390x) + arch="s390x" + ;; + aarch64) + arch="arm64" + ;; + armv7l) + arch="arm32v7" + ;; + *) + echo "$0 does not support architecture $arch ... aborting" + exit 1 + ;; + esac + + echo "$arch" } # Get corresponding variants based on the architecture. @@ -51,34 +51,34 @@ function get_arch() { # ,... # ,... function get_variants() { - local dir - dir=${1:-.} - shift - - local arch - local availablevariants - local variantsfilter - local variants - - arch=$(get_arch) - variantsfilter=( "$@" ) - IFS=' ' read -ra availablevariants <<< "$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')" - - if [ ${#variantsfilter[@]} -gt 0 ]; then - for variant1 in "${availablevariants[@]}"; do - for variant2 in "${variantsfilter[@]}"; do - if [[ "$variant1" = "$variant2" ]]; then - variants+=("$variant1") - fi - done - done - - if [ ${#variants[@]} -gt 0 ]; then - echo "${variants[@]}" - fi - else - echo "${availablevariants[@]}" - fi + local dir + dir=${1:-.} + shift + + local arch + local availablevariants + local variantsfilter + local variants + + arch=$(get_arch) + variantsfilter=("$@") + IFS=' ' read -ra availablevariants <<<"$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')" + + if [ ${#variantsfilter[@]} -gt 0 ]; then + for variant1 in "${availablevariants[@]}"; do + for variant2 in "${variantsfilter[@]}"; do + if [[ "$variant1" == "$variant2" ]]; then + variants+=("$variant1") + fi + done + done + + if [ ${#variants[@]} -gt 0 ]; then + echo "${variants[@]}" + fi + else + echo "${availablevariants[@]}" + fi } # Get supported architectures for a specific version and variant @@ -88,45 +88,47 @@ function get_variants() { # default architectures. This will give us some benefits: # - a specific version may or may not support some architectures # - if there is no specialization for a version, just don't provide local architectures -function get_supported_arches () { - local version - local variant - local arches - local lines - local line - version="$1"; shift - variant="$1"; shift - - # Get default supported arches - lines=$( grep "$variant" "$(dirname "$version")"/architectures 2>/dev/null | cut -d' ' -f1 ) - - # Get version specific supported architectures if there is specialized information - if [ -a "$version"/architectures ]; then - lines=$( grep "$variant" "$version"/architectures 2>/dev/null | cut -d' ' -f1 ) - fi - - while IFS='' read -r line; do - arches+=( "$line" ) - done <<< "$lines" - - echo "${arches[@]}" +function get_supported_arches() { + local version + local variant + local arches + local lines + local line + version="$1" + shift + variant="$1" + shift + + # Get default supported arches + lines=$(grep "$variant" "$(dirname "$version")"/architectures 2>/dev/null | cut -d' ' -f1) + + # Get version specific supported architectures if there is specialized information + if [ -a "$version"/architectures ]; then + lines=$(grep "$variant" "$version"/architectures 2>/dev/null | cut -d' ' -f1) + fi + + while IFS='' read -r line; do + arches+=("$line") + done <<<"$lines" + + echo "${arches[@]}" } # Get configuration values from the config file # # The configuration entries are simple key/value pairs which are whitespace separated. -function get_config () { - local dir - dir=${1:-.} - shift - - local name - name=$1 - shift - - local value - value=$(grep "^$name" "$dir/config" | sed -E 's/'"$name"'[[:space:]]*//') - echo "$value" +function get_config() { + local dir + dir=${1:-.} + shift + + local name + name=$1 + shift + + local value + value=$(grep "^$name" "$dir/config" | sed -E 's/'"$name"'[[:space:]]*//') + echo "$value" } # Get available versions for a given path @@ -136,102 +138,104 @@ function get_config () { # chakracore entry and found it to be a fork rather than a complete version. # # The result is a list of valid versions. -function get_versions () { - local prefix - prefix=${1:-.} - shift - - local versions - local dirs=( "$@" ) - if [ ${#dirs[@]} -eq 0 ]; then - IFS=' ' read -ra dirs <<< "$(echo "${prefix%/}/"*/)" - fi - - for dir in "${dirs[@]}"; do - if [ -a "$dir/config" ]; then - local subdirs - IFS=' ' read -ra subdirs <<< "$(get_versions "${dir#./}")" - for subdir in "${subdirs[@]}"; do - versions+=( "$subdir" ) - done - elif [ -a "$dir/Dockerfile" ]; then - versions+=( "${dir#./}" ) - fi - done - - if [ ${#versions[@]} -gt 0 ]; then - echo "${versions[@]%/}" - fi +function get_versions() { + local prefix + prefix=${1:-.} + shift + + local versions + local dirs=("$@") + if [ ${#dirs[@]} -eq 0 ]; then + IFS=' ' read -ra dirs <<<"$(echo "${prefix%/}/"*/)" + fi + + for dir in "${dirs[@]}"; do + if [ -a "$dir/config" ]; then + local subdirs + IFS=' ' read -ra subdirs <<<"$(get_versions "${dir#./}")" + for subdir in "${subdirs[@]}"; do + versions+=("$subdir") + done + elif [ -a "$dir/Dockerfile" ]; then + versions+=("${dir#./}") + fi + done + + if [ ${#versions[@]} -gt 0 ]; then + echo "${versions[@]%/}" + fi } -function get_fork_name () { - local version - version=$1 - shift +function get_fork_name() { + local version + version=$1 + shift - IFS='/' read -ra versionparts <<< "$version" - if [ ${#versionparts[@]} -gt 1 ]; then - echo "${versionparts[0]}" - fi + IFS='/' read -ra versionparts <<<"$version" + if [ ${#versionparts[@]} -gt 1 ]; then + echo "${versionparts[0]}" + fi } -function get_full_version () { - local version - version=$1 - shift +function get_full_version() { + local version + version=$1 + shift - grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3 + grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3 } -function get_major_minor_version () { - local version - version=$1 - shift +function get_major_minor_version() { + local version + version=$1 + shift - local fullversion - fullversion=$(get_full_version "$version") + local fullversion + fullversion=$(get_full_version "$version") - echo "$(echo "$fullversion" | cut -d'.' -f1).$(echo "$fullversion" | cut -d'.' -f2)" + echo "$(echo "$fullversion" | cut -d'.' -f1).$(echo "$fullversion" | cut -d'.' -f2)" } -function get_tag () { - local version - version=$1 - shift - - local versiontype - versiontype=${1:-full} - shift - - local tagversion - if [ "$versiontype" = full ]; then - tagversion=$(get_full_version "$version") - elif [ "$versiontype" = majorminor ]; then - tagversion=$(get_major_minor_version "$version") - fi - - local tagparts - IFS=' ' read -ra tagparts <<< "$(get_fork_name "$version") $tagversion" - IFS='-'; echo "${tagparts[*]}"; unset IFS +function get_tag() { + local version + version=$1 + shift + + local versiontype + versiontype=${1:-full} + shift + + local tagversion + if [ "$versiontype" = full ]; then + tagversion=$(get_full_version "$version") + elif [ "$versiontype" = majorminor ]; then + tagversion=$(get_major_minor_version "$version") + fi + + local tagparts + IFS=' ' read -ra tagparts <<<"$(get_fork_name "$version") $tagversion" + IFS='-' + echo "${tagparts[*]}" + unset IFS } -function sort_versions () { - local versions=( "$@" ) - local sorted - local lines - local line +function sort_versions() { + local versions=("$@") + local sorted + local lines + local line - IFS=$'\n' - lines="${versions[*]}" - unset IFS + IFS=$'\n' + lines="${versions[*]}" + unset IFS - while IFS='' read -r line; do - sorted+=( "$line" ) - done <<< "$(echo "$lines" | grep "^[0-9]" | sort -r)" + while IFS='' read -r line; do + sorted+=("$line") + done <<<"$(echo "$lines" | grep "^[0-9]" | sort -r)" - while IFS='' read -r line; do - sorted+=( "$line" ) - done <<< "$(echo "$lines" | grep -v "^[0-9]" | sort -r)" + while IFS='' read -r line; do + sorted+=("$line") + done <<<"$(echo "$lines" | grep -v "^[0-9]" | sort -r)" - echo "${sorted[@]}" + echo "${sorted[@]}" } diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a5609fa120..f40879d102 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -6,29 +6,29 @@ hash git 2>/dev/null || { echo >&2 "git not found, exiting."; } # Used dynamically: print "$array_" $1 # shellcheck disable=SC2034 -array_6='6 boron'; +array_6='6 boron' # shellcheck disable=SC2034 -array_8='8 carbon'; +array_8='8 carbon' # shellcheck disable=SC2034 -array_9='9'; +array_9='9' # shellcheck disable=SC2034 -array_10='10 latest'; +array_10='10 latest' # shellcheck disable=SC2034 -array_chakracore_8='chakracore-8'; +array_chakracore_8='chakracore-8' # shellcheck disable=SC2034 -array_chakracore_10='chakracore-10 chakracore'; +array_chakracore_10='chakracore-10 chakracore' -cd "$(cd "${0%/*}" && pwd -P)"; +cd "$(cd "${0%/*}" && pwd -P)" self="$(basename "${BASH_SOURCE[0]}")" -IFS=' ' read -ra versions <<< "$(get_versions)" -IFS=' ' read -ra versions <<< "$(sort_versions "${versions[@]}")" +IFS=' ' read -ra versions <<<"$(get_versions)" +IFS=' ' read -ra versions <<<"$(sort_versions "${versions[@]}")" url='https://github.com/nodejs/docker-node' # get the most recent commit which modified any of "$@" fileCommit() { - git log -1 --format='format:%H' HEAD -- "$@" + git log -1 --format='format:%H' HEAD -- "$@" } echo "# this file is generated via ${url}/blob/$(fileCommit "$self")/$self" @@ -39,57 +39,61 @@ echo # prints "$2$1$3$1...$N" join() { - local sep="$1"; shift - local out; printf -v out "${sep//%/%%}%s" "$@" - echo "${out#$sep}" + local sep="$1" + shift + local out + printf -v out "${sep//%/%%}%s" "$@" + echo "${out#$sep}" } get_stub() { - local version="$1"; shift - IFS='/' read -ra versionparts <<< "$version" - local stub; eval stub="$(join '_' "${versionparts[@]}" | awk -F. '{ print "$array_" $1 }')"; - echo "$stub" + local version="$1" + shift + IFS='/' read -ra versionparts <<<"$version" + local stub + eval stub="$(join '_' "${versionparts[@]}" | awk -F. '{ print "$array_" $1 }')" + echo "$stub" } for version in "${versions[@]}"; do - # Skip "docs" and other non-docker directories - [ -f "$version/Dockerfile" ] || continue - - stub=$(get_stub "$version") - commit="$(fileCommit "$version")" - fullVersion="$(get_tag "$version" full)" - majorMinorVersion="$(get_tag "$version" majorminor)" - - IFS=' ' read -ra versionAliases <<< "$fullVersion $majorMinorVersion $stub" - # Get supported architectures for a specific version. See details in function.sh - IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "$version" "default")" - - echo "Tags: $(join ', ' "${versionAliases[@]}")" - echo "Architectures: $(join ', ' "${supportedArches[@]}")" - echo "GitCommit: ${commit}" - echo "Directory: ${version}" - echo - - # Get supported variants according to the target architecture. - # See details in function.sh - IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")")" - for variant in "${variants[@]}"; do - # Skip non-docker directories - [ -f "$version/$variant/Dockerfile" ] || continue - - commit="$(fileCommit "$version/$variant")" - - slash='/' - variantAliases=( "${versionAliases[@]/%/-${variant//$slash/-}}" ) - variantAliases=( "${variantAliases[@]//latest-/}" ) - # Get supported architectures for a specific version and variant. - # See details in function.sh - IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "$version" "$variant")" - - echo "Tags: $(join ', ' "${variantAliases[@]}")" - echo "Architectures: $(join ', ' "${supportedArches[@]}")" - echo "GitCommit: ${commit}" - echo "Directory: ${version}/${variant}" - echo - done + # Skip "docs" and other non-docker directories + [ -f "$version/Dockerfile" ] || continue + + stub=$(get_stub "$version") + commit="$(fileCommit "$version")" + fullVersion="$(get_tag "$version" full)" + majorMinorVersion="$(get_tag "$version" majorminor)" + + IFS=' ' read -ra versionAliases <<<"$fullVersion $majorMinorVersion $stub" + # Get supported architectures for a specific version. See details in function.sh + IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "$version" "default")" + + echo "Tags: $(join ', ' "${versionAliases[@]}")" + echo "Architectures: $(join ', ' "${supportedArches[@]}")" + echo "GitCommit: ${commit}" + echo "Directory: ${version}" + echo + + # Get supported variants according to the target architecture. + # See details in function.sh + IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "$version")")" + for variant in "${variants[@]}"; do + # Skip non-docker directories + [ -f "$version/$variant/Dockerfile" ] || continue + + commit="$(fileCommit "$version/$variant")" + + slash='/' + variantAliases=("${versionAliases[@]/%/-${variant//$slash/-}}") + variantAliases=("${variantAliases[@]//latest-/}") + # Get supported architectures for a specific version and variant. + # See details in function.sh + IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "$version" "$variant")" + + echo "Tags: $(join ', ' "${variantAliases[@]}")" + echo "Architectures: $(join ', ' "${supportedArches[@]}")" + echo "GitCommit: ${commit}" + echo "Directory: ${version}/${variant}" + echo + done done diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 52e62c9264..f226a314c7 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -3,24 +3,24 @@ set -e . functions.sh if [ -z "$1" ]; then - COMMIT_ID="$TRAVIS_COMMIT" - COMMIT_MESSAGE="$TRAVIS_COMMIT_MESSAGE" - BRANCH_NAME="travis-$TRAVIS_BUILD_ID" - GITHUB_USERNAME="nodejs-github-bot" + COMMIT_ID="$TRAVIS_COMMIT" + COMMIT_MESSAGE="$TRAVIS_COMMIT_MESSAGE" + BRANCH_NAME="travis-$TRAVIS_BUILD_ID" + GITHUB_USERNAME="nodejs-github-bot" else - COMMIT_ID="$1" - COMMIT_MESSAGE="$(git show -s --format=%B "$1")" - BRANCH_NAME="travis-$(date +%s)" - if [[ "$(git remote get-url origin)" =~ github.com/([^/]*)/docker-node.git ]]; then - GITHUB_USERNAME="${BASH_REMATCH[1]}" - fi + COMMIT_ID="$1" + COMMIT_MESSAGE="$(git show -s --format=%B "$1")" + BRANCH_NAME="travis-$(date +%s)" + if [[ "$(git remote get-url origin)" =~ github.com/([^/]*)/docker-node.git ]]; then + GITHUB_USERNAME="${BASH_REMATCH[1]}" + fi fi if [[ "$COMMIT_MESSAGE" =~ Merge\ pull\ request\ \#([0-9]*) ]]; then - # This is a merge from a pull request - PR_NUMBER="${BASH_REMATCH[1]}" - COMMIT_MESSAGE="$(printf "%s" "$COMMIT_MESSAGE" | tail -n 1)" + # This is a merge from a pull request + PR_NUMBER="${BASH_REMATCH[1]}" + COMMIT_MESSAGE="$(printf "%s" "$COMMIT_MESSAGE" | tail -n 1)" fi IMAGES_FILE="library/node" @@ -31,134 +31,137 @@ DOCKER_SLUG="nodejs/docker-node" gitpath="$REPO_NAME" function updated() { - local versions - local images_changed - - IFS=' ' read -ra versions <<< "$(IFS=','; get_versions)" - images_changed=$(git diff --name-only "$COMMIT_ID".."$COMMIT_ID"~1 "${versions[@]}") - - if [ -z "$images_changed" ]; then - return 1 - else - return 0 - fi + local versions + local images_changed + + IFS=' ' read -ra versions <<<"$( + IFS=',' + get_versions + )" + images_changed=$(git diff --name-only "$COMMIT_ID".."$COMMIT_ID"~1 "${versions[@]}") + + if [ -z "$images_changed" ]; then + return 1 + else + return 0 + fi } function auth_header() { - echo "Authorization: token $GITHUB_API_TOKEN" + echo "Authorization: token $GITHUB_API_TOKEN" } function permission_check() { - if [ -z "$GITHUB_API_TOKEN" ]; then - fatal "Environment variable \$GITHUB_API_TOKEN is missing or empty" - fi - - auth="$(curl -H "$(auth_header)" \ - -s \ - "https://api.github.com")" - - if [ "$(echo "$auth" | jq .message)" = "\"Bad credentials\"" ]; then - fatal "Authentication Failed! Invalid \$GITHUB_API_TOKEN" - fi - - auth="$(curl -H "$(auth_header)" \ - -s \ - "https://api.github.com/repos/$ORIGIN_SLUG/collaborators/$GITHUB_USERNAME/permission")" - if [ "$(echo "$auth" | jq .message)" != "null" ]; then - fatal "\$GITHUB_API_TOKEN can't push to https://github.com/$ORIGIN_SLUG.git" - fi + if [ -z "$GITHUB_API_TOKEN" ]; then + fatal "Environment variable \$GITHUB_API_TOKEN is missing or empty" + fi + + auth="$(curl -H "$(auth_header)" \ + -s \ + "https://api.github.com")" + + if [ "$(echo "$auth" | jq .message)" = "\"Bad credentials\"" ]; then + fatal "Authentication Failed! Invalid \$GITHUB_API_TOKEN" + fi + + auth="$(curl -H "$(auth_header)" \ + -s \ + "https://api.github.com/repos/$ORIGIN_SLUG/collaborators/$GITHUB_USERNAME/permission")" + if [ "$(echo "$auth" | jq .message)" != "null" ]; then + fatal "\$GITHUB_API_TOKEN can't push to https://github.com/$ORIGIN_SLUG.git" + fi } function setup_git_author() { - GIT_AUTHOR_NAME="$(git show -s --format="%aN" "$COMMIT_ID")" - GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "$COMMIT_ID")" - GIT_COMMITTER_NAME="$(git show -s --format="%cN" "$COMMIT_ID")" - GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "$COMMIT_ID")" + GIT_AUTHOR_NAME="$(git show -s --format="%aN" "$COMMIT_ID")" + GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "$COMMIT_ID")" + GIT_COMMITTER_NAME="$(git show -s --format="%cN" "$COMMIT_ID")" + GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "$COMMIT_ID")" - export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL + export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL } function message() { - echo "Node: $COMMIT_MESSAGE" + echo "Node: $COMMIT_MESSAGE" } function pr_payload() { - local escaped_message - escaped_message="$(echo "$COMMIT_MESSAGE" | sed -E -e "s/\"/\\\\\"/g")" - echo '{ - "title": "Node: '"$escaped_message"'", - "body": "Commit: nodejs/docker-node@'"$COMMIT_ID"'", - "head": "'"$GITHUB_USERNAME"':'"$BRANCH_NAME"'", - "base": "master" - }' + local escaped_message + escaped_message="$(echo "$COMMIT_MESSAGE" | sed -E -e "s/\"/\\\\\"/g")" + echo '{ + "title": "Node: '"$escaped_message"'", + "body": "Commit: nodejs/docker-node@'"$COMMIT_ID"'", + "head": "'"$GITHUB_USERNAME"':'"$BRANCH_NAME"'", + "base": "master" + }' } function comment_payload() { - local pr_url - pr_url="$1" - echo '{ - "body": "Created PR to the '"$REPO_NAME"' repo ('"$pr_url"')" - }' + local pr_url + pr_url="$1" + echo '{ + "body": "Created PR to the '"$REPO_NAME"' repo ('"$pr_url"')" + }' } if updated; then - permission_check - - # Set Git User Info - setup_git_author - - info "Cloning..." - git clone --depth 50 "https://github.com/$UPSTREAM_SLUG.git" $gitpath 2> /dev/null - - stackbrew="$(./generate-stackbrew-library.sh)" - - cd $gitpath - - echo "$stackbrew" > "$IMAGES_FILE" - git checkout -b "$BRANCH_NAME" - git add "$IMAGES_FILE" - git commit -m "$(message)" - - info "Pushing..." - git push "https://$GITHUB_API_TOKEN:x-oauth-basic@github.com/$ORIGIN_SLUG.git" -f "$BRANCH_NAME" 2> /dev/null || fatal "Error pushing the updated stackbrew" - - cd - && rm -rf $gitpath - - info "Creating Pull request" - pr_response_payload="$(curl -H "$(auth_header)" \ - -s \ - -X POST \ - -d "$(pr_payload)" \ - "https://api.github.com/repos/$UPSTREAM_SLUG/pulls")" - - url="$(echo "$pr_response_payload" | jq -r .html_url)" - if [ "$url" != "null" ]; then - info "Pull request created at $url" - - if [ ! -z "$PR_NUMBER" ]; then - comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/issues/$PR_NUMBER/comments" - else - comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/commits/$COMMIT_ID/comments" - fi - - info "Creating Commit Comment" - commit_response_payload="$(curl -H "$(auth_header)" \ - -s \ - -X POST \ - -d "$(comment_payload "$url")" \ - "$comment_endpoint")" - - if [ "$(echo "$commit_response_payload" | jq .message)" != "null" ]; then - fatal "Error linking the pull request ($error_message)" - else - comment_url="$(echo "$commit_response_payload" | jq -r .html_url)" - info "Created comment at $comment_url" - fi - else - error_message=$(echo "$pr_response_payload" | jq .message) - fatal "Error creating pull request ($error_message)" - fi + permission_check + + # Set Git User Info + setup_git_author + + info "Cloning..." + git clone --depth 50 "https://github.com/$UPSTREAM_SLUG.git" $gitpath 2>/dev/null + + stackbrew="$(./generate-stackbrew-library.sh)" + + cd $gitpath + + echo "$stackbrew" >"$IMAGES_FILE" + git checkout -b "$BRANCH_NAME" + git add "$IMAGES_FILE" + git commit -m "$(message)" + + info "Pushing..." + git push "https://$GITHUB_API_TOKEN:x-oauth-basic@github.com/$ORIGIN_SLUG.git" -f "$BRANCH_NAME" 2>/dev/null || fatal "Error pushing the updated stackbrew" + + cd - && rm -rf $gitpath + + info "Creating Pull request" + pr_response_payload="$(curl -H "$(auth_header)" \ + -s \ + -X POST \ + -d "$(pr_payload)" \ + "https://api.github.com/repos/$UPSTREAM_SLUG/pulls")" + + url="$(echo "$pr_response_payload" | jq -r .html_url)" + if [ "$url" != "null" ]; then + info "Pull request created at $url" + + if [ ! -z "$PR_NUMBER" ]; then + comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/issues/$PR_NUMBER/comments" + else + comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/commits/$COMMIT_ID/comments" + fi + + info "Creating Commit Comment" + commit_response_payload="$(curl -H "$(auth_header)" \ + -s \ + -X POST \ + -d "$(comment_payload "$url")" \ + "$comment_endpoint")" + + if [ "$(echo "$commit_response_payload" | jq .message)" != "null" ]; then + fatal "Error linking the pull request ($error_message)" + else + comment_url="$(echo "$commit_response_payload" | jq -r .html_url)" + info "Created comment at $comment_url" + fi + else + error_message=$(echo "$pr_response_payload" | jq .message) + fatal "Error creating pull request ($error_message)" + fi else - info "No change!" + info "No change!" fi diff --git a/test-build.sh b/test-build.sh index c03607f19b..8af85b9a2e 100755 --- a/test-build.sh +++ b/test-build.sh @@ -9,18 +9,21 @@ set -uo pipefail # Convert comma delimited cli arguments to arrays # E.g. ./test-build.sh 8,10 slim,onbuild # "8,10" becomes "8 10" and "slim,onbuild" becomes "slim onbuild" -IFS=',' read -ra versions_arg <<< "${1:-}" -IFS=',' read -ra variant_arg <<< "${2:-}" +IFS=',' read -ra versions_arg <<<"${1:-}" +IFS=',' read -ra variant_arg <<<"${2:-}" -function build () { +function build() { local version local tag local variant local full_tag local path - version="$1"; shift - variant="$1"; shift - tag="$1"; shift + version="$1" + shift + variant="$1" + shift + tag="$1" + shift if [ -z "$variant" ]; then full_tag="$tag" @@ -41,9 +44,9 @@ function build () { docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"$full_tag" test.sh "$full_version" } -cd "$(cd "${0%/*}" && pwd -P)" || exit; +cd "$(cd "${0%/*}" && pwd -P)" || exit -IFS=' ' read -ra versions <<< "$(get_versions . "${versions_arg[@]}")" +IFS=' ' read -ra versions <<<"$(get_versions . "${versions_arg[@]}")" if [ ${#versions[@]} -eq 0 ]; then fatal "No valid versions found!" fi @@ -57,10 +60,10 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")" "${variant_arg[@]}")" + IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "$version")" "${variant_arg[@]}")" # Only build the default Dockerfile if "default" is in the variant list - if [[ "${variants[*]}" =~ "default" ]] || [[ "${variants[*]}" =~ "onbuild" ]] ; then + if [[ "${variants[*]}" =~ "default" ]] || [[ "${variants[*]}" =~ "onbuild" ]]; then build "$version" "" "$tag" fi diff --git a/test-image.sh b/test-image.sh index 9c5d0a25d0..bbcc8db3ed 100755 --- a/test-image.sh +++ b/test-image.sh @@ -1,18 +1,18 @@ #!/bin/sh if [ "$(node -e "process.stdout.write(process.versions.node)")" != "$1" ]; then - echo "Test for node failed!" - exit 1 + echo "Test for node failed!" + exit 1 fi echo "Test for node succeeded." -if ! npm --version > /dev/null; then - echo "Test for npm failed!" - exit 2 +if ! npm --version >/dev/null; then + echo "Test for npm failed!" + exit 2 fi echo "Test for npm succeeded." -if ! yarn --version > /dev/null; then - echo "Test of yarn failed!" - exit 3 +if ! yarn --version >/dev/null; then + echo "Test of yarn failed!" + exit 3 fi echo "Test for yarn succeeded." diff --git a/update.sh b/update.sh index 8252cae9f1..3170a6979d 100755 --- a/update.sh +++ b/update.sh @@ -3,11 +3,11 @@ set -ue . functions.sh -cd "$(cd "${0%/*}" && pwd -P)"; +cd "$(cd "${0%/*}" && pwd -P)" -IFS=' ' read -ra versions <<< "$(get_versions . "$@")" +IFS=' ' read -ra versions <<<"$(get_versions . "$@")" if [ ${#versions[@]} -eq 0 ]; then - fatal "No valid versions found!" + fatal "No valid versions found!" fi # Global variables @@ -18,100 +18,98 @@ arch=$(get_arch) yarnVersion="$(curl -sSL --compressed https://yarnpkg.com/latest-version)" -function update_node_version { - - local baseuri=$1 - shift - local version=$1 - shift - local template=$1 - shift - local dockerfile=$1 - shift - local variant= - if [[ $# -eq 1 ]]; then - variant=$1 - shift - fi - - fullVersion="$(curl -sSL --compressed "$baseuri" | grep '> .travis.yml +' >>.travis.yml } echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### -' | cat - travis.yml.template > .travis.yml +' | cat - travis.yml.template >.travis.yml for version in "${versions[@]}"; do - # Skip "docs" and other non-docker directories - [ -f "$version/Dockerfile" ] || continue + # Skip "docs" and other non-docker directories + [ -f "$version/Dockerfile" ] || continue - info "Updating version $version..." + info "Updating version $version..." - parentpath=$(dirname "$version") - versionnum=$(basename "$version") - baseuri=$(get_config "$parentpath" "baseuri") + parentpath=$(dirname "$version") + versionnum=$(basename "$version") + baseuri=$(get_config "$parentpath" "baseuri") - add_stage "$baseuri" "$version" "default" - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" & + add_stage "$baseuri" "$version" "default" + update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" & - # Get supported variants according the target architecture - # See details in function.sh - IFS=' ' read -ra variants <<< "$(get_variants "$parentpath")" + # Get supported variants according the target architecture + # See details in function.sh + IFS=' ' read -ra variants <<<"$(get_variants "$parentpath")" - for variant in "${variants[@]}"; do - # Skip non-docker directories - [ -f "$version/$variant/Dockerfile" ] || continue - add_stage "$baseuri" "$version" "$variant" - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" & - done + for variant in "${variants[@]}"; do + # Skip non-docker directories + [ -f "$version/$variant/Dockerfile" ] || continue + add_stage "$baseuri" "$version" "$variant" + update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" & + done done wait From 92bad11c067fc3b40b9cfa3a87bbefcb1120a8d2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 14 May 2018 19:30:57 +0800 Subject: [PATCH 084/818] Add basic .editorconfig [ci skip] --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..ce04bc2e72 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.sh] +indent_size = 2 +indent_style = space From 7d6c726941350e298aa10b3b3b900999d823a825 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 14 May 2018 19:35:10 +0800 Subject: [PATCH 085/818] Add EditorConfig test on Travis CI --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.travis.yml b/.travis.yml index 270ceb4803..9a2adfb86f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,17 @@ stages: jobs: include: + - stage: Test + env: + - TEST: Editor Config check + language: node_js + node_js: + - lts/* + install: + - npm i -g eclint + script: + - eclint check + - stage: Test env: - TEST: Doc Toc Check From bbf199c4595c596ac36b394cbc9e2362e014efdf Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 15 May 2018 20:05:37 +0800 Subject: [PATCH 086/818] Fix format issues --- .travis.yml | 84 +++++++++++++++++++++---------------------- docs/BestPractices.md | 2 +- update.sh | 4 +-- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a2adfb86f..147d917937 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,105 +64,105 @@ jobs: # Docker Build # - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "default" + - NODE_VERSION: "10" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "alpine" + - NODE_VERSION: "10" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "slim" + - NODE_VERSION: "10" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "10" - - VARIANT: "stretch" + - NODE_VERSION: "10" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "default" + - NODE_VERSION: "6" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "alpine" + - NODE_VERSION: "6" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "onbuild" + - NODE_VERSION: "6" + - VARIANT: "onbuild" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "slim" + - NODE_VERSION: "6" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "6" - - VARIANT: "stretch" + - NODE_VERSION: "6" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "default" + - NODE_VERSION: "8" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "alpine" + - NODE_VERSION: "8" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "onbuild" + - NODE_VERSION: "8" + - VARIANT: "onbuild" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "slim" + - NODE_VERSION: "8" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "8" - - VARIANT: "stretch" + - NODE_VERSION: "8" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "default" + - NODE_VERSION: "9" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "alpine" + - NODE_VERSION: "9" + - VARIANT: "alpine" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "onbuild" + - NODE_VERSION: "9" + - VARIANT: "onbuild" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "slim" + - NODE_VERSION: "9" + - VARIANT: "slim" - stage: Build env: - - NODE_VERSION: "9" - - VARIANT: "stretch" + - NODE_VERSION: "9" + - VARIANT: "stretch" - stage: Build env: - - NODE_VERSION: "chakracore/10" - - VARIANT: "default" + - NODE_VERSION: "chakracore/10" + - VARIANT: "default" - stage: Build env: - - NODE_VERSION: "chakracore/8" - - VARIANT: "default" + - NODE_VERSION: "chakracore/8" + - VARIANT: "default" diff --git a/docs/BestPractices.md b/docs/BestPractices.md index f543d8e5f7..261a14cf65 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -105,7 +105,7 @@ RUN deluser --remove-home node \ ## Memory -By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host you should limit how much memory they can consume. +By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host you should limit how much memory they can consume. ``` -m "300M" --memory-swap "1G" diff --git a/update.sh b/update.sh index 3170a6979d..9a751a814c 100755 --- a/update.sh +++ b/update.sh @@ -79,8 +79,8 @@ function add_stage() { echo ' - stage: Build env: - - NODE_VERSION: "'"$version"'" - - VARIANT: "'"$variant"'" + - NODE_VERSION: "'"$version"'" + - VARIANT: "'"$variant"'" ' >>.travis.yml } From 66f64f16fb862bce64f65f53643c16887f121f8d Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 15 May 2018 10:32:44 -0400 Subject: [PATCH 087/818] Added new Travis CI tasks to the travis config template --- travis.yml.template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/travis.yml.template b/travis.yml.template index d1d087cbbc..74602c461f 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -20,6 +20,17 @@ stages: jobs: include: + - stage: Test + env: + - TEST: Editor Config check + language: node_js + node_js: + - lts/* + install: + - npm i -g eclint + script: + - eclint check + - stage: Test env: - TEST: Doc Toc Check @@ -30,6 +41,14 @@ jobs: doctoc --title='## Table of Contents' --github README.md && diff -q README.md README.md.tmp + - stage: Test + env: + - TEST: shfmt check + script: + - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt -i 2 -l -w -ci . + - git diff --color + - git diff --stat=220 --color --exit-code + - stage: Test env: - TEST: Shell Check From 1cf5b839191ad2e20b59e22ad6995e94e8196407 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 15 May 2018 10:33:01 -0400 Subject: [PATCH 088/818] Fixed the update script --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 9a751a814c..b045c33459 100755 --- a/update.sh +++ b/update.sh @@ -37,7 +37,7 @@ function update_node_version() { fullVersion="$(curl -sSL --compressed "$baseuri" | grep ' Date: Wed, 16 May 2018 00:03:24 +0800 Subject: [PATCH 089/818] Update .editorconfig, apply rules to all files --- .editorconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index ce04bc2e72..0f1786729b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,9 +3,7 @@ root = true [*] charset = utf-8 end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true - -[*.sh] indent_size = 2 indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true From dae54a2a2f94649b342f6dcde9972ed6d792ae16 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 16 May 2018 00:03:32 +0800 Subject: [PATCH 090/818] Fix README.md indent --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7e60ad11d2..2c5766ff40 100644 --- a/README.md +++ b/README.md @@ -268,15 +268,15 @@ about the expectations for all contributors to this project. ## Docker Working Group Members - * Christopher Horrell ([chorrell](https://github.com/chorrell)) - * Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) - * Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) - * John Mitchell ([jlmitch5](https://github.com/jlmitch5)) - * Peter Petrov ([pesho](https://github.com/pesho)) + * Christopher Horrell ([chorrell](https://github.com/chorrell)) + * Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) + * Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) + * John Mitchell ([jlmitch5](https://github.com/jlmitch5)) + * Peter Petrov ([pesho](https://github.com/pesho)) ## Docker Working Group Collaborators - * Mikeal Rogers ([mikeal](https://github.com/mikeal)) - * Laurent Goderre ([LaurentGoderre](https://github.com/LaurentGoderre)) - * Simen Bekkhus ([SimenB](https://github.com/SimenB)) - * Peter Dave Hello ([PeterDaveHello](https://github.com/PeterDaveHello)) + * Mikeal Rogers ([mikeal](https://github.com/mikeal)) + * Laurent Goderre ([LaurentGoderre](https://github.com/LaurentGoderre)) + * Simen Bekkhus ([SimenB](https://github.com/SimenB)) + * Peter Dave Hello ([PeterDaveHello](https://github.com/PeterDaveHello)) From 15bea793c09a32685ad17b157f4fd8197b0b0d34 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 15 May 2018 12:42:29 -0400 Subject: [PATCH 091/818] Use LTS version of Node.js for doctoc (#734) --- .travis.yml | 2 ++ travis.yml.template | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 147d917937..d29dba4120 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,8 @@ jobs: env: - TEST: Doc Toc Check language: node_js + node_js: + - lts/* install: npm i -g doctoc script: - cp README.md README.md.tmp && diff --git a/travis.yml.template b/travis.yml.template index 74602c461f..e67bc1d0f7 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -35,6 +35,8 @@ jobs: env: - TEST: Doc Toc Check language: node_js + node_js: + - lts/* install: npm i -g doctoc script: - cp README.md README.md.tmp && From f08f798c85d011c6555173de7d8e7b84e73646d2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 16 May 2018 00:28:57 +0800 Subject: [PATCH 092/818] Test Travis CI config and template consistency --- .travis.yml | 8 ++++++++ travis.yml.template | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index d29dba4120..892a25fe82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,14 @@ jobs: - TEST: Shell Check script: shellcheck *.sh + - stage: Test + env: + - TEST: .travis.yml and travis.yml.template consistency + language: generic + script: + - ./update.sh + - git diff --stat --exit-code .travis.yml + - stage: Deploy script: ./generate-stackbrew-pr.sh env: diff --git a/travis.yml.template b/travis.yml.template index e67bc1d0f7..54b3b6a871 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -56,6 +56,14 @@ jobs: - TEST: Shell Check script: shellcheck *.sh + - stage: Test + env: + - TEST: .travis.yml and travis.yml.template consistency + language: generic + script: + - ./update.sh + - git diff --stat --exit-code .travis.yml + - stage: Deploy script: ./generate-stackbrew-pr.sh env: From 54b51b3ab144a4a2c60447477849d6d8e07cdadb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 16 May 2018 01:36:07 +0800 Subject: [PATCH 093/818] Adjust .travis.yml generation process to prevent trailing new line --- .travis.yml | 1 + update.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 892a25fe82..e74c123ecd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,6 +72,7 @@ jobs: secure: "HkgYgawkr/hkg2vURHGOb/JmF6U1e71QQsd0HXJ1UJh6WBiFJOrjomCMHZGHnpyopdRna++up8dISBqM2X+EiLAr9yWdRXy72oMP9X42M0ccnja/3E5KYYXMkETS50JnUhMCOt2xRZW5/ojqrHukqRo0YIjIu+P0U0VsZ4QIsng=" # Docker Build # + - stage: Build env: - NODE_VERSION: "10" diff --git a/update.sh b/update.sh index b045c33459..f9f432d515 100755 --- a/update.sh +++ b/update.sh @@ -77,11 +77,11 @@ function add_stage() { local variant=$1 shift - echo ' - stage: Build + echo ' + - stage: Build env: - NODE_VERSION: "'"$version"'" - - VARIANT: "'"$variant"'" -' >>.travis.yml + - VARIANT: "'"$variant"'"' >>.travis.yml } echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### From 9d34db0c5d314b704b7dc76481dca15b85eef7c2 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 16 May 2018 00:44:03 +0200 Subject: [PATCH 094/818] upgrade to node 8.11.2 --- 8/Dockerfile | 4 ++-- 8/alpine/Dockerfile | 4 ++-- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 4 ++-- 8/stretch/Dockerfile | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/8/Dockerfile b/8/Dockerfile index 2147bdef19..d431493469 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.1 +ENV NODE_VERSION 8.11.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 583f901b3e..cdffdca96f 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 8.11.1 +ENV NODE_VERSION 8.11.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 690d95ca00..38e63fc6c9 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.11.1 +FROM node:8.11.2 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index abb369ee74..3e01a881fb 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.1 +ENV NODE_VERSION 8.11.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 3dc7f20a7c..d25a15c9fe 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.1 +ENV NODE_VERSION 8.11.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.6.0 RUN set -ex \ && for key in \ From 8e6744537c34a9bd3223456297084c88d6a98a3a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 18 May 2018 00:43:44 +0800 Subject: [PATCH 095/818] Improve architectures file readability [ci skip] --- architectures | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/architectures b/architectures index 814e0c14fe..1583bbc6f9 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ +arm32v6 alpine +arm32v7 default,onbuild,slim,stretch +arm64v8 default,alpine,onbuild,slim,stretch +amd64 default,alpine,onbuild,slim,stretch +i386 default,alpine,onbuild,slim,stretch +ppc64le default,alpine,onbuild,slim,stretch +s390x default,alpine,onbuild,slim,stretch bashbrew-arch variants -amd64 default,alpine,onbuild,slim,stretch -ppc64le default,alpine,onbuild,slim,stretch -s390x default,alpine,onbuild,slim,stretch -arm64v8 default,alpine,onbuild,slim,stretch -arm32v7 default,onbuild,slim,stretch -arm32v6 alpine -i386 default,alpine,onbuild,slim,stretch From eb8000cd2221834b0770add19fded4ec62e47ad8 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 16 May 2018 10:16:49 -0400 Subject: [PATCH 096/818] Fix the update script for only a specific version Fixes #737 --- update.sh | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/update.sh b/update.sh index f9f432d515..89d56410dc 100755 --- a/update.sh +++ b/update.sh @@ -5,7 +5,8 @@ set -ue cd "$(cd "${0%/*}" && pwd -P)" -IFS=' ' read -ra versions <<<"$(get_versions . "$@")" +IFS=' ' read -ra versions <<<"$(get_versions .)" +IFS=' ' read -ra update_versions <<<"$(get_versions . "$@")" if [ ${#versions[@]} -eq 0 ]; then fatal "No valid versions found!" fi @@ -18,6 +19,19 @@ arch=$(get_arch) yarnVersion="$(curl -sSL --compressed https://yarnpkg.com/latest-version)" +function in_versions_to_update() { + local version=$1 + + for version_to_update in "${update_versions[@]}"; do + if [ "${version_to_update}" = "${version}" ]; then + echo 0 + return + fi + done + + echo 1 +} + function update_node_version() { local baseuri=$1 @@ -91,14 +105,17 @@ for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories [ -f "$version/Dockerfile" ] || continue - info "Updating version $version..." - parentpath=$(dirname "$version") versionnum=$(basename "$version") baseuri=$(get_config "$parentpath" "baseuri") + update=$(in_versions_to_update "$version") add_stage "$baseuri" "$version" "default" - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" & + + if [ "$update" -eq 0 ]; then + info "Updating version $version..." + update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" & + fi # Get supported variants according the target architecture # See details in function.sh @@ -108,7 +125,10 @@ for version in "${versions[@]}"; do # Skip non-docker directories [ -f "$version/$variant/Dockerfile" ] || continue add_stage "$baseuri" "$version" "$variant" - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" & + + if [ "$update" -eq 0 ]; then + update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" & + fi done done From bb92568f3a1db52519b88c5eebfa9f7af94eb1e0 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 18 May 2018 00:31:30 +0800 Subject: [PATCH 097/818] Improve coding style of shell scripts --- functions.sh | 54 ++++++++++----------- generate-stackbrew-library.sh | 27 +++++------ generate-stackbrew-pr.sh | 88 +++++++++++++++++------------------ test-build.sh | 36 +++++++------- update.sh | 8 ++-- 5 files changed, 107 insertions(+), 106 deletions(-) diff --git a/functions.sh b/functions.sh index c54e847907..eb738561d9 100755 --- a/functions.sh +++ b/functions.sh @@ -1,5 +1,5 @@ -#!/bin/bash - +#!/usr/bin/env bash +# # Utlity functions info() { @@ -37,12 +37,12 @@ function get_arch() { arch="arm32v7" ;; *) - echo "$0 does not support architecture $arch ... aborting" + echo "$0 does not support architecture ${arch} ... aborting" exit 1 ;; esac - echo "$arch" + echo "${arch}" } # Get corresponding variants based on the architecture. @@ -62,12 +62,12 @@ function get_variants() { arch=$(get_arch) variantsfilter=("$@") - IFS=' ' read -ra availablevariants <<<"$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')" + IFS=' ' read -ra availablevariants <<<"$(grep "^${arch}" "${dir}/architectures" | sed -E 's/'"${arch}"'[[:space:]]*//' | sed -E 's/,/ /g')" if [ ${#variantsfilter[@]} -gt 0 ]; then for variant1 in "${availablevariants[@]}"; do for variant2 in "${variantsfilter[@]}"; do - if [[ "$variant1" == "$variant2" ]]; then + if [ "$variant1" = "$variant2" ]; then variants+=("$variant1") fi done @@ -100,16 +100,16 @@ function get_supported_arches() { shift # Get default supported arches - lines=$(grep "$variant" "$(dirname "$version")"/architectures 2>/dev/null | cut -d' ' -f1) + lines=$(grep "$variant" "$(dirname "${version}")"/architectures 2>/dev/null | cut -d' ' -f1) # Get version specific supported architectures if there is specialized information - if [ -a "$version"/architectures ]; then - lines=$(grep "$variant" "$version"/architectures 2>/dev/null | cut -d' ' -f1) + if [ -a "${version}"/architectures ]; then + lines=$(grep "$variant" "${version}"/architectures 2>/dev/null | cut -d' ' -f1) fi while IFS='' read -r line; do - arches+=("$line") - done <<<"$lines" + arches+=("${line}") + done <<<"${lines}" echo "${arches[@]}" } @@ -127,7 +127,7 @@ function get_config() { shift local value - value=$(grep "^$name" "$dir/config" | sed -E 's/'"$name"'[[:space:]]*//') + value=$(grep "^$name" "${dir}/config" | sed -E 's/'"$name"'[[:space:]]*//') echo "$value" } @@ -150,13 +150,13 @@ function get_versions() { fi for dir in "${dirs[@]}"; do - if [ -a "$dir/config" ]; then + if [ -a "${dir}/config" ]; then local subdirs IFS=' ' read -ra subdirs <<<"$(get_versions "${dir#./}")" for subdir in "${subdirs[@]}"; do versions+=("$subdir") done - elif [ -a "$dir/Dockerfile" ]; then + elif [ -a "${dir}/Dockerfile" ]; then versions+=("${dir#./}") fi done @@ -171,7 +171,7 @@ function get_fork_name() { version=$1 shift - IFS='/' read -ra versionparts <<<"$version" + IFS='/' read -ra versionparts <<<"${version}" if [ ${#versionparts[@]} -gt 1 ]; then echo "${versionparts[0]}" fi @@ -182,7 +182,7 @@ function get_full_version() { version=$1 shift - grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3 + grep -m1 'ENV NODE_VERSION ' "${version}/Dockerfile" | cut -d' ' -f3 } function get_major_minor_version() { @@ -191,9 +191,9 @@ function get_major_minor_version() { shift local fullversion - fullversion=$(get_full_version "$version") + fullversion=$(get_full_version "${version}") - echo "$(echo "$fullversion" | cut -d'.' -f1).$(echo "$fullversion" | cut -d'.' -f2)" + echo "$(echo "${fullversion}" | cut -d'.' -f1).$(echo "${fullversion}" | cut -d'.' -f2)" } function get_tag() { @@ -206,14 +206,14 @@ function get_tag() { shift local tagversion - if [ "$versiontype" = full ]; then - tagversion=$(get_full_version "$version") - elif [ "$versiontype" = majorminor ]; then - tagversion=$(get_major_minor_version "$version") + if [ "${versiontype}" = full ]; then + tagversion=$(get_full_version "${version}") + elif [ "${versiontype}" = majorminor ]; then + tagversion=$(get_major_minor_version "${version}") fi local tagparts - IFS=' ' read -ra tagparts <<<"$(get_fork_name "$version") $tagversion" + IFS=' ' read -ra tagparts <<<"$(get_fork_name "${version}") ${tagversion}" IFS='-' echo "${tagparts[*]}" unset IFS @@ -230,12 +230,12 @@ function sort_versions() { unset IFS while IFS='' read -r line; do - sorted+=("$line") - done <<<"$(echo "$lines" | grep "^[0-9]" | sort -r)" + sorted+=("${line}") + done <<<"$(echo "${lines}" | grep "^[0-9]" | sort -r)" while IFS='' read -r line; do - sorted+=("$line") - done <<<"$(echo "$lines" | grep -v "^[0-9]" | sort -r)" + sorted+=("${line}") + done <<<"$(echo "${lines}" | grep -v "^[0-9]" | sort -r)" echo "${sorted[@]}" } diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index f40879d102..82f60848f0 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -e . functions.sh @@ -31,7 +32,7 @@ fileCommit() { git log -1 --format='format:%H' HEAD -- "$@" } -echo "# this file is generated via ${url}/blob/$(fileCommit "$self")/$self" +echo "# this file is generated via ${url}/blob/$(fileCommit "${self}")/${self}" echo echo "Maintainers: The Node.js Docker Team <${url}> (@nodejs)" echo "GitRepo: ${url}.git" @@ -49,7 +50,7 @@ join() { get_stub() { local version="$1" shift - IFS='/' read -ra versionparts <<<"$version" + IFS='/' read -ra versionparts <<<"${version}" local stub eval stub="$(join '_' "${versionparts[@]}" | awk -F. '{ print "$array_" $1 }')" echo "$stub" @@ -57,16 +58,16 @@ get_stub() { for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories - [ -f "$version/Dockerfile" ] || continue + [ -f "${version}/Dockerfile" ] || continue - stub=$(get_stub "$version") - commit="$(fileCommit "$version")" - fullVersion="$(get_tag "$version" full)" - majorMinorVersion="$(get_tag "$version" majorminor)" + stub=$(get_stub "${version}") + commit="$(fileCommit "${version}")" + fullVersion="$(get_tag "${version}" full)" + majorMinorVersion="$(get_tag "${version}" majorminor)" IFS=' ' read -ra versionAliases <<<"$fullVersion $majorMinorVersion $stub" # Get supported architectures for a specific version. See details in function.sh - IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "$version" "default")" + IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "${version}" "default")" echo "Tags: $(join ', ' "${versionAliases[@]}")" echo "Architectures: $(join ', ' "${supportedArches[@]}")" @@ -76,19 +77,19 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "$version")")" + IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "${version}")")" for variant in "${variants[@]}"; do # Skip non-docker directories - [ -f "$version/$variant/Dockerfile" ] || continue + [ -f "${version}/${variant}/Dockerfile" ] || continue - commit="$(fileCommit "$version/$variant")" + commit="$(fileCommit "${version}/${variant}")" slash='/' variantAliases=("${versionAliases[@]/%/-${variant//$slash/-}}") variantAliases=("${variantAliases[@]//latest-/}") # Get supported architectures for a specific version and variant. # See details in function.sh - IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "$version" "$variant")" + IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "${version}" "${variant}")" echo "Tags: $(join ', ' "${variantAliases[@]}")" echo "Architectures: $(join ', ' "${supportedArches[@]}")" diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index a4972ae41d..968f8bd6a3 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -e . functions.sh @@ -16,19 +17,19 @@ else fi fi -if [[ "$COMMIT_MESSAGE" =~ Merge\ pull\ request\ \#([0-9]*) ]]; then +if [[ "${COMMIT_MESSAGE}" =~ Merge\ pull\ request\ \#([0-9]*) ]]; then # This is a merge from a pull request PR_NUMBER="${BASH_REMATCH[1]}" - COMMIT_MESSAGE="$(printf "%s" "$COMMIT_MESSAGE" | tail -n 1)" + COMMIT_MESSAGE="$(printf "%s" "${COMMIT_MESSAGE}" | tail -n 1)" fi IMAGES_FILE="library/node" REPO_NAME="official-images" -ORIGIN_SLUG="$GITHUB_USERNAME/$REPO_NAME" -UPSTREAM_SLUG="docker-library/$REPO_NAME" +ORIGIN_SLUG="${GITHUB_USERNAME}/${REPO_NAME}" +UPSTREAM_SLUG="docker-library/${REPO_NAME}" DOCKER_SLUG="nodejs/docker-node" -gitpath="../$REPO_NAME" +gitpath="../${REPO_NAME}" function updated() { local versions @@ -38,13 +39,12 @@ function updated() { IFS=',' get_versions )" - images_changed=$(git diff --name-only "$COMMIT_ID".."$COMMIT_ID"~1 "${versions[@]}") + images_changed=$(git diff --name-only "${COMMIT_ID}".."${COMMIT_ID}"~1 "${versions[@]}") if [ -z "$images_changed" ]; then return 1 - else - return 0 fi + return 0 } function auth_header() { @@ -60,48 +60,48 @@ function permission_check() { -s \ "https://api.github.com")" - if [ "$(echo "$auth" | jq .message)" = "\"Bad credentials\"" ]; then + if [ "$(echo "$auth" | jq -r .message)" = "Bad credentials" ]; then fatal "Authentication Failed! Invalid \$GITHUB_API_TOKEN" fi auth="$(curl -H "$(auth_header)" \ -s \ - "https://api.github.com/repos/$ORIGIN_SLUG/collaborators/$GITHUB_USERNAME/permission")" - if [ "$(echo "$auth" | jq .message)" != "null" ]; then - fatal "\$GITHUB_API_TOKEN can't push to https://github.com/$ORIGIN_SLUG.git" + "https://api.github.com/repos/${ORIGIN_SLUG}/collaborators/${GITHUB_USERNAME}/permission")" + if [ "$(echo "$auth" | jq -r .message)" != "null" ]; then + fatal "\$GITHUB_API_TOKEN can't push to https://github.com/${ORIGIN_SLUG}.git" fi } function setup_git_author() { - GIT_AUTHOR_NAME="$(git show -s --format="%aN" "$COMMIT_ID")" - GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "$COMMIT_ID")" - GIT_COMMITTER_NAME="$(git show -s --format="%cN" "$COMMIT_ID")" - GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "$COMMIT_ID")" + GIT_AUTHOR_NAME="$(git show -s --format="%aN" "${COMMIT_ID}")" + GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "${COMMIT_ID}")" + GIT_COMMITTER_NAME="$(git show -s --format="%cN" "${COMMIT_ID}")" + GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "${COMMIT_ID}")" export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL } function message() { - echo "Node: $COMMIT_MESSAGE" + echo "Node: ${COMMIT_MESSAGE}" } function pr_payload() { local escaped_message - escaped_message="$(echo "$COMMIT_MESSAGE" | sed -E -e "s/\"/\\\\\"/g")" - echo '{ - "title": "Node: '"$escaped_message"'", - "body": "Commit: nodejs/docker-node@'"$COMMIT_ID"'", - "head": "'"$GITHUB_USERNAME"':'"$BRANCH_NAME"'", - "base": "master" - }' + escaped_message="$(echo "${COMMIT_MESSAGE}" | sed -E -e "s/\"/\\\\\"/g")" + echo "{ + 'title': 'Node: ${escaped_message}', + 'body': 'Commit: nodejs/docker-node@${COMMIT_ID}', + 'head': '${GITHUB_USERNAME}:${BRANCH_NAME}', + 'base': 'master' + }" } function comment_payload() { local pr_url pr_url="$1" - echo '{ - "body": "Created PR to the '"$REPO_NAME"' repo ('"$pr_url"')" - }' + echo "{ + 'body': 'Created PR to the ${REPO_NAME} repo (${pr_url})' + }" } if updated; then @@ -112,19 +112,19 @@ if updated; then setup_git_author info "Cloning..." - git clone --depth 50 "https://github.com/$UPSTREAM_SLUG.git" $gitpath 2>/dev/null + git clone --depth 50 "https://github.com/${UPSTREAM_SLUG}.git" ${gitpath} 2>/dev/null stackbrew="$(./generate-stackbrew-library.sh)" cd $gitpath - echo "$stackbrew" >"$IMAGES_FILE" - git checkout -b "$BRANCH_NAME" - git add "$IMAGES_FILE" + echo "${stackbrew}" >"{$IMAGES_FILE}" + git checkout -b "${BRANCH_NAME}" + git add "${IMAGES_FILE}" git commit -m "$(message)" info "Pushing..." - git push "https://$GITHUB_API_TOKEN:x-oauth-basic@github.com/$ORIGIN_SLUG.git" -f "$BRANCH_NAME" 2>/dev/null || fatal "Error pushing the updated stackbrew" + git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" 2>/dev/null || fatal "Error pushing the updated stackbrew" cd - && rm -rf $gitpath @@ -133,16 +133,16 @@ if updated; then -s \ -X POST \ -d "$(pr_payload)" \ - "https://api.github.com/repos/$UPSTREAM_SLUG/pulls")" + "https://api.github.com/repos/${UPSTREAM_SLUG}/pulls")" - url="$(echo "$pr_response_payload" | jq -r .html_url)" + url="$(echo "${pr_response_payload}" | jq -r .html_url)" if [ "$url" != "null" ]; then info "Pull request created at $url" - if [ ! -z "$PR_NUMBER" ]; then - comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/issues/$PR_NUMBER/comments" + if [ ! -z "${PR_NUMBER}" ]; then + comment_endpoint="https://api.github.com/repos/${DOCKER_SLUG}/issues/${PR_NUMBER}/comments" else - comment_endpoint="https://api.github.com/repos/$DOCKER_SLUG/commits/$COMMIT_ID/comments" + comment_endpoint="https://api.github.com/repos/${DOCKER_SLUG}/commits/${COMMIT_ID}/comments" fi info "Creating Commit Comment" @@ -152,15 +152,15 @@ if updated; then -d "$(comment_payload "$url")" \ "$comment_endpoint")" - if [ "$(echo "$commit_response_payload" | jq .message)" != "null" ]; then - fatal "Error linking the pull request ($error_message)" + if [ "$(echo "${commit_response_payload}" | jq -r .message)" != "null" ]; then + fatal "Error linking the pull request (${error_message})" else - comment_url="$(echo "$commit_response_payload" | jq -r .html_url)" - info "Created comment at $comment_url" + comment_url="$(echo "${commit_response_payload}" | jq -r .html_url)" + info "Created comment at ${comment_url}" fi else - error_message=$(echo "$pr_response_payload" | jq .message) - fatal "Error creating pull request ($error_message)" + error_message=$(echo "${pr_response_payload}" | jq -r .message) + fatal "Error creating pull request (${error_message})" fi else info "No change!" diff --git a/test-build.sh b/test-build.sh index 8af85b9a2e..65416568b4 100755 --- a/test-build.sh +++ b/test-build.sh @@ -25,23 +25,23 @@ function build() { tag="$1" shift - if [ -z "$variant" ]; then - full_tag="$tag" - path="$version/$variant" + if [ -z "${variant}" ]; then + full_tag="${tag}" + path="${version}/${variant}" else - full_tag="$tag-$variant" - path="$version/$variant" + full_tag="${tag}-${variant}" + path="${version}/${variant}" fi - info "Building $full_tag..." + info "Building ${full_tag}..." - if ! docker build --cpuset-cpus="0,1" -t node:"$full_tag" "$path"; then - fatal "Build of $full_tag failed!" + if ! docker build --cpuset-cpus="0,1" -t node:"${full_tag}" "${path}"; then + fatal "Build of ${full_tag} failed!" fi - info "Build of $full_tag succeeded." + info "Build of ${full_tag} succeeded." - info "Testing $full_tag" - docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"$full_tag" test.sh "$full_version" + info "Testing ${full_tag}" + docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"${full_tag}" test.sh "${full_version}" } cd "$(cd "${0%/*}" && pwd -P)" || exit @@ -53,25 +53,25 @@ fi for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories - [ -f "$version/Dockerfile" ] || continue + [ -f "${version}/Dockerfile" ] || continue - tag=$(get_tag "$version") - full_version=$(get_full_version "$version") + tag=$(get_tag "${version}") + full_version=$(get_full_version "${version}") # Get supported variants according to the target architecture. # See details in function.sh - IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "$version")" "${variant_arg[@]}")" + IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")" # Only build the default Dockerfile if "default" is in the variant list if [[ "${variants[*]}" =~ "default" ]] || [[ "${variants[*]}" =~ "onbuild" ]]; then - build "$version" "" "$tag" + build "${version}" "" "${tag}" fi for variant in "${variants[@]}"; do # Skip non-docker directories - [ -f "$version/$variant/Dockerfile" ] || continue + [ -f "${version}/${variant}/Dockerfile" ] || continue - build "$version" "$variant" "$tag" + build "${version}" "${variant}" "${tag}" done done diff --git a/update.sh b/update.sh index f9f432d515..36f26209f2 100755 --- a/update.sh +++ b/update.sh @@ -29,7 +29,7 @@ function update_node_version() { local dockerfile=$1 shift local variant - if [[ $# -eq 1 ]]; then + if [ $# -eq 1 ]; then variant=$1 shift fi @@ -38,7 +38,7 @@ function update_node_version() { ( cp "$template" "$dockerfile" local fromprefix="" - if [[ "$arch" != "amd64" && "$variant" != "onbuild" ]]; then + if [ "$arch" != "amd64" ] && [ "$variant" != "onbuild" ]; then fromprefix="$arch\\/" fi @@ -59,10 +59,10 @@ function update_node_version() { sed -E -i.bak "/$pattern/d" "$dockerfile" && rm "$dockerfile".bak done - if [[ "${version/.*/}" -ge 10 ]]; then + if [ "${version/.*/}" -ge 10 ]; then sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.7/' "$dockerfile" rm "$dockerfile.bak" - elif [[ "${version/.*/}" -ge 8 || "$arch" == "ppc64le" || "$arch" == "s390x" || "$arch" == "arm64" || "$arch" == "arm32v7" ]]; then + elif [ "${version/.*/}" -ge 8 ] || [ "$arch" = "ppc64le" ] || [ "$arch" = "s390x" ] || [ "$arch" == "arm64" ] || [ "$arch" == "arm32v7" ]; then sed -E -i.bak 's/FROM (.*)alpine:3.4/FROM \1alpine:3.6/' "$dockerfile" rm "$dockerfile.bak" fi From 3c25cdf7376615dcfb6ab0b26450a13a8a19efa8 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 18 May 2018 02:32:48 +0800 Subject: [PATCH 098/818] Add markdown-link-check test on Travis CI This would help make sure all links alive and not dated. --- .travis.yml | 11 +++++++++++ travis.yml.template | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/.travis.yml b/.travis.yml index e74c123ecd..85a49c849d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,17 @@ stages: jobs: include: + - stage: Test + env: + - TEST: Markdown link check + language: node_js + node_js: + - lts/* + install: + - npm i -g markdown-link-check + script: + - find . -name "*.md" -exec markdown-link-check {} \; + - stage: Test env: - TEST: Editor Config check diff --git a/travis.yml.template b/travis.yml.template index 54b3b6a871..03716eded6 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -20,6 +20,17 @@ stages: jobs: include: + - stage: Test + env: + - TEST: Markdown link check + language: node_js + node_js: + - lts/* + install: + - npm i -g markdown-link-check + script: + - find . -name "*.md" -exec markdown-link-check {} \; + - stage: Test env: - TEST: Editor Config check From 49790d2e874effb24322fc5aab14a65f6fa9f4bb Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Fri, 18 May 2018 09:53:43 -0400 Subject: [PATCH 099/818] Switch to jessie-slim for the slim variant Closes #618 --- 10/slim/Dockerfile | 4 ++-- 6/slim/Dockerfile | 4 ++-- 8/slim/Dockerfile | 4 ++-- 9/slim/Dockerfile | 4 ++-- Dockerfile-slim.template | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index ccd8ece964..083e2540ae 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index b88edcceaa..1b813a72a5 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 3e01a881fb..76e2204c26 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index aecbfbad49..0d4b768702 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -34,7 +34,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index c65f224659..4657542277 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie-curl +FROM debian:jessie-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node @@ -27,7 +27,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ From 90029512f954cf1c1ca41730cabeecb0a27622cf Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Fri, 18 May 2018 10:44:44 -0400 Subject: [PATCH 100/818] curl: use -s and -S flags to disable progress meter but show errors --- 10/Dockerfile | 8 ++++---- 10/alpine/Dockerfile | 8 ++++---- 10/slim/Dockerfile | 8 ++++---- 10/stretch/Dockerfile | 8 ++++---- 6/Dockerfile | 8 ++++---- 6/alpine/Dockerfile | 8 ++++---- 6/slim/Dockerfile | 8 ++++---- 6/stretch/Dockerfile | 8 ++++---- 8/Dockerfile | 8 ++++---- 8/alpine/Dockerfile | 8 ++++---- 8/slim/Dockerfile | 8 ++++---- 8/stretch/Dockerfile | 8 ++++---- 9/Dockerfile | 8 ++++---- 9/alpine/Dockerfile | 8 ++++---- 9/slim/Dockerfile | 8 ++++---- 9/stretch/Dockerfile | 8 ++++---- Dockerfile-alpine.template | 8 ++++---- Dockerfile-slim.template | 8 ++++---- Dockerfile-stretch.template | 8 ++++---- Dockerfile.template | 8 ++++---- chakracore/10/Dockerfile | 8 ++++---- chakracore/8/Dockerfile | 8 ++++---- chakracore/Dockerfile.template | 8 ++++---- 23 files changed, 92 insertions(+), 92 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index 86733a5642..52805364d3 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 9b0205a3b3..5717c315e3 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ @@ -55,8 +55,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 083e2540ae..01510923e9 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -55,8 +55,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index e757e1446a..5969b23967 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/6/Dockerfile b/6/Dockerfile index f0b9d526ad..ba6ed496e4 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index cade2af485..706f1dfea7 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ @@ -55,8 +55,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 1b813a72a5..0c0291a0a8 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -55,8 +55,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 75e627e8e1..2d78990cd8 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/8/Dockerfile b/8/Dockerfile index d431493469..a702cebf73 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index cdffdca96f..1f8d7bdd07 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ @@ -55,8 +55,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 76e2204c26..6718cfc99d 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -55,8 +55,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index d25a15c9fe..ba323eb468 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/9/Dockerfile b/9/Dockerfile index 342577a228..1f7245afc9 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index f7f0d3a4aa..56fe9af060 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ @@ -55,8 +55,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 0d4b768702..41933cb8b9 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -55,8 +55,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 65169c28b8..cff856424b 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -50,8 +50,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index a96ebf9c65..128f1961f0 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -24,8 +24,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ @@ -48,8 +48,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 4657542277..e48317a880 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -29,8 +29,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -48,8 +48,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 54034a44f0..0bcd6534fb 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -25,8 +25,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -43,8 +43,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/Dockerfile.template b/Dockerfile.template index 689b80a515..edfe023ba3 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -25,8 +25,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ @@ -43,8 +43,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index c18b08bbc9..0da1f7fb8e 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/Dockerfile @@ -10,8 +10,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && curl -sSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ @@ -27,8 +27,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index b824a26b16..707cc5b5d7 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/Dockerfile @@ -10,8 +10,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && curl -sSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ @@ -27,8 +27,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index d0b73e60f7..4053793799 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -10,8 +10,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -SLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -SLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && curl -sSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -sSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ @@ -27,8 +27,8 @@ RUN set -ex \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ - && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ From 4e0c4c8644f929710ad2fb1403766be9214bd03d Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Fri, 18 May 2018 10:53:43 -0400 Subject: [PATCH 101/818] curl: use -f flag consistently Curl will fail silently with error 22 rather outputting the html error document --- 10/Dockerfile | 4 ++-- 10/alpine/Dockerfile | 4 ++-- 10/slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 6/Dockerfile | 4 ++-- 6/alpine/Dockerfile | 4 ++-- 6/slim/Dockerfile | 4 ++-- 6/stretch/Dockerfile | 4 ++-- 8/Dockerfile | 4 ++-- 8/alpine/Dockerfile | 4 ++-- 8/slim/Dockerfile | 4 ++-- 8/stretch/Dockerfile | 4 ++-- 9/Dockerfile | 4 ++-- 9/alpine/Dockerfile | 4 ++-- 9/slim/Dockerfile | 4 ++-- 9/stretch/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- Dockerfile-slim.template | 4 ++-- Dockerfile-stretch.template | 4 ++-- Dockerfile.template | 4 ++-- chakracore/10/Dockerfile | 4 ++-- chakracore/8/Dockerfile | 4 ++-- chakracore/Dockerfile.template | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index 52805364d3..f555fb47cf 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 5717c315e3..b1c184d1ee 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 01510923e9..39eed10839 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 5969b23967..f7bee856f2 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/6/Dockerfile b/6/Dockerfile index ba6ed496e4..45d32cf770 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 706f1dfea7..146691e99a 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 0c0291a0a8..c9fdec47d5 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 2d78990cd8..0140de18f4 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/8/Dockerfile b/8/Dockerfile index a702cebf73..7e21ac2ed7 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 1f8d7bdd07..d7eeec4907 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 6718cfc99d..5e3fac7ac0 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index ba323eb468..d578b70d7b 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/9/Dockerfile b/9/Dockerfile index 1f7245afc9..45361e1972 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 56fe9af060..29946ae1fc 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -31,8 +31,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 41933cb8b9..e901eca0bf 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -36,8 +36,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index cff856424b..c126963733 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -32,8 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 128f1961f0..48d5c4981d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -24,8 +24,8 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index e48317a880..962418ab87 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -29,8 +29,8 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 0bcd6534fb..e9b5d85b4d 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -25,8 +25,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/Dockerfile.template b/Dockerfile.template index edfe023ba3..db13d085b6 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -25,8 +25,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && curl -fsSLO "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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index 0da1f7fb8e..f24bb77bea 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/Dockerfile @@ -10,8 +10,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && curl -fsSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index 707cc5b5d7..755e726ecd 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/Dockerfile @@ -10,8 +10,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && curl -fsSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index 4053793799..307b0a286e 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -10,8 +10,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -sSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -sSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ + && curl -fsSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ From 947280600648b70e067d35415d6812fd03127def Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Fri, 18 May 2018 10:57:40 -0400 Subject: [PATCH 102/818] curl: always use --compressed flag --- 10/Dockerfile | 2 +- 10/alpine/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 6/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 6/slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 8/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 8/slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 9/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-slim.template | 2 +- Dockerfile-stretch.template | 2 +- Dockerfile.template | 2 +- chakracore/10/Dockerfile | 2 +- chakracore/8/Dockerfile | 2 +- chakracore/Dockerfile.template | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index f555fb47cf..1da2c50bf4 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index b1c184d1ee..5414415583 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -31,7 +31,7 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 39eed10839..65c71a9c19 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -36,7 +36,7 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index f7bee856f2..e84be52d57 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/6/Dockerfile b/6/Dockerfile index 45d32cf770..afab4334ce 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 146691e99a..1e262a174f 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -31,7 +31,7 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index c9fdec47d5..258a4436af 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -36,7 +36,7 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 0140de18f4..676b6163a8 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/8/Dockerfile b/8/Dockerfile index 7e21ac2ed7..d6a751b75c 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index d7eeec4907..01796106cb 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -31,7 +31,7 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 5e3fac7ac0..893c6f4425 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -36,7 +36,7 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index d578b70d7b..26e7c4cb23 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/9/Dockerfile b/9/Dockerfile index 45361e1972..56b8fc9e48 100644 --- a/9/Dockerfile +++ b/9/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index 29946ae1fc..e2857c055f 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -31,7 +31,7 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index e901eca0bf..7cb7d364fe 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -36,7 +36,7 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index c126963733..7896d424ed 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -32,7 +32,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 48d5c4981d..94f2fad2b9 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -24,7 +24,7 @@ RUN addgroup -g 1000 node \ gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done \ - && curl -fsSLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \ + && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 962418ab87..7acdd44b67 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -29,7 +29,7 @@ RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index e9b5d85b4d..4bdf7193f6 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -25,7 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/Dockerfile.template b/Dockerfile.template index db13d085b6..947612df17 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -25,7 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "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/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 \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index f24bb77bea..e0691bdac9 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/Dockerfile @@ -10,7 +10,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index 755e726ecd..f0913eb708 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/Dockerfile @@ -10,7 +10,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index 307b0a286e..f8863ea4e6 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -10,7 +10,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ amd64) ARCH='x64';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && curl -fsSLO "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ From 64629c613b59edfe0a647059c58d0de9045d4dfe Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 18 May 2018 11:55:43 -0400 Subject: [PATCH 103/818] More coding style fixes --- update.sh | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/update.sh b/update.sh index 1f53cfc44e..0cb0bef356 100755 --- a/update.sh +++ b/update.sh @@ -48,17 +48,17 @@ function update_node_version() { shift fi - fullVersion="$(curl -sSL --compressed "$baseuri" | grep '>.travis.yml + - NODE_VERSION: "'"${version}"'" + - VARIANT: "'"${variant}"'"' >>.travis.yml } echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### @@ -103,18 +101,18 @@ echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories - [ -f "$version/Dockerfile" ] || continue + [ -f "${version}/Dockerfile" ] || continue parentpath=$(dirname "$version") versionnum=$(basename "$version") baseuri=$(get_config "$parentpath" "baseuri") update=$(in_versions_to_update "$version") - add_stage "$baseuri" "$version" "default" + add_stage "${baseuri}" "${version}" "default" - if [ "$update" -eq 0 ]; then + if [ "${update}" -eq 0 ]; then info "Updating version $version..." - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile.template" "$version/Dockerfile" & + update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & fi # Get supported variants according the target architecture @@ -123,11 +121,11 @@ for version in "${versions[@]}"; do for variant in "${variants[@]}"; do # Skip non-docker directories - [ -f "$version/$variant/Dockerfile" ] || continue - add_stage "$baseuri" "$version" "$variant" + [ -f "${version}/${variant}/Dockerfile" ] || continue + add_stage "${baseuri}" "${version}" "${variant}" - if [ "$update" -eq 0 ]; then - update_node_version "$baseuri" "$versionnum" "$parentpath/Dockerfile-$variant.template" "$version/$variant/Dockerfile" "$variant" & + if [ "${update}" -eq 0 ]; then + update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile-${variant}.template" "${version}/${variant}/Dockerfile" "${variant}" & fi done done From 9bd00c484c2c22b48d641fd44d7fcb7b9ffc8d52 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 17 May 2018 14:06:58 -0400 Subject: [PATCH 104/818] Simplify the management of alpine version Standardizes the alpine version to use and helps upgrade the alpine version only on version update --- Dockerfile-alpine.template | 2 +- config | 1 + update.sh | 9 ++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 94f2fad2b9..69f932c196 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM alpine:3.4 +FROM alpine:0.0 ENV NODE_VERSION 0.0.0 diff --git a/config b/config index 31f0b8a992..5b8db12664 100644 --- a/config +++ b/config @@ -1 +1,2 @@ baseuri https://nodejs.org/dist +alpine_version 3.7 diff --git a/update.sh b/update.sh index 0cb0bef356..df4ea31911 100755 --- a/update.sh +++ b/update.sh @@ -42,7 +42,7 @@ function update_node_version() { shift local dockerfile=$1 shift - local variant + local variant="" if [ $# -eq 1 ]; then variant=$1 shift @@ -73,10 +73,9 @@ function update_node_version() { sed -Ei -e "/${pattern}/d" "${dockerfile}" done - if [ "${version/.*/}" -ge 10 ]; then - sed -Ei -e 's/FROM (.*)alpine:3.4/FROM \1alpine:3.7/' "${dockerfile}" - elif [ "${version/.*/}" -ge 8 ] || [ "$arch" = "ppc64le" ] || [ "$arch" = "s390x" ] || [ "$arch" == "arm64" ] || [ "$arch" == "arm32v7" ]; then - sed -Ei -e 's/FROM (.*)alpine:3.4/FROM \1alpine:3.6/' "${dockerfile}" + if [ "${variant}" = "alpine" ]; then + alpine_version=$(get_config "./" "alpine_version") + sed -Ei "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}" fi ) } From 772f98bd6e293078722cbdef5dea3b6b6fa69a3f Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 23 May 2018 19:59:57 -0400 Subject: [PATCH 105/818] Update for Node.js v10.2.0 Includes Yarn update for 1.7.0 --- 10/Dockerfile | 4 ++-- 10/alpine/Dockerfile | 4 ++-- 10/slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index 1da2c50bf4..7fa7cda420 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.1.0 +ENV NODE_VERSION 10.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.7.0 RUN set -ex \ && for key in \ diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 5414415583..0573a2c883 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.1.0 +ENV NODE_VERSION 10.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -45,7 +45,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.7.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 65c71a9c19..b57810fc9e 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.1.0 +ENV NODE_VERSION 10.2.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.7.0 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index e84be52d57..3fbc33525d 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.1.0 +ENV NODE_VERSION 10.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.7.0 RUN set -ex \ && for key in \ From 7161f8712b67e26e2a6700dc667add2e56e02225 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 23 May 2018 22:29:25 -0400 Subject: [PATCH 106/818] Fix typo with ${IMAGES_FILE } variable reference --- generate-stackbrew-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 968f8bd6a3..8d1c33550b 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -118,7 +118,7 @@ if updated; then cd $gitpath - echo "${stackbrew}" >"{$IMAGES_FILE}" + echo "${stackbrew}" >"${IMAGES_FILE}" git checkout -b "${BRANCH_NAME}" git add "${IMAGES_FILE}" git commit -m "$(message)" From fb8ac15c9c606e15cd7f37074d62061c39d1a6cb Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 21 May 2018 23:05:00 -0400 Subject: [PATCH 107/818] More code style fixes (again) --- functions.sh | 16 ++++++++-------- generate-stackbrew-library.sh | 6 +++--- generate-stackbrew-pr.sh | 36 +++++++++++++++++------------------ test-image.sh | 2 +- update.sh | 32 +++++++++++++++---------------- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/functions.sh b/functions.sh index eb738561d9..732eb81575 100755 --- a/functions.sh +++ b/functions.sh @@ -67,8 +67,8 @@ function get_variants() { if [ ${#variantsfilter[@]} -gt 0 ]; then for variant1 in "${availablevariants[@]}"; do for variant2 in "${variantsfilter[@]}"; do - if [ "$variant1" = "$variant2" ]; then - variants+=("$variant1") + if [ "${variant1}" = "${variant2}" ]; then + variants+=("${variant1}") fi done done @@ -100,11 +100,11 @@ function get_supported_arches() { shift # Get default supported arches - lines=$(grep "$variant" "$(dirname "${version}")"/architectures 2>/dev/null | cut -d' ' -f1) + lines=$(grep "${variant}" "$(dirname "${version}")"/architectures 2>/dev/null | cut -d' ' -f1) # Get version specific supported architectures if there is specialized information if [ -a "${version}"/architectures ]; then - lines=$(grep "$variant" "${version}"/architectures 2>/dev/null | cut -d' ' -f1) + lines=$(grep "${variant}" "${version}"/architectures 2>/dev/null | cut -d' ' -f1) fi while IFS='' read -r line; do @@ -123,12 +123,12 @@ function get_config() { shift local name - name=$1 + name=${1} shift local value - value=$(grep "^$name" "${dir}/config" | sed -E 's/'"$name"'[[:space:]]*//') - echo "$value" + value=$(grep "^${name}" "${dir}/config" | sed -E 's/'"${name}"'[[:space:]]*//') + echo "${value}" } # Get available versions for a given path @@ -154,7 +154,7 @@ function get_versions() { local subdirs IFS=' ' read -ra subdirs <<<"$(get_versions "${dir#./}")" for subdir in "${subdirs[@]}"; do - versions+=("$subdir") + versions+=("${subdir}") done elif [ -a "${dir}/Dockerfile" ]; then versions+=("${dir#./}") diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 82f60848f0..6fde44a20e 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -48,12 +48,12 @@ join() { } get_stub() { - local version="$1" + local version="${1}" shift IFS='/' read -ra versionparts <<<"${version}" local stub eval stub="$(join '_' "${versionparts[@]}" | awk -F. '{ print "$array_" $1 }')" - echo "$stub" + echo "${stub}" } for version in "${versions[@]}"; do @@ -85,7 +85,7 @@ for version in "${versions[@]}"; do commit="$(fileCommit "${version}/${variant}")" slash='/' - variantAliases=("${versionAliases[@]/%/-${variant//$slash/-}}") + variantAliases=("${versionAliases[@]/%/-${variant//${slash}/-}}") variantAliases=("${variantAliases[@]//latest-/}") # Get supported architectures for a specific version and variant. # See details in function.sh diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 8d1c33550b..924842762c 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -3,14 +3,14 @@ set -e . functions.sh -if [ -z "$1" ]; then - COMMIT_ID="$TRAVIS_COMMIT" - COMMIT_MESSAGE="$TRAVIS_COMMIT_MESSAGE" - BRANCH_NAME="travis-$TRAVIS_BUILD_ID" +if [ -z "${1}" ]; then + COMMIT_ID="${TRAVIS_COMMIT}" + COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE}" + BRANCH_NAME="travis-${TRAVIS_BUILD_ID}" GITHUB_USERNAME="nodejs-github-bot" else - COMMIT_ID="$1" - COMMIT_MESSAGE="$(git show -s --format=%B "$1")" + COMMIT_ID="${1}" + COMMIT_MESSAGE="$(git show -s --format=%B "${COMMIT_ID}")" BRANCH_NAME="travis-$(date +%s)" if [[ "$(git remote get-url origin)" =~ github.com/([^/]*)/docker-node.git ]]; then GITHUB_USERNAME="${BASH_REMATCH[1]}" @@ -41,18 +41,18 @@ function updated() { )" images_changed=$(git diff --name-only "${COMMIT_ID}".."${COMMIT_ID}"~1 "${versions[@]}") - if [ -z "$images_changed" ]; then + if [ -z "${images_changed}" ]; then return 1 fi return 0 } function auth_header() { - echo "Authorization: token $GITHUB_API_TOKEN" + echo "Authorization: token ${GITHUB_API_TOKEN}" } function permission_check() { - if [ -z "$GITHUB_API_TOKEN" ]; then + if [ -z "${GITHUB_API_TOKEN}" ]; then fatal "Environment variable \$GITHUB_API_TOKEN is missing or empty" fi @@ -60,14 +60,14 @@ function permission_check() { -s \ "https://api.github.com")" - if [ "$(echo "$auth" | jq -r .message)" = "Bad credentials" ]; then + if [ "$(echo "${auth}" | jq -r .message)" = "Bad credentials" ]; then fatal "Authentication Failed! Invalid \$GITHUB_API_TOKEN" fi auth="$(curl -H "$(auth_header)" \ -s \ "https://api.github.com/repos/${ORIGIN_SLUG}/collaborators/${GITHUB_USERNAME}/permission")" - if [ "$(echo "$auth" | jq -r .message)" != "null" ]; then + if [ "$(echo "${auth}" | jq -r .message)" != "null" ]; then fatal "\$GITHUB_API_TOKEN can't push to https://github.com/${ORIGIN_SLUG}.git" fi } @@ -98,7 +98,7 @@ function pr_payload() { function comment_payload() { local pr_url - pr_url="$1" + pr_url="${1}" echo "{ 'body': 'Created PR to the ${REPO_NAME} repo (${pr_url})' }" @@ -116,7 +116,7 @@ if updated; then stackbrew="$(./generate-stackbrew-library.sh)" - cd $gitpath + cd ${gitpath} echo "${stackbrew}" >"${IMAGES_FILE}" git checkout -b "${BRANCH_NAME}" @@ -126,7 +126,7 @@ if updated; then info "Pushing..." git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" 2>/dev/null || fatal "Error pushing the updated stackbrew" - cd - && rm -rf $gitpath + cd - && rm -rf ${gitpath} info "Creating Pull request" pr_response_payload="$(curl -H "$(auth_header)" \ @@ -136,8 +136,8 @@ if updated; then "https://api.github.com/repos/${UPSTREAM_SLUG}/pulls")" url="$(echo "${pr_response_payload}" | jq -r .html_url)" - if [ "$url" != "null" ]; then - info "Pull request created at $url" + if [ "${url}" != "null" ]; then + info "Pull request created at ${url}" if [ ! -z "${PR_NUMBER}" ]; then comment_endpoint="https://api.github.com/repos/${DOCKER_SLUG}/issues/${PR_NUMBER}/comments" @@ -149,8 +149,8 @@ if updated; then commit_response_payload="$(curl -H "$(auth_header)" \ -s \ -X POST \ - -d "$(comment_payload "$url")" \ - "$comment_endpoint")" + -d "$(comment_payload "${url}")" \ + "${comment_endpoint}")" if [ "$(echo "${commit_response_payload}" | jq -r .message)" != "null" ]; then fatal "Error linking the pull request (${error_message})" diff --git a/test-image.sh b/test-image.sh index bbcc8db3ed..5f257a1f06 100755 --- a/test-image.sh +++ b/test-image.sh @@ -1,5 +1,5 @@ #!/bin/sh -if [ "$(node -e "process.stdout.write(process.versions.node)")" != "$1" ]; then +if [ "$(node -e "process.stdout.write(process.versions.node)")" != "${1}" ]; then echo "Test for node failed!" exit 1 fi diff --git a/update.sh b/update.sh index df4ea31911..3d419d0367 100755 --- a/update.sh +++ b/update.sh @@ -34,17 +34,17 @@ function in_versions_to_update() { function update_node_version() { - local baseuri=$1 + local baseuri=${1} shift - local version=$1 + local version=${1} shift - local template=$1 + local template=${1} shift - local dockerfile=$1 + local dockerfile=${1} shift local variant="" if [ $# -eq 1 ]; then - variant=$1 + variant=${1} shift fi @@ -58,7 +58,7 @@ function update_node_version() { sed -Ei -e 's/^FROM (.*)/FROM '"${fromprefix}"'\1/' "${dockerfile}" sed -Ei -e 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"${version}.${fullVersion:-0}"'/' "${dockerfile}" - sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "$dockerfile" + sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}" # shellcheck disable=SC1004 new_line=' \\\ @@ -69,7 +69,7 @@ function update_node_version() { while read -r line; do pattern="\"\\$\\{$(echo "${key_type}" | tr '[:lower:]' '[:upper:]')_KEYS\\[@\\]\\}\"" sed -Ei -e "s/([ \\t]*)(${pattern})/\\1${line}${new_line}\\1\\2/" "${dockerfile}" - done <"keys/$key_type.keys" + done <"keys/${key_type}.keys" sed -Ei -e "/${pattern}/d" "${dockerfile}" done @@ -81,11 +81,11 @@ function update_node_version() { } function add_stage() { - local baseuri=$1 + local baseuri=${1} shift - local version=$1 + local version=${1} shift - local variant=$1 + local variant=${1} shift echo ' @@ -102,21 +102,21 @@ for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories [ -f "${version}/Dockerfile" ] || continue - parentpath=$(dirname "$version") - versionnum=$(basename "$version") - baseuri=$(get_config "$parentpath" "baseuri") - update=$(in_versions_to_update "$version") + parentpath=$(dirname "${version}") + versionnum=$(basename "${version}") + baseuri=$(get_config "${parentpath}" "baseuri") + update=$(in_versions_to_update "${version}") add_stage "${baseuri}" "${version}" "default" if [ "${update}" -eq 0 ]; then - info "Updating version $version..." + info "Updating version ${version}..." update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & fi # Get supported variants according the target architecture # See details in function.sh - IFS=' ' read -ra variants <<<"$(get_variants "$parentpath")" + IFS=' ' read -ra variants <<<"$(get_variants "${parentpath}")" for variant in "${variants[@]}"; do # Skip non-docker directories From 46b4159599d75f3520b9edf190f9ab0eaaa136a2 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 24 May 2018 02:41:50 -0400 Subject: [PATCH 108/818] Fixed the update script for mac OS --- update.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index df4ea31911..79da45fa18 100755 --- a/update.sh +++ b/update.sh @@ -75,7 +75,12 @@ function update_node_version() { if [ "${variant}" = "alpine" ]; then alpine_version=$(get_config "./" "alpine_version") - sed -Ei "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}" + sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}" + fi + + # Required for POSIX sed + if [ -f "${dockerfile}-e" ]; then + rm "${dockerfile}-e" fi ) } From 384512d45794367e0da3c4721559ae9e9ce9412e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 25 May 2018 03:12:57 +0800 Subject: [PATCH 109/818] Update chakracore to v10.1.0 with Yarn v1.7.0 --- chakracore/10/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index e0691bdac9..5842858f15 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/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 -ENV NODE_VERSION 10.0.0 +ENV NODE_VERSION 10.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.7.0 RUN set -ex \ && for key in \ From 5bfc806e0e27d497bfcb1f5afe62261800765f8e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 22 May 2018 15:34:43 +0800 Subject: [PATCH 110/818] Improve architectures file readability [ci skip] --- 6/architectures | 12 ++++++------ architectures | 2 +- chakracore/architectures | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/6/architectures b/6/architectures index 4af17c2a85..4c3285054c 100644 --- a/6/architectures +++ b/6/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants -amd64 default,alpine,onbuild,slim,stretch -ppc64le default,onbuild,slim,stretch -s390x default,onbuild,slim,stretch -arm64v8 default,onbuild,slim,stretch -arm32v7 default,onbuild,slim,stretch -i386 default,onbuild,slim,stretch +arm32v7 default,onbuild,slim,stretch +arm64v8 default,onbuild,slim,stretch +amd64 default,alpine,onbuild,slim,stretch +i386 default,onbuild,slim,stretch +ppc64le default,onbuild,slim,stretch +s390x default,onbuild,slim,stretch diff --git a/architectures b/architectures index 1583bbc6f9..55710f8241 100644 --- a/architectures +++ b/architectures @@ -1,3 +1,4 @@ +bashbrew-arch variants arm32v6 alpine arm32v7 default,onbuild,slim,stretch arm64v8 default,alpine,onbuild,slim,stretch @@ -5,4 +6,3 @@ amd64 default,alpine,onbuild,slim,stretch i386 default,alpine,onbuild,slim,stretch ppc64le default,alpine,onbuild,slim,stretch s390x default,alpine,onbuild,slim,stretch -bashbrew-arch variants diff --git a/chakracore/architectures b/chakracore/architectures index 43cefa9b9c..85bd3bd021 100644 --- a/chakracore/architectures +++ b/chakracore/architectures @@ -1,2 +1,2 @@ bashbrew-arch variants -amd64 default +amd64 default From bd74777e9e5c89685146d4963b6bb78970dd2133 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Thu, 24 May 2018 20:19:17 -0400 Subject: [PATCH 111/818] Update for Node.js v10.2.1 (#759) See: https://nodejs.org/en/blog/release/v10.2.1/ --- 10/Dockerfile | 2 +- 10/alpine/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index 7fa7cda420..7a022bd1d4 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.2.0 +ENV NODE_VERSION 10.2.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 0573a2c883..931a21b3a2 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.2.0 +ENV NODE_VERSION 10.2.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index b57810fc9e..94777db72d 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.2.0 +ENV NODE_VERSION 10.2.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 3fbc33525d..2e9c6dbfa1 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.2.0 +ENV NODE_VERSION 10.2.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 7fea7b033c5a292dd74199d2ba0fbb161f75aa0d Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 30 Apr 2018 14:08:40 -0400 Subject: [PATCH 112/818] Don't use a default variant tenp --- .travis.yml | 8 +++--- 10/{ => jessie}/Dockerfile | 0 6/architectures | 12 ++++----- 6/{ => jessie}/Dockerfile | 0 8/{ => jessie}/Dockerfile | 0 9/{ => jessie}/Dockerfile | 0 ...ile.template => Dockerfile-jessie.template | 0 architectures | 12 ++++----- config | 1 + functions.sh | 14 +++++++++-- generate-stackbrew-library.sh | 25 +++++++++++++------ test-build.sh | 16 +++++++----- update.sh | 19 +++++++------- 13 files changed, 65 insertions(+), 42 deletions(-) rename 10/{ => jessie}/Dockerfile (100%) rename 6/{ => jessie}/Dockerfile (100%) rename 8/{ => jessie}/Dockerfile (100%) rename 9/{ => jessie}/Dockerfile (100%) rename Dockerfile.template => Dockerfile-jessie.template (100%) diff --git a/.travis.yml b/.travis.yml index 85a49c849d..7d9cd77f0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ jobs: - stage: Build env: - NODE_VERSION: "10" - - VARIANT: "default" + - VARIANT: "jessie" - stage: Build env: @@ -107,7 +107,7 @@ jobs: - stage: Build env: - NODE_VERSION: "6" - - VARIANT: "default" + - VARIANT: "jessie" - stage: Build env: @@ -132,7 +132,7 @@ jobs: - stage: Build env: - NODE_VERSION: "8" - - VARIANT: "default" + - VARIANT: "jessie" - stage: Build env: @@ -157,7 +157,7 @@ jobs: - stage: Build env: - NODE_VERSION: "9" - - VARIANT: "default" + - VARIANT: "jessie" - stage: Build env: diff --git a/10/Dockerfile b/10/jessie/Dockerfile similarity index 100% rename from 10/Dockerfile rename to 10/jessie/Dockerfile diff --git a/6/architectures b/6/architectures index 4c3285054c..f6a7427404 100644 --- a/6/architectures +++ b/6/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants -arm32v7 default,onbuild,slim,stretch -arm64v8 default,onbuild,slim,stretch -amd64 default,alpine,onbuild,slim,stretch -i386 default,onbuild,slim,stretch -ppc64le default,onbuild,slim,stretch -s390x default,onbuild,slim,stretch +arm32v7 jessie,onbuild,slim,stretch +arm64v8 jessie,onbuild,slim,stretch +amd64 jessie,alpine,onbuild,slim,stretch +i386 jessie,onbuild,slim,stretch +ppc64le jessie,onbuild,slim,stretch +s390x jessie,onbuild,slim,stretch diff --git a/6/Dockerfile b/6/jessie/Dockerfile similarity index 100% rename from 6/Dockerfile rename to 6/jessie/Dockerfile diff --git a/8/Dockerfile b/8/jessie/Dockerfile similarity index 100% rename from 8/Dockerfile rename to 8/jessie/Dockerfile diff --git a/9/Dockerfile b/9/jessie/Dockerfile similarity index 100% rename from 9/Dockerfile rename to 9/jessie/Dockerfile diff --git a/Dockerfile.template b/Dockerfile-jessie.template similarity index 100% rename from Dockerfile.template rename to Dockerfile-jessie.template diff --git a/architectures b/architectures index 55710f8241..1a9b7a2dd8 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine -arm32v7 default,onbuild,slim,stretch -arm64v8 default,alpine,onbuild,slim,stretch -amd64 default,alpine,onbuild,slim,stretch -i386 default,alpine,onbuild,slim,stretch -ppc64le default,alpine,onbuild,slim,stretch -s390x default,alpine,onbuild,slim,stretch +arm32v7 jessie,onbuild,slim,stretch +arm64v8 jessie,alpine,onbuild,slim,stretch +amd64 jessie,alpine,onbuild,slim,stretch +i386 jessie,alpine,onbuild,slim,stretch +ppc64le jessie,alpine,onbuild,slim,stretch +s390x jessie,alpine,onbuild,slim,stretch diff --git a/config b/config index 5b8db12664..20c5522593 100644 --- a/config +++ b/config @@ -1,2 +1,3 @@ baseuri https://nodejs.org/dist +default_variant jessie alpine_version 3.7 diff --git a/functions.sh b/functions.sh index 732eb81575..ea27136007 100755 --- a/functions.sh +++ b/functions.sh @@ -145,6 +145,9 @@ function get_versions() { local versions local dirs=("$@") + + local default_variant + default_variant=$(get_config "./" "default_variant") if [ ${#dirs[@]} -eq 0 ]; then IFS=' ' read -ra dirs <<<"$(echo "${prefix%/}/"*/)" fi @@ -156,7 +159,7 @@ function get_versions() { for subdir in "${subdirs[@]}"; do versions+=("${subdir}") done - elif [ -a "${dir}/Dockerfile" ]; then + elif [ -a "${dir}/Dockerfile" ] || [ -a "${dir}/${default_variant}/Dockerfile" ]; then versions+=("${dir#./}") fi done @@ -182,7 +185,14 @@ function get_full_version() { version=$1 shift - grep -m1 'ENV NODE_VERSION ' "${version}/Dockerfile" | cut -d' ' -f3 + local default_dockerfile + if [ -f "${version}/${default_variant}/Dockerfile" ]; then + default_dockerfile="${version}/${default_variant}/Dockerfile" + else + default_dockerfile="${version}/Dockerfile" + fi + + grep -m1 'ENV NODE_VERSION ' "${default_dockerfile}" | cut -d' ' -f3 } function get_major_minor_version() { diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 6fde44a20e..e2ac5b393f 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -19,6 +19,8 @@ array_chakracore_8='chakracore-8' # shellcheck disable=SC2034 array_chakracore_10='chakracore-10 chakracore' +default_variant=$(get_config "./" "default_variant") + cd "$(cd "${0%/*}" && pwd -P)" self="$(basename "${BASH_SOURCE[0]}")" @@ -58,7 +60,7 @@ get_stub() { for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories - [ -f "${version}/Dockerfile" ] || continue + [ -f "${version}/Dockerfile" ] || [ -f "${version}/${default_variant}/Dockerfile" ] || continue stub=$(get_stub "${version}") commit="$(fileCommit "${version}")" @@ -66,14 +68,17 @@ for version in "${versions[@]}"; do majorMinorVersion="$(get_tag "${version}" majorminor)" IFS=' ' read -ra versionAliases <<<"$fullVersion $majorMinorVersion $stub" - # Get supported architectures for a specific version. See details in function.sh - IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "${version}" "default")" - echo "Tags: $(join ', ' "${versionAliases[@]}")" - echo "Architectures: $(join ', ' "${supportedArches[@]}")" - echo "GitCommit: ${commit}" - echo "Directory: ${version}" - echo + if [ -f "${version}/Dockerfile" ]; then + # Get supported architectures for a specific version. See details in function.sh + IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "${version}" "default")" + + echo "Tags: $(join ', ' "${versionAliases[@]}")" + echo "Architectures: $(join ', ' "${supportedArches[@]}")" + echo "GitCommit: ${commit}" + echo "Directory: ${version}" + echo + fi # Get supported variants according to the target architecture. # See details in function.sh @@ -87,6 +92,10 @@ for version in "${versions[@]}"; do slash='/' variantAliases=("${versionAliases[@]/%/-${variant//${slash}/-}}") variantAliases=("${variantAliases[@]//latest-/}") + if [ "${variant}" = "${default_variant}" ]; then + variantAliases+=("${versionAliases[@]}") + fi + # Get supported architectures for a specific version and variant. # See details in function.sh IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "${version}" "${variant}")" diff --git a/test-build.sh b/test-build.sh index 65416568b4..e76787d380 100755 --- a/test-build.sh +++ b/test-build.sh @@ -12,6 +12,8 @@ set -uo pipefail IFS=',' read -ra versions_arg <<<"${1:-}" IFS=',' read -ra variant_arg <<<"${2:-}" +default_variant=$(get_config "./" "default_variant") + function build() { local version local tag @@ -28,6 +30,9 @@ function build() { if [ -z "${variant}" ]; then full_tag="${tag}" path="${version}/${variant}" + elif [ "${variant}" = "default" ]; then + full_tag="${tag}" + path="${version}" else full_tag="${tag}-${variant}" path="${version}/${variant}" @@ -53,7 +58,7 @@ fi for version in "${versions[@]}"; do # Skip "docs" and other non-docker directories - [ -f "${version}/Dockerfile" ] || continue + [ -f "${version}/Dockerfile" ] || [ -a "${version}/${default_variant}/Dockerfile" ] || continue tag=$(get_tag "${version}") full_version=$(get_full_version "${version}") @@ -62,15 +67,14 @@ for version in "${versions[@]}"; do # See details in function.sh IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")" - # Only build the default Dockerfile if "default" is in the variant list - if [[ "${variants[*]}" =~ "default" ]] || [[ "${variants[*]}" =~ "onbuild" ]]; then - build "${version}" "" "${tag}" - fi - for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue + if [ "${variant}" = "onbuild" ]; then + build "${version}" "${default_variant}" "$tag" + fi + build "${version}" "${variant}" "${tag}" done diff --git a/update.sh b/update.sh index eff2004ae1..950fdbba87 100755 --- a/update.sh +++ b/update.sh @@ -104,25 +104,24 @@ echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### ' | cat - travis.yml.template >.travis.yml for version in "${versions[@]}"; do - # Skip "docs" and other non-docker directories - [ -f "${version}/Dockerfile" ] || continue - parentpath=$(dirname "${version}") versionnum=$(basename "${version}") baseuri=$(get_config "${parentpath}" "baseuri") update=$(in_versions_to_update "${version}") - add_stage "${baseuri}" "${version}" "default" - - if [ "${update}" -eq 0 ]; then - info "Updating version ${version}..." - update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & - fi - # Get supported variants according the target architecture # See details in function.sh IFS=' ' read -ra variants <<<"$(get_variants "${parentpath}")" + if [ -f "${version}/Dockerfile" ]; then + add_stage "${baseuri}" "${version}" "default" + + if [ "${update}" -eq 0 ]; then + info "Updating version ${version}..." + update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & + fi + fi + for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue From 11a62b615492325d4cbe4ebed29dc6813c6b6826 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 2 May 2018 14:23:04 -0400 Subject: [PATCH 113/818] Fixed the onbuild versions Explicitly define the debian version to use for onbuild --- 6/onbuild/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- Dockerfile-onbuild.template | 2 +- update.sh | 9 +++++++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 175902050b..23343a950b 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.14.2 +FROM node:6.14.2-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 38e63fc6c9..5dae691fa5 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.11.2 +FROM node:8.11.2-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index b04d80bd0a..ffac713500 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.11.1 +FROM node:9.11.1-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template index 59e58c9c61..5697066cb6 100644 --- a/Dockerfile-onbuild.template +++ b/Dockerfile-onbuild.template @@ -1,4 +1,4 @@ -FROM node:0.0.0 +FROM node:0.0.0-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/update.sh b/update.sh index 950fdbba87..65d1867c02 100755 --- a/update.sh +++ b/update.sh @@ -56,10 +56,15 @@ function update_node_version() { fromprefix="${arch}\\/" fi - sed -Ei -e 's/^FROM (.*)/FROM '"${fromprefix}"'\1/' "${dockerfile}" - sed -Ei -e 's/^(ENV NODE_VERSION |FROM .*node:).*/\1'"${version}.${fullVersion:-0}"'/' "${dockerfile}" + nodeVersion="${version}.${fullVersion:-0}" + + sed -Ei -e 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "${dockerfile}" + sed -Ei -e 's/^(ENV NODE_VERSION ).*/\1'"${nodeVersion}"'/' "${dockerfile}" sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}" + # Only for onbuild variant + sed -Ei -e 's/^(FROM .*node:)[^-]*(-.*)/\1'"${nodeVersion}"'\2/' "${dockerfile}" + # shellcheck disable=SC1004 new_line=' \\\ ' From aad561a10db6758f9e8eca006b13d69ec9467e3f Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 17 May 2018 14:27:45 -0400 Subject: [PATCH 114/818] Skip the images build when no images changed Implements #743 --- .travis.yml | 3 +++ functions.sh | 51 ++++++++++++++++++++++++++++++++++++++++ generate-stackbrew-pr.sh | 18 +------------- travis.yml.template | 3 +++ 4 files changed, 58 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85a49c849d..cce4de8ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,9 @@ addons: packages: - docker-ce +before_install: + - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate + script: ./test-build.sh $NODE_VERSION $VARIANT stages: diff --git a/functions.sh b/functions.sh index 732eb81575..795126e2f2 100755 --- a/functions.sh +++ b/functions.sh @@ -239,3 +239,54 @@ function sort_versions() { echo "${sorted[@]}" } + +function commit_range() { + local commit_id_end=${1} + shift + local commit_id_start=${1} + + if [ -z "${commit_id_start}" ]; then + if [ -z "${commit_id_end}" ]; then + echo "HEAD~1..HEAD" + elif [[ "${commit_id_end}" =~ .. ]]; then + echo "${commit_id_end}" + else + echo "${commit_id_end}~1..${commit_id_end}" + fi + else + echo "${commit_id_end}..${commit_id_start}" + fi +} + +function images_updated() { + local commit_range + local versions + local images_changed + + commit_range="$(commit_range "$@")" + + IFS=' ' read -ra versions <<<"$( + IFS=',' + get_versions + )" + images_changed=$(git diff --name-only "${commit_range}" "${versions[@]}") + + if [ -z "${images_changed}" ]; then + return 1 + fi + return 0 +} + +function tests_updated() { + local commit_range + local test_changed + + commit_range="$(commit_range "$@")" + + test_changed=$(git diff --name-only "${commit_range}" test*) + + if [ -z "${test_changed}" ]; then + return 1 + fi + return 0 +} diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 924842762c..894ae8121a 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -31,22 +31,6 @@ UPSTREAM_SLUG="docker-library/${REPO_NAME}" DOCKER_SLUG="nodejs/docker-node" gitpath="../${REPO_NAME}" -function updated() { - local versions - local images_changed - - IFS=' ' read -ra versions <<<"$( - IFS=',' - get_versions - )" - images_changed=$(git diff --name-only "${COMMIT_ID}".."${COMMIT_ID}"~1 "${versions[@]}") - - if [ -z "${images_changed}" ]; then - return 1 - fi - return 0 -} - function auth_header() { echo "Authorization: token ${GITHUB_API_TOKEN}" } @@ -104,7 +88,7 @@ function comment_payload() { }" } -if updated; then +if images_updated "${COMMIT_ID}"; then permission_check diff --git a/travis.yml.template b/travis.yml.template index 03716eded6..292951a000 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -10,6 +10,9 @@ addons: packages: - docker-ce +before_install: + - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate + script: ./test-build.sh $NODE_VERSION $VARIANT stages: From bffff57751a276096a35d9a3041c4412986d6e12 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Sat, 26 May 2018 23:01:32 -0400 Subject: [PATCH 115/818] Speed up the skipping of the build --- .travis.yml | 7 ------- travis.yml.template | 7 ------- 2 files changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index cce4de8ea3..de06d43296 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,6 @@ sudo: false language: generic -services: - - docker -addons: - apt: - packages: - - docker-ce - before_install: - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate diff --git a/travis.yml.template b/travis.yml.template index 292951a000..955e3ee067 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -3,13 +3,6 @@ sudo: false language: generic -services: - - docker -addons: - apt: - packages: - - docker-ce - before_install: - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate From f76ebfb93638f99611295653b5fceca1a36b0188 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 28 May 2018 11:16:47 -0400 Subject: [PATCH 116/818] Fixed the update not outputing the version numbers on update --- update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 65d1867c02..45ba33e93f 100755 --- a/update.sh +++ b/update.sh @@ -114,6 +114,8 @@ for version in "${versions[@]}"; do baseuri=$(get_config "${parentpath}" "baseuri") update=$(in_versions_to_update "${version}") + [ "${update}" -eq 0 ] && info "Updating version ${version}..." + # Get supported variants according the target architecture # See details in function.sh IFS=' ' read -ra variants <<<"$(get_variants "${parentpath}")" @@ -122,7 +124,6 @@ for version in "${versions[@]}"; do add_stage "${baseuri}" "${version}" "default" if [ "${update}" -eq 0 ]; then - info "Updating version ${version}..." update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & fi fi From 397a9f52feb3364688760e9c0641cff1605b6de3 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 30 May 2018 01:55:51 +0800 Subject: [PATCH 117/818] Revert "Speed up the skipping of the build" This reverts commit bffff57751a276096a35d9a3041c4412986d6e12. The original commit breaks Docker service on Travis CI --- .travis.yml | 7 +++++++ travis.yml.template | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.travis.yml b/.travis.yml index 54dd99f043..5babee07b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,13 @@ sudo: false language: generic +services: + - docker +addons: + apt: + packages: + - docker-ce + before_install: - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate diff --git a/travis.yml.template b/travis.yml.template index 955e3ee067..292951a000 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -3,6 +3,13 @@ sudo: false language: generic +services: + - docker +addons: + apt: + packages: + - docker-ce + before_install: - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate From bbae51a013b0ebef90afcd6d2ea2ac49697d3823 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 30 May 2018 01:44:15 +0800 Subject: [PATCH 118/818] Update node.js v10.x to v10.3.0 - https://github.com/nodejs/node/releases/tag/v10.3.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.3.0 --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 931a21b3a2..753f367b7c 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.2.1 +ENV NODE_VERSION 10.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 7a022bd1d4..fc9486f263 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.2.1 +ENV NODE_VERSION 10.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 94777db72d..55d3db9378 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.2.1 +ENV NODE_VERSION 10.3.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 2e9c6dbfa1..7dfa51331e 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.2.1 +ENV NODE_VERSION 10.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9f135dc7b206a49dbd0fc684bd284d3b4a571629 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 31 May 2018 12:56:26 +0800 Subject: [PATCH 119/818] Adjust $TRAVIS_COMMIT_RANGE for git --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5babee07b5..cfc79a6bb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ addons: - docker-ce before_install: + - export TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate script: ./test-build.sh $NODE_VERSION $VARIANT From d3552375d3b9922e97bd7da2e73b2d402a0e60ee Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 1 Jun 2018 00:56:43 +0800 Subject: [PATCH 120/818] Drop Travis CI before_install temporarily We'll add it back until it works. --- .travis.yml | 4 ---- travis.yml.template | 3 --- 2 files changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfc79a6bb0..7d9cd77f0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,6 @@ addons: packages: - docker-ce -before_install: - - export TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" - - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate - script: ./test-build.sh $NODE_VERSION $VARIANT stages: diff --git a/travis.yml.template b/travis.yml.template index 292951a000..03716eded6 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -10,9 +10,6 @@ addons: packages: - docker-ce -before_install: - - source functions.sh && images_updated $TRAVIS_COMMIT_RANGE || tests_updated $TRAVIS_COMMIT_RANGE || travis_terminate - script: ./test-build.sh $NODE_VERSION $VARIANT stages: From 0c7b575b9b948ba8c650764e666f10ee2c9ab64b Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Thu, 31 May 2018 17:47:58 -0400 Subject: [PATCH 121/818] test-build.sh should have set -e This will cause the script to exit on failure when a command, like test-imagr.sh, fails. --- test-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-build.sh b/test-build.sh index e76787d380..4957a1fb56 100755 --- a/test-build.sh +++ b/test-build.sh @@ -2,7 +2,7 @@ # # Run a test build for all images. -set -uo pipefail +set -euo pipefail . functions.sh From 5a8088bab1c03314a37ee381103aac26f80680df Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Thu, 31 May 2018 17:49:15 -0400 Subject: [PATCH 122/818] Use exit code 1 for all tests. There's no real good reason why they were different and exit code 1 is pretty standard and well understood. --- test-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-image.sh b/test-image.sh index 5f257a1f06..e409e3bc3e 100755 --- a/test-image.sh +++ b/test-image.sh @@ -7,12 +7,12 @@ echo "Test for node succeeded." if ! npm --version >/dev/null; then echo "Test for npm failed!" - exit 2 + exit 1 fi echo "Test for npm succeeded." if ! yarn --version >/dev/null; then echo "Test of yarn failed!" - exit 3 + exit 1 fi echo "Test for yarn succeeded." From 218c30fd1b767c217a50e1e3595f0b423ccb6775 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 4 Jun 2018 10:48:18 -0400 Subject: [PATCH 123/818] Fixed the test build for chakracore Fixes #774 --- test-build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test-build.sh b/test-build.sh index 4957a1fb56..61861e9e0d 100755 --- a/test-build.sh +++ b/test-build.sh @@ -63,6 +63,11 @@ for version in "${versions[@]}"; do tag=$(get_tag "${version}") full_version=$(get_full_version "${version}") + # Required for chakracore + if [ -f "${version}/Dockerfile" ]; then + build "${version}" "default" "${tag}" + fi + # Get supported variants according to the target architecture. # See details in function.sh IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")" From 8efaa064853a2f866481f162eb4e424c5ee8ac9e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 6 Jun 2018 22:28:09 +0800 Subject: [PATCH 124/818] Update node.js v10.x to v10.4.0 --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 753f367b7c..3caf213ef7 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.3.0 +ENV NODE_VERSION 10.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index fc9486f263..501c6c7d15 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.3.0 +ENV NODE_VERSION 10.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 55d3db9378..3156fe2fe9 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.3.0 +ENV NODE_VERSION 10.4.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 7dfa51331e..6732d40e5d 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.3.0 +ENV NODE_VERSION 10.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5b5e7b6f28da1256846b9d500c98a8b4cf48130d Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 8 Jun 2018 09:09:39 -0400 Subject: [PATCH 125/818] Added the new gpg key for @targos Fixes #779 --- 10/alpine/Dockerfile | 1 + 10/jessie/Dockerfile | 1 + 10/slim/Dockerfile | 1 + 10/stretch/Dockerfile | 1 + 6/alpine/Dockerfile | 1 + 6/jessie/Dockerfile | 1 + 6/slim/Dockerfile | 1 + 6/stretch/Dockerfile | 1 + 8/alpine/Dockerfile | 1 + 8/jessie/Dockerfile | 1 + 8/slim/Dockerfile | 1 + 8/stretch/Dockerfile | 1 + 9/alpine/Dockerfile | 1 + 9/jessie/Dockerfile | 1 + 9/slim/Dockerfile | 1 + 9/stretch/Dockerfile | 1 + keys/node.keys | 1 + 17 files changed, 17 insertions(+) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 3caf213ef7..79a59e69c9 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -26,6 +26,7 @@ RUN addgroup -g 1000 node \ 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" || \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 501c6c7d15..4f15b8a669 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 3156fe2fe9..a7e91b396e 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 6732d40e5d..0f8529f965 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 1e262a174f..c0bbd152b0 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -26,6 +26,7 @@ RUN addgroup -g 1000 node \ 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" || \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index afab4334ce..9c71418e85 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 258a4436af..905a8c3caa 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 676b6163a8..8bc0c35dd2 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 01796106cb..f45c18e0b0 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -26,6 +26,7 @@ RUN addgroup -g 1000 node \ 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" || \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index d6a751b75c..5829e27ba6 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 893c6f4425..b527ee351d 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 26e7c4cb23..f1c8abea6e 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index e2857c055f..b07be74c76 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -26,6 +26,7 @@ RUN addgroup -g 1000 node \ 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" || \ diff --git a/9/jessie/Dockerfile b/9/jessie/Dockerfile index 56b8fc9e48..6ace35adba 100644 --- a/9/jessie/Dockerfile +++ b/9/jessie/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 7cb7d364fe..2f0d300165 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 7896d424ed..13c796f2fd 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -14,6 +14,7 @@ RUN set -ex \ 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" || \ diff --git a/keys/node.keys b/keys/node.keys index cf989eca57..c0b68fea00 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -6,3 +6,4 @@ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 B9AE9905FFD7803F25714661B63B535A4C206CA9 56730D5401028683275BD23C23EFEFE93C4CFFFE 77984A986EBC2AA786BC0F66B01FBB92821C587A +8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 From d160712addda7d29fd3bf6a2f5bac395ea7567e4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 9 Jun 2018 17:36:37 +0800 Subject: [PATCH 126/818] Use default Docker version on Travis CI instead of manual install --- .travis.yml | 4 ---- travis.yml.template | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d9cd77f0a..288ff95226 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,6 @@ language: generic services: - docker -addons: - apt: - packages: - - docker-ce script: ./test-build.sh $NODE_VERSION $VARIANT diff --git a/travis.yml.template b/travis.yml.template index 03716eded6..1ba109b88c 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -5,10 +5,6 @@ language: generic services: - docker -addons: - apt: - packages: - - docker-ce script: ./test-build.sh $NODE_VERSION $VARIANT From e3ec2111af089e31321e76641697e154b3b6a6c3 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 12 Jun 2018 14:35:23 -0400 Subject: [PATCH 127/818] Update latest versions for security release --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 6/jessie/Dockerfile | 2 +- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 8/jessie/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 9/alpine/Dockerfile | 2 +- 9/jessie/Dockerfile | 2 +- 9/onbuild/Dockerfile | 2 +- 9/slim/Dockerfile | 2 +- 9/stretch/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 79a59e69c9..73023a6caf 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.4.0 +ENV NODE_VERSION 10.4.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 4f15b8a669..cbb434d923 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.4.0 +ENV NODE_VERSION 10.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index a7e91b396e..33b577ca72 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.4.0 +ENV NODE_VERSION 10.4.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 0f8529f965..80a9b20478 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.4.0 +ENV NODE_VERSION 10.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index c0bbd152b0..c5609ea28a 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.14.2 +ENV NODE_VERSION 6.14.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index 9c71418e85..4d46649d2d 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.2 +ENV NODE_VERSION 6.14.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 23343a950b..d2f6311aca 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.14.2-jessie +FROM node:6.14.3-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 905a8c3caa..b50e8b65f4 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.2 +ENV NODE_VERSION 6.14.3 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 8bc0c35dd2..92096f8d3e 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.2 +ENV NODE_VERSION 6.14.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index f45c18e0b0..f678d6326a 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 8.11.2 +ENV NODE_VERSION 8.11.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 5829e27ba6..18cd8895f7 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.2 +ENV NODE_VERSION 8.11.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 5dae691fa5..cdb75f83b7 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.11.2-jessie +FROM node:8.11.3-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index b527ee351d..b41e1e336d 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.2 +ENV NODE_VERSION 8.11.3 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index f1c8abea6e..a61f0b190d 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.2 +ENV NODE_VERSION 8.11.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile index b07be74c76..53909306aa 100644 --- a/9/alpine/Dockerfile +++ b/9/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 9.11.1 +ENV NODE_VERSION 9.11.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/9/jessie/Dockerfile b/9/jessie/Dockerfile index 6ace35adba..ddd20fbe83 100644 --- a/9/jessie/Dockerfile +++ b/9/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.11.1 +ENV NODE_VERSION 9.11.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile index ffac713500..351704fb9a 100644 --- a/9/onbuild/Dockerfile +++ b/9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:9.11.1-jessie +FROM node:9.11.2-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile index 2f0d300165..b97190f868 100644 --- a/9/slim/Dockerfile +++ b/9/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.11.1 +ENV NODE_VERSION 9.11.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile index 13c796f2fd..db1a1692d0 100644 --- a/9/stretch/Dockerfile +++ b/9/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 9.11.1 +ENV NODE_VERSION 9.11.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b9dc6bbbaafdfe6c9cbc6caddec9cb54beb5f59b Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 18 Jun 2018 11:26:30 -0400 Subject: [PATCH 128/818] Fixed new shfmt issue --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 45ba33e93f..1d034e0ee7 100755 --- a/update.sh +++ b/update.sh @@ -72,7 +72,7 @@ function update_node_version() { # Add GPG keys for key_type in "node" "yarn"; do while read -r line; do - pattern="\"\\$\\{$(echo "${key_type}" | tr '[:lower:]' '[:upper:]')_KEYS\\[@\\]\\}\"" + pattern='"\$\{'$(echo "${key_type}" | tr '[:lower:]' '[:upper:]')'_KEYS\[@\]\}"' sed -Ei -e "s/([ \\t]*)(${pattern})/\\1${line}${new_line}\\1\\2/" "${dockerfile}" done <"keys/${key_type}.keys" sed -Ei -e "/${pattern}/d" "${dockerfile}" From 6e667df83a2a4f1d0cdb5313255848610325c4f4 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 18 Jun 2018 12:13:05 -0400 Subject: [PATCH 129/818] Pinned the version of shfmt --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 288ff95226..dd0ab1a3af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt@sha256:4eff05b54e87c11e8214848de3e5f4bb47a4241b99ac5c6554db5cc164015810 -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index 1ba109b88c..f18a4f7253 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -54,7 +54,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt@sha256:4eff05b54e87c11e8214848de3e5f4bb47a4241b99ac5c6554db5cc164015810 -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From d50660f9b46050fd71c7a77f5f58fb4f422bb9d1 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 12 Jun 2018 21:49:19 -0400 Subject: [PATCH 130/818] Add option to skip updating yarn and alpine when doing a security update --- update.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 11 deletions(-) diff --git a/update.sh b/update.sh index 1d034e0ee7..f318102564 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,46 @@ #!/bin/bash set -ue +function usage() { + cat < Date: Wed, 20 Jun 2018 13:01:21 -0400 Subject: [PATCH 131/818] Fixed the gpg key substituion --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index f318102564..c721ec147c 100755 --- a/update.sh +++ b/update.sh @@ -121,7 +121,7 @@ function update_node_version() { for key_type in "node" "yarn"; do while read -r line; do pattern='"\$\{'$(echo "${key_type}" | tr '[:lower:]' '[:upper:]')'_KEYS\[@\]\}"' - sed -Ei -e "s/([ \\t]*)(${pattern})/\\1${line}${new_line}\\1\\2/" "${dockerfile}" + sed -Ei -e "s/([ \\t]*)(${pattern})/\\1${line}${new_line}\\1\\2/" "${dockerfile}-tmp" done <"keys/${key_type}.keys" sed -Ei -e "/${pattern}/d" "${dockerfile}-tmp" done From 59cb6a317edb004ce9c6dc97335351d985dbaf55 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 20 Jun 2018 13:02:28 -0400 Subject: [PATCH 132/818] Fixed the update script not working properly with the -s flag or variant filter --- functions.sh | 4 ++-- update.sh | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/functions.sh b/functions.sh index acc2fd8688..24d17aa368 100755 --- a/functions.sh +++ b/functions.sh @@ -58,7 +58,7 @@ function get_variants() { local arch local availablevariants local variantsfilter - local variants + local variants=() arch=$(get_arch) variantsfilter=("$@") @@ -143,7 +143,7 @@ function get_versions() { prefix=${1:-.} shift - local versions + local versions=() local dirs=("$@") local default_variant diff --git a/update.sh b/update.sh index c721ec147c..013293a089 100755 --- a/update.sh +++ b/update.sh @@ -29,6 +29,7 @@ while getopts "sh" opt; do case "${opt}" in s) SKIP=true + shift ;; h) usage @@ -46,7 +47,8 @@ done cd "$(cd "${0%/*}" && pwd -P)" IFS=' ' read -ra versions <<<"$(get_versions .)" -IFS=' ' read -ra update_versions <<<"$(get_versions . "$@")" +IFS=' ' read -ra update_versions <<<"$(get_versions . "${1-}")" +IFS=' ' read -ra update_variants <<<"$(get_variants . "${2-}")" if [ ${#versions[@]} -eq 0 ]; then fatal "No valid versions found!" fi @@ -65,6 +67,11 @@ fi function in_versions_to_update() { local version=$1 + if [ "${#update_versions[@]}" -eq 0 ]; then + echo 0 + return + fi + for version_to_update in "${update_versions[@]}"; do if [ "${version_to_update}" = "${version}" ]; then echo 0 @@ -75,6 +82,24 @@ function in_versions_to_update() { echo 1 } +function in_variants_to_update() { + local variant=$1 + + if [ "${#update_variants[@]}" -eq 0 ]; then + echo 0 + return + fi + + for variant_to_update in "${update_variants[@]}"; do + if [ "${variant_to_update}" = "${variant}" ]; then + echo 0 + return + fi + done + + echo 1 +} + function update_node_version() { local baseuri=${1} @@ -164,9 +189,9 @@ for version in "${versions[@]}"; do parentpath=$(dirname "${version}") versionnum=$(basename "${version}") baseuri=$(get_config "${parentpath}" "baseuri") - update=$(in_versions_to_update "${version}") + update_version=$(in_versions_to_update "${version}") - [ "${update}" -eq 0 ] && info "Updating version ${version}..." + [ "${update_version}" -eq 0 ] && info "Updating version ${version}..." # Get supported variants according the target architecture # See details in function.sh @@ -175,7 +200,7 @@ for version in "${versions[@]}"; do if [ -f "${version}/Dockerfile" ]; then add_stage "${baseuri}" "${version}" "default" - if [ "${update}" -eq 0 ]; then + if [ "${update_version}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & fi fi @@ -185,7 +210,9 @@ for version in "${versions[@]}"; do [ -f "${version}/${variant}/Dockerfile" ] || continue add_stage "${baseuri}" "${version}" "${variant}" - if [ "${update}" -eq 0 ]; then + update_variant=$(in_variants_to_update "${variant}") + + if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile-${variant}.template" "${version}/${variant}/Dockerfile" "${variant}" & fi done From 65ba769f403f8c188d9be0b1ffb8a9cfc31bf703 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 20 Jun 2018 22:10:24 +0200 Subject: [PATCH 133/818] Update node to 10.5.0 (#792) https://nodejs.org/en/blog/release/v10.5.0/ --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 73023a6caf..8ec269045d 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.4.1 +ENV NODE_VERSION 10.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index cbb434d923..ab177e4dc4 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.4.1 +ENV NODE_VERSION 10.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 33b577ca72..74523c82d9 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.4.1 +ENV NODE_VERSION 10.5.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 80a9b20478..d79ed1bcb8 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.4.1 +ENV NODE_VERSION 10.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1c4ff5c5f4ce3b4a958a6649e399c4d92017d9ca Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 25 Jun 2018 09:54:57 -0400 Subject: [PATCH 134/818] Added ability to update multiple versions of variants --- update.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/update.sh b/update.sh index 013293a089..da7db80739 100755 --- a/update.sh +++ b/update.sh @@ -7,15 +7,15 @@ function usage() { Update the node docker images. Usage: - $0 [-s] [MAJOR_VERSION] [VARIANT] + $0 [-s] [MAJOR_VERSION(S)] [VARIANT(S)] Examples: - - update.sh # Update all images - - update.sh -s # Update all images, skip updating Alpine and Yarn - - update.sh 8 # Update version 8 and variants (default, slim, alpine etc.) - - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn - - update.sh 8 slim # Update all variants for version 8 - - update.sh -s 8 slim # Update all variants for version 8, skip updating Alpine and Yarn + - update.sh # Update all images + - update.sh -s # Update all images, skip updating Alpine and Yarn + - update.sh 8,9 # Update version 8 and 9 and variants (default, slim, alpine etc.) + - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn + - update.sh 8 slim,stretch # Update only slim and stretch variants for version 8 + - update.sh -s 8 slim,stretch # Update only slim and stretch variants for version 8, skip updating Alpine and Yarn OPTIONS: -s Security update; skip updating the yarn and alpine versions. @@ -46,9 +46,12 @@ done cd "$(cd "${0%/*}" && pwd -P)" +IFS=',' read -ra versions_arg <<<"${1:-}" +IFS=',' read -ra variant_arg <<<"${2:-}" + IFS=' ' read -ra versions <<<"$(get_versions .)" -IFS=' ' read -ra update_versions <<<"$(get_versions . "${1-}")" -IFS=' ' read -ra update_variants <<<"$(get_variants . "${2-}")" +IFS=' ' read -ra update_versions <<<"$(get_versions . "${versions_arg[@]:-}")" +IFS=' ' read -ra update_variants <<<"$(get_variants . "${variant_arg[@]:-}")" if [ ${#versions[@]} -eq 0 ]; then fatal "No valid versions found!" fi From 26f21a886d6349fec1e22f63590fb06944c9ba9b Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 25 Jun 2018 10:01:11 -0400 Subject: [PATCH 135/818] Added ability to update specific variant for all versions --- update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/update.sh b/update.sh index da7db80739..056218c6e1 100755 --- a/update.sh +++ b/update.sh @@ -16,6 +16,7 @@ function usage() { - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn - update.sh 8 slim,stretch # Update only slim and stretch variants for version 8 - update.sh -s 8 slim,stretch # Update only slim and stretch variants for version 8, skip updating Alpine and Yarn + - update.sh . alpine # Update the alpine variant for all versions OPTIONS: -s Security update; skip updating the yarn and alpine versions. From 17cbe4761413e08d4b247cbec187eaafc6ee0289 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 22 Jun 2018 09:44:29 -0400 Subject: [PATCH 136/818] Remove the Travis token in favor of UI config --- .travis.yml | 2 -- travis.yml.template | 2 -- 2 files changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd0ab1a3af..07a32a64f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,8 +75,6 @@ jobs: - stage: Deploy script: ./generate-stackbrew-pr.sh - env: - secure: "HkgYgawkr/hkg2vURHGOb/JmF6U1e71QQsd0HXJ1UJh6WBiFJOrjomCMHZGHnpyopdRna++up8dISBqM2X+EiLAr9yWdRXy72oMP9X42M0ccnja/3E5KYYXMkETS50JnUhMCOt2xRZW5/ojqrHukqRo0YIjIu+P0U0VsZ4QIsng=" # Docker Build # diff --git a/travis.yml.template b/travis.yml.template index f18a4f7253..e1dd5ddf28 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -73,7 +73,5 @@ jobs: - stage: Deploy script: ./generate-stackbrew-pr.sh - env: - secure: "HkgYgawkr/hkg2vURHGOb/JmF6U1e71QQsd0HXJ1UJh6WBiFJOrjomCMHZGHnpyopdRna++up8dISBqM2X+EiLAr9yWdRXy72oMP9X42M0ccnja/3E5KYYXMkETS50JnUhMCOt2xRZW5/ojqrHukqRo0YIjIu+P0U0VsZ4QIsng=" # Docker Build # From 2bd706730e40fb9adceb807fc4bd4829605021f4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 27 Jun 2018 19:47:48 +0800 Subject: [PATCH 137/818] Use space instead of tab in config file [ci skip] --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 20c5522593..34bbe46ac3 100644 --- a/config +++ b/config @@ -1,3 +1,3 @@ baseuri https://nodejs.org/dist -default_variant jessie +default_variant jessie alpine_version 3.7 From b22fb6c84e3cac83309b083c973649b2bf6b092d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sun, 1 Jul 2018 12:49:04 -0400 Subject: [PATCH 138/818] build: Drop Node 9 (#803) Support for 9 dropped yesterday https://github.com/nodejs/Release/blob/bc9d936e153b9fafd7f7c203f139d02035ca6862/schedule.json#L44 --- .travis.yml | 25 ------------- 9/alpine/Dockerfile | 69 ----------------------------------- 9/jessie/Dockerfile | 63 -------------------------------- 9/onbuild/Dockerfile | 12 ------ 9/slim/Dockerfile | 68 ---------------------------------- 9/stretch/Dockerfile | 63 -------------------------------- generate-stackbrew-library.sh | 2 - update.sh | 2 +- 8 files changed, 1 insertion(+), 303 deletions(-) delete mode 100644 9/alpine/Dockerfile delete mode 100644 9/jessie/Dockerfile delete mode 100644 9/onbuild/Dockerfile delete mode 100644 9/slim/Dockerfile delete mode 100644 9/stretch/Dockerfile diff --git a/.travis.yml b/.travis.yml index 07a32a64f0..d2ac5ce9e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -148,31 +148,6 @@ jobs: - NODE_VERSION: "8" - VARIANT: "stretch" - - stage: Build - env: - - NODE_VERSION: "9" - - VARIANT: "jessie" - - - stage: Build - env: - - NODE_VERSION: "9" - - VARIANT: "alpine" - - - stage: Build - env: - - NODE_VERSION: "9" - - VARIANT: "onbuild" - - - stage: Build - env: - - NODE_VERSION: "9" - - VARIANT: "slim" - - - stage: Build - env: - - NODE_VERSION: "9" - - VARIANT: "stretch" - - stage: Build env: - NODE_VERSION: "chakracore/10" diff --git a/9/alpine/Dockerfile b/9/alpine/Dockerfile deleted file mode 100644 index 53909306aa..0000000000 --- a/9/alpine/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM alpine:3.6 - -ENV NODE_VERSION 9.11.2 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - binutils-gold \ - curl \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-team - && 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 \ - && 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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) \ - && make install \ - && apk del .build-deps \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt - -ENV YARN_VERSION 1.5.1 - -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" ; \ - 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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -CMD [ "node" ] diff --git a/9/jessie/Dockerfile b/9/jessie/Dockerfile deleted file mode 100644 index ddd20fbe83..0000000000 --- a/9/jessie/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -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 -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 9.11.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.5.1 - -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" ; \ - 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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/9/onbuild/Dockerfile b/9/onbuild/Dockerfile deleted file mode 100644 index 351704fb9a..0000000000 --- a/9/onbuild/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:9.11.2-jessie - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD ARG NODE_ENV -ONBUILD ENV NODE_ENV $NODE_ENV -ONBUILD COPY package.json /usr/src/app/ -ONBUILD RUN npm install && npm cache clean --force -ONBUILD COPY . /usr/src/app - -CMD [ "npm", "start" ] diff --git a/9/slim/Dockerfile b/9/slim/Dockerfile deleted file mode 100644 index b97190f868..0000000000 --- a/9/slim/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -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 -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 9.11.2 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - && rm -rf /var/lib/apt/lists/* \ - && 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.5.1 - -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" ; \ - 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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/9/stretch/Dockerfile b/9/stretch/Dockerfile deleted file mode 100644 index db1a1692d0..0000000000 --- a/9/stretch/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -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 9.11.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.5.1 - -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" ; \ - 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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index e2ac5b393f..10db8daa97 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,8 +11,6 @@ array_6='6 boron' # shellcheck disable=SC2034 array_8='8 carbon' # shellcheck disable=SC2034 -array_9='9' -# shellcheck disable=SC2034 array_10='10 latest' # shellcheck disable=SC2034 array_chakracore_8='chakracore-8' diff --git a/update.sh b/update.sh index 056218c6e1..6466f9c208 100755 --- a/update.sh +++ b/update.sh @@ -12,7 +12,7 @@ function usage() { Examples: - update.sh # Update all images - update.sh -s # Update all images, skip updating Alpine and Yarn - - update.sh 8,9 # Update version 8 and 9 and variants (default, slim, alpine etc.) + - update.sh 8,10 # Update version 8 and 10 and variants (default, slim, alpine etc.) - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn - update.sh 8 slim,stretch # Update only slim and stretch variants for version 8 - update.sh -s 8 slim,stretch # Update only slim and stretch variants for version 8, skip updating Alpine and Yarn From 3bfd15f786da882ece66256d5f5e26f81fe8205b Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sat, 2 Jun 2018 11:03:45 -0400 Subject: [PATCH 139/818] Use BATS for testing Switches testing to the BATS testing framework: https://github.com/bats-core/bats-core --- test-build.sh | 4 +++- test-image.bats | 17 +++++++++++++++++ test-image.sh | 18 ------------------ 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100755 test-image.bats delete mode 100755 test-image.sh diff --git a/test-build.sh b/test-build.sh index 61861e9e0d..e4a137a0a5 100755 --- a/test-build.sh +++ b/test-build.sh @@ -46,7 +46,9 @@ function build() { info "Build of ${full_tag} succeeded." info "Testing ${full_tag}" - docker run --rm -v "$PWD/test-image.sh:/usr/local/bin/test.sh" node:"${full_tag}" test.sh "${full_version}" + export full_tag=${full_tag} + export full_version=${full_version} + bats test-image.bats } cd "$(cd "${0%/*}" && pwd -P)" || exit diff --git a/test-image.bats b/test-image.bats new file mode 100755 index 0000000000..0ed164867c --- /dev/null +++ b/test-image.bats @@ -0,0 +1,17 @@ +#!/usr/bin/env bats + +@test "Test for node and version" { + run docker run --rm -it node:"$full_tag" node -e "process.stdout.write(process.versions.node)" + [ "$status" -eq 0 ] + [ "$output" == "${full_version}" ] +} + +@test "Test for npm" { + run docker run --rm -it node:"$full_tag" npm --version + [ "$status" -eq 0 ] +} + +@test "Test for yarn" { + run docker run --rm -it node:"$full_tag" yarn --version + [ "$status" -eq 0 ] +} diff --git a/test-image.sh b/test-image.sh deleted file mode 100755 index e409e3bc3e..0000000000 --- a/test-image.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -if [ "$(node -e "process.stdout.write(process.versions.node)")" != "${1}" ]; then - echo "Test for node failed!" - exit 1 -fi -echo "Test for node succeeded." - -if ! npm --version >/dev/null; then - echo "Test for npm failed!" - exit 1 -fi -echo "Test for npm succeeded." - -if ! yarn --version >/dev/null; then - echo "Test of yarn failed!" - exit 1 -fi -echo "Test for yarn succeeded." From 04dbeb2ee0f3f86c87af96a92a0ad05e07a445da Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sat, 30 Jun 2018 10:30:13 -0400 Subject: [PATCH 140/818] Add test_image function --- test-build.sh | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/test-build.sh b/test-build.sh index e4a137a0a5..45af46cc21 100755 --- a/test-build.sh +++ b/test-build.sh @@ -44,10 +44,31 @@ function build() { fatal "Build of ${full_tag} failed!" fi info "Build of ${full_tag} succeeded." +} + +function test_image() { + local full_version + local variant + local tag + local full_tag + version="$1" + shift + variant="$1" + shift + tag="$1" + shift + + if [ -z "${variant}" ]; then + full_tag="${tag}" + elif [ "${variant}" = "default" ]; then + full_tag="${tag}" + else + full_tag="${tag}-${variant}" + fi info "Testing ${full_tag}" - export full_tag=${full_tag} export full_version=${full_version} + export full_tag=${full_tag} bats test-image.bats } @@ -68,6 +89,7 @@ for version in "${versions[@]}"; do # Required for chakracore if [ -f "${version}/Dockerfile" ]; then build "${version}" "default" "${tag}" + test_image "${full_version}" "default" "${tag}" fi # Get supported variants according to the target architecture. @@ -80,9 +102,11 @@ for version in "${versions[@]}"; do if [ "${variant}" = "onbuild" ]; then build "${version}" "${default_variant}" "$tag" + test_image "${full_version}" "${default_variant}" "$tag" fi build "${version}" "${variant}" "${tag}" + test_image "${full_version}" "${variant}" "${tag}" done done From 9677d6aa5ad5b7b62453ea088d9756ab829ed063 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sat, 30 Jun 2018 18:58:30 -0400 Subject: [PATCH 141/818] Add get_full_tag and get_path functions --- functions.sh | 37 +++++++++++++++++++++++++++++++++++++ test-build.sh | 22 ++++------------------ 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/functions.sh b/functions.sh index 24d17aa368..437110b3e3 100755 --- a/functions.sh +++ b/functions.sh @@ -180,6 +180,24 @@ function get_fork_name() { fi } +function get_full_tag() { + local variant + local tag + local full_tag + variant="$1" + shift + tag="$1" + shift + if [ -z "${variant}" ]; then + full_tag="${tag}" + elif [ "${variant}" = "default" ]; then + full_tag="${tag}" + else + full_tag="${tag}-${variant}" + fi + echo "${full_tag}" +} + function get_full_version() { local version version=$1 @@ -206,6 +224,25 @@ function get_major_minor_version() { echo "$(echo "${fullversion}" | cut -d'.' -f1).$(echo "${fullversion}" | cut -d'.' -f2)" } +function get_path() { + local version + local variant + local path + version="$1" + shift + variant="$1" + shift + + if [ -z "${variant}" ]; then + path="${version}/${variant}" + elif [ "${variant}" = "default" ]; then + path="${version}" + else + path="${version}/${variant}" + fi + echo "${path}" +} + function get_tag() { local version version=$1 diff --git a/test-build.sh b/test-build.sh index 45af46cc21..76bb3f7313 100755 --- a/test-build.sh +++ b/test-build.sh @@ -27,16 +27,8 @@ function build() { tag="$1" shift - if [ -z "${variant}" ]; then - full_tag="${tag}" - path="${version}/${variant}" - elif [ "${variant}" = "default" ]; then - full_tag="${tag}" - path="${version}" - else - full_tag="${tag}-${variant}" - path="${version}/${variant}" - fi + full_tag=$(get_full_tag "${variant}" "${tag}") + path=$(get_path "${version}" "${variant}") info "Building ${full_tag}..." @@ -51,20 +43,14 @@ function test_image() { local variant local tag local full_tag - version="$1" + full_version="$1" shift variant="$1" shift tag="$1" shift - if [ -z "${variant}" ]; then - full_tag="${tag}" - elif [ "${variant}" = "default" ]; then - full_tag="${tag}" - else - full_tag="${tag}-${variant}" - fi + full_tag=$(get_full_tag "${variant}" "${tag}") info "Testing ${full_tag}" export full_version=${full_version} From df219f13773074d52271210be928093256db06c2 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 3 Jul 2018 09:48:13 -0400 Subject: [PATCH 142/818] Wrap exports and test execution in a subshell --- test-build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test-build.sh b/test-build.sh index 76bb3f7313..26621a1e12 100755 --- a/test-build.sh +++ b/test-build.sh @@ -53,9 +53,11 @@ function test_image() { full_tag=$(get_full_tag "${variant}" "${tag}") info "Testing ${full_tag}" - export full_version=${full_version} - export full_tag=${full_tag} - bats test-image.bats + ( + export full_version=${full_version} + export full_tag=${full_tag} + bats test-image.bats + ) } cd "$(cd "${0%/*}" && pwd -P)" || exit From 3e179a85703a6688a26486729b4466a92e818a84 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 5 Jul 2018 02:04:05 +0800 Subject: [PATCH 143/818] Update node.js v10.x to v10.6.0 - https://github.com/nodejs/node/releases/tag/v10.6.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.6.0 --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 8ec269045d..096526fed1 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 -ENV NODE_VERSION 10.5.0 +ENV NODE_VERSION 10.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index ab177e4dc4..7164b51dd9 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.5.0 +ENV NODE_VERSION 10.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 74523c82d9..57de424647 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.5.0 +ENV NODE_VERSION 10.6.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index d79ed1bcb8..0ebb4cb37c 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.5.0 +ENV NODE_VERSION 10.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 0f76c7a07e864fefecbbc79e7aa3013d8cecc5b8 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 6 Jul 2018 22:53:21 +0800 Subject: [PATCH 144/818] Bump Alpine base image version to v3.8 [skip ci] --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 34bbe46ac3..d053ce6dc2 100644 --- a/config +++ b/config @@ -1,3 +1,3 @@ baseuri https://nodejs.org/dist default_variant jessie -alpine_version 3.7 +alpine_version 3.8 From ea38ef22f5342f234d05259f73ad08322157a526 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 15 Jul 2018 21:50:29 +0800 Subject: [PATCH 145/818] Update shfmt Docker image on Travis CI Origin one is out of our control, currently dated(v2.4.0) --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2ac5ce9e3..3a165be788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt@sha256:4eff05b54e87c11e8214848de3e5f4bb47a4241b99ac5c6554db5cc164015810 -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index e1dd5ddf28..32da129132 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -54,7 +54,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt@sha256:4eff05b54e87c11e8214848de3e5f4bb47a4241b99ac5c6554db5cc164015810 -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From 95f66af0d12f47018cf1661032ad01183faaf7de Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 17 Jul 2018 00:24:30 +0800 Subject: [PATCH 146/818] Add shfmt parameter `-sr` to keep space after redirect ops --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a165be788..b09193884e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index 32da129132..fb258ddde0 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -54,7 +54,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From 26550a63bccd27928771aeb704c72de8ac540aeb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 17 Jul 2018 00:25:26 +0800 Subject: [PATCH 147/818] Add a space after redirect ops in shell script --- functions.sh | 22 +++++++++++----------- generate-stackbrew-library.sh | 16 ++++++++-------- generate-stackbrew-pr.sh | 6 +++--- test-build.sh | 8 ++++---- update.sh | 20 ++++++++++---------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/functions.sh b/functions.sh index 437110b3e3..70f78a6ca7 100755 --- a/functions.sh +++ b/functions.sh @@ -62,7 +62,7 @@ function get_variants() { arch=$(get_arch) variantsfilter=("$@") - IFS=' ' read -ra availablevariants <<<"$(grep "^${arch}" "${dir}/architectures" | sed -E 's/'"${arch}"'[[:space:]]*//' | sed -E 's/,/ /g')" + IFS=' ' read -ra availablevariants <<< "$(grep "^${arch}" "${dir}/architectures" | sed -E 's/'"${arch}"'[[:space:]]*//' | sed -E 's/,/ /g')" if [ ${#variantsfilter[@]} -gt 0 ]; then for variant1 in "${availablevariants[@]}"; do @@ -100,16 +100,16 @@ function get_supported_arches() { shift # Get default supported arches - lines=$(grep "${variant}" "$(dirname "${version}")"/architectures 2>/dev/null | cut -d' ' -f1) + lines=$(grep "${variant}" "$(dirname "${version}")"/architectures 2> /dev/null | cut -d' ' -f1) # Get version specific supported architectures if there is specialized information if [ -a "${version}"/architectures ]; then - lines=$(grep "${variant}" "${version}"/architectures 2>/dev/null | cut -d' ' -f1) + lines=$(grep "${variant}" "${version}"/architectures 2> /dev/null | cut -d' ' -f1) fi while IFS='' read -r line; do arches+=("${line}") - done <<<"${lines}" + done <<< "${lines}" echo "${arches[@]}" } @@ -149,13 +149,13 @@ function get_versions() { local default_variant default_variant=$(get_config "./" "default_variant") if [ ${#dirs[@]} -eq 0 ]; then - IFS=' ' read -ra dirs <<<"$(echo "${prefix%/}/"*/)" + IFS=' ' read -ra dirs <<< "$(echo "${prefix%/}/"*/)" fi for dir in "${dirs[@]}"; do if [ -a "${dir}/config" ]; then local subdirs - IFS=' ' read -ra subdirs <<<"$(get_versions "${dir#./}")" + IFS=' ' read -ra subdirs <<< "$(get_versions "${dir#./}")" for subdir in "${subdirs[@]}"; do versions+=("${subdir}") done @@ -174,7 +174,7 @@ function get_fork_name() { version=$1 shift - IFS='/' read -ra versionparts <<<"${version}" + IFS='/' read -ra versionparts <<< "${version}" if [ ${#versionparts[@]} -gt 1 ]; then echo "${versionparts[0]}" fi @@ -260,7 +260,7 @@ function get_tag() { fi local tagparts - IFS=' ' read -ra tagparts <<<"$(get_fork_name "${version}") ${tagversion}" + IFS=' ' read -ra tagparts <<< "$(get_fork_name "${version}") ${tagversion}" IFS='-' echo "${tagparts[*]}" unset IFS @@ -278,11 +278,11 @@ function sort_versions() { while IFS='' read -r line; do sorted+=("${line}") - done <<<"$(echo "${lines}" | grep "^[0-9]" | sort -r)" + done <<< "$(echo "${lines}" | grep "^[0-9]" | sort -r)" while IFS='' read -r line; do sorted+=("${line}") - done <<<"$(echo "${lines}" | grep -v "^[0-9]" | sort -r)" + done <<< "$(echo "${lines}" | grep -v "^[0-9]" | sort -r)" echo "${sorted[@]}" } @@ -312,7 +312,7 @@ function images_updated() { commit_range="$(commit_range "$@")" - IFS=' ' read -ra versions <<<"$( + IFS=' ' read -ra versions <<< "$( IFS=',' get_versions )" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 10db8daa97..b40d7374f2 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,7 +3,7 @@ set -e . functions.sh -hash git 2>/dev/null || { echo >&2 "git not found, exiting."; } +hash git 2> /dev/null || { echo >&2 "git not found, exiting."; } # Used dynamically: print "$array_" $1 # shellcheck disable=SC2034 @@ -23,8 +23,8 @@ cd "$(cd "${0%/*}" && pwd -P)" self="$(basename "${BASH_SOURCE[0]}")" -IFS=' ' read -ra versions <<<"$(get_versions)" -IFS=' ' read -ra versions <<<"$(sort_versions "${versions[@]}")" +IFS=' ' read -ra versions <<< "$(get_versions)" +IFS=' ' read -ra versions <<< "$(sort_versions "${versions[@]}")" url='https://github.com/nodejs/docker-node' # get the most recent commit which modified any of "$@" @@ -50,7 +50,7 @@ join() { get_stub() { local version="${1}" shift - IFS='/' read -ra versionparts <<<"${version}" + IFS='/' read -ra versionparts <<< "${version}" local stub eval stub="$(join '_' "${versionparts[@]}" | awk -F. '{ print "$array_" $1 }')" echo "${stub}" @@ -65,11 +65,11 @@ for version in "${versions[@]}"; do fullVersion="$(get_tag "${version}" full)" majorMinorVersion="$(get_tag "${version}" majorminor)" - IFS=' ' read -ra versionAliases <<<"$fullVersion $majorMinorVersion $stub" + IFS=' ' read -ra versionAliases <<< "$fullVersion $majorMinorVersion $stub" if [ -f "${version}/Dockerfile" ]; then # Get supported architectures for a specific version. See details in function.sh - IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "${version}" "default")" + IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "${version}" "default")" echo "Tags: $(join ', ' "${versionAliases[@]}")" echo "Architectures: $(join ', ' "${supportedArches[@]}")" @@ -80,7 +80,7 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "${version}")")" + IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "${version}")")" for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue @@ -96,7 +96,7 @@ for version in "${versions[@]}"; do # Get supported architectures for a specific version and variant. # See details in function.sh - IFS=' ' read -ra supportedArches <<<"$(get_supported_arches "${version}" "${variant}")" + IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "${version}" "${variant}")" echo "Tags: $(join ', ' "${variantAliases[@]}")" echo "Architectures: $(join ', ' "${supportedArches[@]}")" diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 894ae8121a..4f6aebab7c 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -96,19 +96,19 @@ if images_updated "${COMMIT_ID}"; then setup_git_author info "Cloning..." - git clone --depth 50 "https://github.com/${UPSTREAM_SLUG}.git" ${gitpath} 2>/dev/null + git clone --depth 50 "https://github.com/${UPSTREAM_SLUG}.git" ${gitpath} 2> /dev/null stackbrew="$(./generate-stackbrew-library.sh)" cd ${gitpath} - echo "${stackbrew}" >"${IMAGES_FILE}" + echo "${stackbrew}" > "${IMAGES_FILE}" git checkout -b "${BRANCH_NAME}" git add "${IMAGES_FILE}" git commit -m "$(message)" info "Pushing..." - git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" 2>/dev/null || fatal "Error pushing the updated stackbrew" + git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" 2> /dev/null || fatal "Error pushing the updated stackbrew" cd - && rm -rf ${gitpath} diff --git a/test-build.sh b/test-build.sh index 26621a1e12..7b30e7509e 100755 --- a/test-build.sh +++ b/test-build.sh @@ -9,8 +9,8 @@ set -euo pipefail # Convert comma delimited cli arguments to arrays # E.g. ./test-build.sh 8,10 slim,onbuild # "8,10" becomes "8 10" and "slim,onbuild" becomes "slim onbuild" -IFS=',' read -ra versions_arg <<<"${1:-}" -IFS=',' read -ra variant_arg <<<"${2:-}" +IFS=',' read -ra versions_arg <<< "${1:-}" +IFS=',' read -ra variant_arg <<< "${2:-}" default_variant=$(get_config "./" "default_variant") @@ -62,7 +62,7 @@ function test_image() { cd "$(cd "${0%/*}" && pwd -P)" || exit -IFS=' ' read -ra versions <<<"$(get_versions . "${versions_arg[@]}")" +IFS=' ' read -ra versions <<< "$(get_versions . "${versions_arg[@]}")" if [ ${#versions[@]} -eq 0 ]; then fatal "No valid versions found!" fi @@ -82,7 +82,7 @@ for version in "${versions[@]}"; do # Get supported variants according to the target architecture. # See details in function.sh - IFS=' ' read -ra variants <<<"$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")" + IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")" for variant in "${variants[@]}"; do # Skip non-docker directories diff --git a/update.sh b/update.sh index 6466f9c208..cbab2a5ae1 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ set -ue function usage() { - cat <>.travis.yml + - VARIANT: "'"${variant}"'"' >> .travis.yml } echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### -' | cat - travis.yml.template >.travis.yml +' | cat - travis.yml.template > .travis.yml for version in "${versions[@]}"; do parentpath=$(dirname "${version}") @@ -199,7 +199,7 @@ for version in "${versions[@]}"; do # Get supported variants according the target architecture # See details in function.sh - IFS=' ' read -ra variants <<<"$(get_variants "${parentpath}")" + IFS=' ' read -ra variants <<< "$(get_variants "${parentpath}")" if [ -f "${version}/Dockerfile" ]; then add_stage "${baseuri}" "${version}" "default" From 58dbead97e921ff0497863d2cbbcc714f97e1d93 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 19 Jul 2018 02:32:38 +0800 Subject: [PATCH 148/818] Update node.js v10 images - Update node.js v10.x to v10.7.0 - For Alpine based image, update Alpine from v3.7 to v3.8 Ref: - https://github.com/nodejs/node/releases/tag/v10.7.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.7.0 --- 10/alpine/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 096526fed1..e43b2ed176 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.7 +FROM alpine:3.8 -ENV NODE_VERSION 10.6.0 +ENV NODE_VERSION 10.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 7164b51dd9..56159ef525 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.6.0 +ENV NODE_VERSION 10.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 57de424647..79241f7dc3 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.6.0 +ENV NODE_VERSION 10.7.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 0ebb4cb37c..32e54665a5 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.6.0 +ENV NODE_VERSION 10.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f1298db3282af4fef198399028bfb161a28c20af Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 19 Jul 2018 11:11:50 -0700 Subject: [PATCH 149/818] Remove i386 support from binary-release-based 10 variants --- 8/architectures | 8 ++++++++ architectures | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 8/architectures diff --git a/8/architectures b/8/architectures new file mode 100644 index 0000000000..1a9b7a2dd8 --- /dev/null +++ b/8/architectures @@ -0,0 +1,8 @@ +bashbrew-arch variants +arm32v6 alpine +arm32v7 jessie,onbuild,slim,stretch +arm64v8 jessie,alpine,onbuild,slim,stretch +amd64 jessie,alpine,onbuild,slim,stretch +i386 jessie,alpine,onbuild,slim,stretch +ppc64le jessie,alpine,onbuild,slim,stretch +s390x jessie,alpine,onbuild,slim,stretch diff --git a/architectures b/architectures index 1a9b7a2dd8..16bb20a2cb 100644 --- a/architectures +++ b/architectures @@ -3,6 +3,6 @@ arm32v6 alpine arm32v7 jessie,onbuild,slim,stretch arm64v8 jessie,alpine,onbuild,slim,stretch amd64 jessie,alpine,onbuild,slim,stretch -i386 jessie,alpine,onbuild,slim,stretch +i386 alpine ppc64le jessie,alpine,onbuild,slim,stretch s390x jessie,alpine,onbuild,slim,stretch From ea61a26000dbc3b90708f4f024614dc41c94346e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 21 Jul 2018 14:09:58 +0800 Subject: [PATCH 150/818] Update chakracore v10 to v10.6.0 (#824) --- chakracore/10/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index 5842858f15..bb99c406de 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/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 -ENV NODE_VERSION 10.1.0 +ENV NODE_VERSION 10.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b66d3fce1725a8557c06d852df5436dd0428d422 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 23 Jul 2018 17:54:01 +0800 Subject: [PATCH 151/818] Update `shfmt` Docker image usage on Travis CI --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b09193884e..b41b167e0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index fb258ddde0..19a45b890b 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -54,7 +54,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From 387d4d9182566d0e10236d32f60d7a5b23196653 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 2 Aug 2018 03:00:11 +0800 Subject: [PATCH 152/818] Update node.js v10.x to v10.8.0 with Yarn v1.9.2 --- 10/alpine/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index e43b2ed176..c463cc7a78 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.7.0 +ENV NODE_VERSION 10.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.7.0 +ENV YARN_VERSION 1.9.2 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 56159ef525..01f31302b1 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.7.0 +ENV NODE_VERSION 10.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.7.0 +ENV YARN_VERSION 1.9.2 RUN set -ex \ && for key in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 79241f7dc3..9ee8200d35 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.7.0 +ENV NODE_VERSION 10.8.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -46,7 +46,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.7.0 +ENV YARN_VERSION 1.9.2 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 32e54665a5..9fb0ca6ec9 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.7.0 +ENV NODE_VERSION 10.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.7.0 +ENV YARN_VERSION 1.9.2 RUN set -ex \ && for key in \ From e788c21cd512ccf72358d6423768a3895cdd254f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 30 Jul 2018 04:28:58 +0800 Subject: [PATCH 153/818] Improve markdown syntax/style [ci skip] --- GOVERNANCE.md | 1 + README.md | 65 +++++++++++++++++++++---------------------- docs/BestPractices.md | 2 ++ 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 9397fcd8c5..77020bc50c 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -112,6 +112,7 @@ closing vote. The call for a vote must be seconded by a majority of the WG or else the discussion will continue. Simple majority wins. + ## Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: diff --git a/README.md b/README.md index 2c5766ff40..4ee8c07a8c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The official Node.js docker image, made with love by the node community. ## Table of Contents - - [What is Node.js?](#what-is-nodejs) +- [What is Node.js?](#what-is-nodejs) - [How to use this image](#how-to-use-this-image) - [Create a `Dockerfile` in your Node.js app project](#create-a-dockerfile-in-your-nodejs-app-project) - [Best Practices](#best-practices) @@ -42,9 +42,9 @@ real-time applications that run across distributed devices. See: http://nodejs.org -# How to use this image +## How to use this image -## Create a `Dockerfile` in your Node.js app project +### Create a `Dockerfile` in your Node.js app project ```dockerfile # specify the node base image with your desired version node: @@ -88,11 +88,11 @@ Docker Compose example copies your current directory (including node_modules) to It assumes that your application has a file named [`package.json`](https://docs.npmjs.com/files/package.json) defining [start script](https://docs.npmjs.com/misc/scripts#default-values). -## Best Practices +### Best Practices We have assembled a [Best Practices Guide](./docs/BestPractices.md) for those using these images on a daily basis. -## Run a single Node.js script +### Run a single Node.js script For many simple, single file projects, you may find it inconvenient to write a complete `Dockerfile`. In such cases, you can run a Node.js script by using the @@ -102,7 +102,7 @@ Node.js Docker image directly: $ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app -w /usr/src/app node:8 node your-daemon-or-script.js ``` -## Verbosity +### Verbosity Prior to 8.7.0 and 6.11.4 the docker images overrode the default npm log level from `warn` to `info`. However due to improvements to npm and new Docker @@ -110,7 +110,7 @@ patterns (e.g. multi-stage builds) the working group reached a [consensus](https to revert the log level to npm defaults. If you need more verbose output, please use one of the following methods to change the verbosity level. -### Dockerfile +#### Dockerfile If you create your own `Dockerfile` which inherits from the `node` image you can simply use `ENV` to override `NPM_CONFIG_LOGLEVEL`. @@ -121,25 +121,25 @@ ENV NPM_CONFIG_LOGLEVEL info ... ``` -### Docker Run +#### Docker Run If you run the node image using `docker run` you can use the `-e` flag to override `NPM_CONFIG_LOGLEVEL`. -``` +```console $ docker run -e NPM_CONFIG_LOGLEVEL=info node ... ``` -### NPM run +#### NPM run If you are running npm commands you can use `--loglevel` to control the verbosity of the output. -``` +```console $ docker run node npm --loglevel=warn ... ``` -# Image Variants +## Image Variants The `node` images come in many flavors, each designed for a specific use case. All of the images contain pre-installed versions of `node`, @@ -148,7 +148,7 @@ supported architecture, the supported variants are different. In the file: [architectures](./architectures), it lists all supported variants for all of the architectures that we support now. -## `node:` +### `node:` This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away @@ -160,7 +160,7 @@ on their system. It, by design, has a large number of extremely common Debian packages. This reduces the number of packages that images that derive from it need to install, thus reducing the overall size of all images on your system. -## `node:alpine` +### `node:alpine` This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in @@ -188,8 +188,7 @@ image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). - -## `node:onbuild` +### `node:onbuild` The `ONBUILD` image variants are deprecated, and their usage is discouraged. For more details, see [docker-library/official-images#2076](https://github.com/docker-library/official-images/issues/2076). @@ -230,11 +229,9 @@ script](https://docs.npmjs.com/misc/scripts#default-values). It also assumes that you have a file named [`.dockerignore`](https://docs.docker.com/engine/reference/builder/#/dockerignore-file) otherwise it will copy your local npm modules: -``` -node_modules -``` +`node_modules` -## `node:slim` +### `node:slim` This image does not contain the common packages contained in the default tag and only contains the minimal packages needed to run `node`. Unless you are working @@ -242,14 +239,14 @@ in an environment where *only* the Node.js image will be deployed and you have space constraints, we highly recommend using the default image of this repository. -# License +## License [License information](https://github.com/nodejs/node/blob/master/LICENSE) for the software contained in this image. [License information](https://github.com/nodejs/docker-node/blob/master/LICENSE) for the Node.js Docker project. -# Supported Docker versions +## Supported Docker versions This image is officially supported on Docker version 1.9.1. @@ -259,24 +256,24 @@ Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon. -# Governance and Current Members +## Governance and Current Members The Node.js Docker Image is governed by the Docker Working Group. See [GOVERNANCE.md](https://github.com/nodejs/docker-node/blob/master/GOVERNANCE.md) to learn more about the group's structure and [CONTRIBUTING.md](CONTRIBUTING.md) for guidance about the expectations for all contributors to this project. -## Docker Working Group Members +### Docker Working Group Members - * Christopher Horrell ([chorrell](https://github.com/chorrell)) - * Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) - * Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) - * John Mitchell ([jlmitch5](https://github.com/jlmitch5)) - * Peter Petrov ([pesho](https://github.com/pesho)) +- Christopher Horrell ([chorrell](https://github.com/chorrell)) +- Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) +- Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) +- John Mitchell ([jlmitch5](https://github.com/jlmitch5)) +- Peter Petrov ([pesho](https://github.com/pesho)) -## Docker Working Group Collaborators +### Docker Working Group Collaborators - * Mikeal Rogers ([mikeal](https://github.com/mikeal)) - * Laurent Goderre ([LaurentGoderre](https://github.com/LaurentGoderre)) - * Simen Bekkhus ([SimenB](https://github.com/SimenB)) - * Peter Dave Hello ([PeterDaveHello](https://github.com/PeterDaveHello)) +- Mikeal Rogers ([mikeal](https://github.com/mikeal)) +- Laurent Goderre ([LaurentGoderre](https://github.com/LaurentGoderre)) +- Simen Bekkhus ([SimenB](https://github.com/SimenB)) +- Peter Dave Hello ([PeterDaveHello](https://github.com/PeterDaveHello)) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 261a14cf65..970c79d59e 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -62,6 +62,7 @@ By default, Docker runs container as root which inside of the container can pose ``` -u "node" ``` + Alternatively, the user can be activated in the `Dockerfile`: ```Dockerfile @@ -96,6 +97,7 @@ RUN usermod -d /home/myapp -l myapp node ``` For alpine based images, you do not have `groupmod` nor `usermod`, so to change the uid/gid you have to delete the previous user: + ```Dockerfile RUN deluser --remove-home node \ && delgroup node \ From 9719676b474d1ca4766979154e3e664ba62905c4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 5 Aug 2018 03:21:56 +0800 Subject: [PATCH 154/818] Update shfmt to v2.5.1 --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b41b167e0a..b6c7b2b555 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.1 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index 19a45b890b..bc1d24ed89 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -54,7 +54,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.0 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.1 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From 143665e97766d368391f01ffe17ebfe394efea32 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 13 Aug 2018 20:41:34 +0800 Subject: [PATCH 155/818] Fix indentation in .travis.yml --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6c7b2b555..e964143d4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: false language: generic services: - - docker + - docker script: ./test-build.sh $NODE_VERSION $VARIANT diff --git a/travis.yml.template b/travis.yml.template index bc1d24ed89..4ed43956aa 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -4,7 +4,7 @@ sudo: false language: generic services: - - docker + - docker script: ./test-build.sh $NODE_VERSION $VARIANT From 0d0b9e2d8bb7e3b4cc1d3a29297f73e6589b3c5b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 13 Aug 2018 20:42:47 +0800 Subject: [PATCH 156/818] Add missing document start "---" in .travis.yml --- .travis.yml | 2 ++ travis.yml.template | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e964143d4e..b88610f903 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ #### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### +--- + dist: trusty sudo: false diff --git a/travis.yml.template b/travis.yml.template index 4ed43956aa..ec14b1da39 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -1,3 +1,5 @@ +--- + dist: trusty sudo: false From dde42059bf101993667cac0d3af19c185bbb6555 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 13 Aug 2018 20:44:21 +0800 Subject: [PATCH 157/818] Update .travis.yml auto-generated comment format --- .travis.yml | 2 +- update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b88610f903..aa19a6499d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### +# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # --- diff --git a/update.sh b/update.sh index cbab2a5ae1..36fd841ac3 100755 --- a/update.sh +++ b/update.sh @@ -186,7 +186,7 @@ function add_stage() { - VARIANT: "'"${variant}"'"' >> .travis.yml } -echo '#### DO NOT MODIFY. THIS FILE IS AUTOGENERATED #### +echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # ' | cat - travis.yml.template > .travis.yml for version in "${versions[@]}"; do From c2aac0ce9d924fd39384af3b3f9fe0f988dfde59 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 14 Aug 2018 13:47:52 +0800 Subject: [PATCH 158/818] Use `xargs` instead of `find -exec` for tests to return exit status --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa19a6499d..dfd43041e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: install: - npm i -g markdown-link-check script: - - find . -name "*.md" -exec markdown-link-check {} \; + - find . -name "*.md" | xargs -n 1 markdown-link-check - stage: Test env: diff --git a/travis.yml.template b/travis.yml.template index ec14b1da39..67769012c4 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -27,7 +27,7 @@ jobs: install: - npm i -g markdown-link-check script: - - find . -name "*.md" -exec markdown-link-check {} \; + - find . -name "*.md" | xargs -n 1 markdown-link-check - stage: Test env: From 72dd945d29dee5afa73956ebc971bf3a472442f7 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Thu, 16 Aug 2018 12:39:54 +1000 Subject: [PATCH 159/818] Security releases: 10.9.0, 8.11.4, 6.14.4 --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 6/jessie/Dockerfile | 2 +- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 8/jessie/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index c463cc7a78..30b5d71b94 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.8.0 +ENV NODE_VERSION 10.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 01f31302b1..d2483b0ed6 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.8.0 +ENV NODE_VERSION 10.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 9ee8200d35..5bc77da4b6 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.8.0 +ENV NODE_VERSION 10.9.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 9fb0ca6ec9..37cd05461b 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.8.0 +ENV NODE_VERSION 10.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index c5609ea28a..107a9afd82 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.14.3 +ENV NODE_VERSION 6.14.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index 4d46649d2d..b4acb817a1 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.3 +ENV NODE_VERSION 6.14.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index d2f6311aca..870322abfb 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.14.3-jessie +FROM node:6.14.4-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index b50e8b65f4..3e13b9e7f2 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.3 +ENV NODE_VERSION 6.14.4 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 92096f8d3e..17b227b238 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 6.14.3 +ENV NODE_VERSION 6.14.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index f678d6326a..35c7dadab8 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.6 -ENV NODE_VERSION 8.11.3 +ENV NODE_VERSION 8.11.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 18cd8895f7..28170d7c94 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.3 +ENV NODE_VERSION 8.11.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index cdb75f83b7..e7f7629bb2 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.11.3-jessie +FROM node:8.11.4-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index b41e1e336d..5db309bcc5 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.3 +ENV NODE_VERSION 8.11.4 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index a61f0b190d..ba0f503dec 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.3 +ENV NODE_VERSION 8.11.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c4aab5a6c7663f6823fdd2277fd2d47dce223011 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 7 Sep 2018 04:38:15 -0400 Subject: [PATCH 160/818] feat: Update for NodeJS 10.10.0 (#851) --- 10/alpine/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 30b5d71b94..12210844df 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.9.0 +ENV NODE_VERSION 10.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.9.2 +ENV YARN_VERSION 1.9.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index d2483b0ed6..5edc9f7ab8 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.9.0 +ENV NODE_VERSION 10.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.2 +ENV YARN_VERSION 1.9.4 RUN set -ex \ && for key in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 5bc77da4b6..ab0c92ea1b 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.9.0 +ENV NODE_VERSION 10.10.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -46,7 +46,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.2 +ENV YARN_VERSION 1.9.4 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 37cd05461b..41596a5b65 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.9.0 +ENV NODE_VERSION 10.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.2 +ENV YARN_VERSION 1.9.4 RUN set -ex \ && for key in \ From 526c6e618300bdda0da4b3159df682cae83e14aa Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 11 Sep 2018 15:34:18 +0200 Subject: [PATCH 161/818] fix: update to 8.12.0 (#852) https://nodejs.org/en/blog/release/v8.12.0/ --- 8/alpine/Dockerfile | 6 +++--- 8/jessie/Dockerfile | 4 ++-- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 4 ++-- 8/stretch/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 35c7dadab8..ebb0ec2882 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.6 +FROM alpine:3.8 -ENV NODE_VERSION 8.11.4 +ENV NODE_VERSION 8.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.9.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 28170d7c94..8b7fef5424 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.4 +ENV NODE_VERSION 8.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.9.4 RUN set -ex \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index e7f7629bb2..ce8907ba3f 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.11.4-jessie +FROM node:8.12.0-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 5db309bcc5..f2df83b560 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.4 +ENV NODE_VERSION 8.12.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -46,7 +46,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.9.4 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index ba0f503dec..bbd97f09b7 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 8.11.4 +ENV NODE_VERSION 8.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.9.4 RUN set -ex \ && for key in \ From 11d4e7fb83a52801e177a08c12eeacaf41498a54 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 20 Sep 2018 17:04:22 +0200 Subject: [PATCH 162/818] Update to node 10.11.0 (#859) https://nodejs.org/en/blog/release/v10.11.0/ --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 12210844df..23f4be83ab 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.10.0 +ENV NODE_VERSION 10.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 5edc9f7ab8..a6179be70e 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.10.0 +ENV NODE_VERSION 10.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index ab0c92ea1b..c3345092d5 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.10.0 +ENV NODE_VERSION 10.11.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 41596a5b65..f9459be73a 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.10.0 +ENV NODE_VERSION 10.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From abee44757fcd640c43b43e129c245bd942a92c02 Mon Sep 17 00:00:00 2001 From: jeff-nz Date: Thu, 11 Oct 2018 10:48:11 +1300 Subject: [PATCH 163/818] update doc for alpine del node group and add user assign group (#871) fixes #870 --- docs/BestPractices.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 970c79d59e..d3190e5644 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -100,9 +100,8 @@ For alpine based images, you do not have `groupmod` nor `usermod`, so to change ```Dockerfile RUN deluser --remove-home node \ - && delgroup node \ && addgroup -S node -g 999 \ - && adduser -S -g node -u 999 node + && adduser -S -G node -u 999 node ``` ## Memory From 45fa3ebe94598758b9c9e4a382236fc7e879e2e6 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 11 Oct 2018 07:58:50 +0200 Subject: [PATCH 164/818] upgrade to node 10.12 (#872) https://nodejs.org/en/blog/release/v10.12.0/ --- 10/alpine/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 23f4be83ab..90c9bbf8d6 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.11.0 +ENV NODE_VERSION 10.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.10.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index a6179be70e..c5563f8ac5 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.11.0 +ENV NODE_VERSION 10.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.10.1 RUN set -ex \ && for key in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index c3345092d5..c4d00c7b87 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.11.0 +ENV NODE_VERSION 10.12.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -46,7 +46,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.10.1 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index f9459be73a..1ab32fcc28 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.11.0 +ENV NODE_VERSION 10.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.10.1 RUN set -ex \ && for key in \ From e007863a848ca34221bb24549293567e2336445b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 24 Oct 2018 02:05:40 +0800 Subject: [PATCH 165/818] Add node.js v11.0.0 with Yarn v1.10.1 - https://github.com/nodejs/node/releases/tag/v11.0.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md --- .travis.yml | 20 +++++++++++++ 11/alpine/Dockerfile | 69 +++++++++++++++++++++++++++++++++++++++++++ 11/jessie/Dockerfile | 63 +++++++++++++++++++++++++++++++++++++++ 11/slim/Dockerfile | 68 ++++++++++++++++++++++++++++++++++++++++++ 11/stretch/Dockerfile | 63 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 283 insertions(+) create mode 100644 11/alpine/Dockerfile create mode 100644 11/jessie/Dockerfile create mode 100644 11/slim/Dockerfile create mode 100644 11/stretch/Dockerfile diff --git a/.travis.yml b/.travis.yml index dfd43041e2..d9e1c9d5ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,6 +100,26 @@ jobs: - NODE_VERSION: "10" - VARIANT: "stretch" + - stage: Build + env: + - NODE_VERSION: "11" + - VARIANT: "jessie" + + - stage: Build + env: + - NODE_VERSION: "11" + - VARIANT: "alpine" + + - stage: Build + env: + - NODE_VERSION: "11" + - VARIANT: "slim" + + - stage: Build + env: + - NODE_VERSION: "11" + - VARIANT: "stretch" + - stage: Build env: - NODE_VERSION: "6" diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile new file mode 100644 index 0000000000..e8ad54634b --- /dev/null +++ b/11/alpine/Dockerfile @@ -0,0 +1,69 @@ +FROM alpine:3.8 + +ENV NODE_VERSION 11.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + binutils-gold \ + curl \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-team + && 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 \ + && 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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ + && apk del .build-deps \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + +ENV YARN_VERSION 1.10.1 + +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" ; \ + 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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +CMD [ "node" ] diff --git a/11/jessie/Dockerfile b/11/jessie/Dockerfile new file mode 100644 index 0000000000..475cc55323 --- /dev/null +++ b/11/jessie/Dockerfile @@ -0,0 +1,63 @@ +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 +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 11.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.10.1 + +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" ; \ + 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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/11/slim/Dockerfile b/11/slim/Dockerfile new file mode 100644 index 0000000000..c7001b7279 --- /dev/null +++ b/11/slim/Dockerfile @@ -0,0 +1,68 @@ +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 +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 11.0.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + && rm -rf /var/lib/apt/lists/* \ + && 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.10.1 + +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" ; \ + 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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile new file mode 100644 index 0000000000..3ad8c2c59e --- /dev/null +++ b/11/stretch/Dockerfile @@ -0,0 +1,63 @@ +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 11.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.10.1 + +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" ; \ + 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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] From b213f135c6a04b16974571fb71a8ad12172aaef6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 26 Sep 2018 12:43:06 -0700 Subject: [PATCH 166/818] Remove "jessie" from unsupported architectures See https://wiki.debian.org/LTS for the list of supported "Debian Jessie" architectures (currently "i386, amd64, armel and armhf"). --- 6/architectures | 6 +++--- 8/architectures | 6 +++--- architectures | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/6/architectures b/6/architectures index f6a7427404..e6e713740e 100644 --- a/6/architectures +++ b/6/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants arm32v7 jessie,onbuild,slim,stretch -arm64v8 jessie,onbuild,slim,stretch +arm64v8 onbuild,slim,stretch amd64 jessie,alpine,onbuild,slim,stretch i386 jessie,onbuild,slim,stretch -ppc64le jessie,onbuild,slim,stretch -s390x jessie,onbuild,slim,stretch +ppc64le onbuild,slim,stretch +s390x onbuild,slim,stretch diff --git a/8/architectures b/8/architectures index 1a9b7a2dd8..bbad436cd4 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine arm32v7 jessie,onbuild,slim,stretch -arm64v8 jessie,alpine,onbuild,slim,stretch +arm64v8 alpine,onbuild,slim,stretch amd64 jessie,alpine,onbuild,slim,stretch i386 jessie,alpine,onbuild,slim,stretch -ppc64le jessie,alpine,onbuild,slim,stretch -s390x jessie,alpine,onbuild,slim,stretch +ppc64le alpine,onbuild,slim,stretch +s390x alpine,onbuild,slim,stretch diff --git a/architectures b/architectures index 16bb20a2cb..61e48194de 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine arm32v7 jessie,onbuild,slim,stretch -arm64v8 jessie,alpine,onbuild,slim,stretch +arm64v8 alpine,onbuild,slim,stretch amd64 jessie,alpine,onbuild,slim,stretch i386 alpine -ppc64le jessie,alpine,onbuild,slim,stretch -s390x jessie,alpine,onbuild,slim,stretch +ppc64le alpine,onbuild,slim,stretch +s390x alpine,onbuild,slim,stretch From 336fb229392876a5f0d893436aeccf8c80011eeb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 30 Oct 2018 16:48:29 +0800 Subject: [PATCH 167/818] Update node.js v10.x to v10.13.0 --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 90c9bbf8d6..f5c22ab304 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.12.0 +ENV NODE_VERSION 10.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index c5563f8ac5..100af7a052 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.12.0 +ENV NODE_VERSION 10.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index c4d00c7b87..20c9cb8f2e 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.12.0 +ENV NODE_VERSION 10.13.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 1ab32fcc28..c9ad9bbf48 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \ done -ENV NODE_VERSION 10.12.0 +ENV NODE_VERSION 10.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 119e51741fdeb1d2b25a942a20070d4c8a3ccc3a Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Tue, 30 Oct 2018 15:03:44 -0500 Subject: [PATCH 168/818] feat: add Dubnium LTS tag to 10.x, mark 11.x as latest - https://nodejs.org/en/blog/release/v10.13.0/ - https://nodejs.org/en/blog/release/v11.0.0/ --- generate-stackbrew-library.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index b40d7374f2..d89798ae90 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,7 +11,9 @@ array_6='6 boron' # shellcheck disable=SC2034 array_8='8 carbon' # shellcheck disable=SC2034 -array_10='10 latest' +array_10='10 dubnium' +# shellcheck disable=SC2034 +array_11='11 latest' # shellcheck disable=SC2034 array_chakracore_8='chakracore-8' # shellcheck disable=SC2034 From 24cc570947f7162f1d19e647f13a404b1eaca2c2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 31 Oct 2018 00:25:48 +0800 Subject: [PATCH 169/818] Switch slim template to Debian Stretch --- Dockerfile-slim.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 7acdd44b67..aa72512011 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -1,4 +1,4 @@ -FROM debian:jessie-slim +FROM debian:stretch-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node From 4fbab6d9aa1643ad73cb0567a844fdb90b4ee1a1 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 31 Oct 2018 01:57:52 +0800 Subject: [PATCH 170/818] Switch onbuild template to Debian Stretch --- Dockerfile-onbuild.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template index 5697066cb6..5b0cbc8846 100644 --- a/Dockerfile-onbuild.template +++ b/Dockerfile-onbuild.template @@ -1,4 +1,4 @@ -FROM node:0.0.0-jessie +FROM node:0.0.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app From 1a53c880305ffcb75b878f91fa842b7c0355cc53 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 31 Oct 2018 02:03:35 +0800 Subject: [PATCH 171/818] Switch chakracore template to Debian Stretch --- chakracore/Dockerfile.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index f8863ea4e6..3ce15cc62b 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie +FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node From d7457f883cc0e391f8cbc5d07ca7d46bc1846f26 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 31 Oct 2018 17:52:02 +0800 Subject: [PATCH 172/818] Set default variant to Debian Stretch instead of Jessie --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index d053ce6dc2..07517578cb 100644 --- a/config +++ b/config @@ -1,3 +1,3 @@ baseuri https://nodejs.org/dist -default_variant jessie +default_variant stretch alpine_version 3.8 From 2dc90a68616c44a667205bd6dc68e8cc5fbb63d8 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 1 Nov 2018 01:05:33 +0800 Subject: [PATCH 173/818] Move gpg key import after architecture checking --- Dockerfile-jessie.template | 19 +++++++++---------- Dockerfile-slim.template | 19 ++++++++----------- Dockerfile-stretch.template | 19 +++++++++---------- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/Dockerfile-jessie.template b/Dockerfile-jessie.template index 947612df17..cccf1d96f7 100644 --- a/Dockerfile-jessie.template +++ b/Dockerfile-jessie.template @@ -3,16 +3,6 @@ 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 -RUN set -ex \ - && for key in \ - "${NODE_KEYS[@]}" - ; 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 0.0.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -25,6 +15,15 @@ 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-team + && set -ex \ + && for key in \ + "${NODE_KEYS[@]}" + ; 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 \ && 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 \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index aa72512011..d4e9f27619 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -3,16 +3,6 @@ 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 \ - "${NODE_KEYS[@]}" - ; 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 0.0.0 RUN buildDeps='xz-utils' \ @@ -26,9 +16,16 @@ RUN buildDeps='xz-utils' \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && set -x \ + && set -ex \ && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + && for key in \ + "${NODE_KEYS[@]}" + ; 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 && 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 \ diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index 4bdf7193f6..f31efbf3f5 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -3,16 +3,6 @@ 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 \ - "${NODE_KEYS[@]}" - ; 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 0.0.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -25,6 +15,15 @@ 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-team + && set -ex \ + && for key in \ + "${NODE_KEYS[@]}" + ; 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 \ && 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 \ From ce9b7cd4490ba52d430c6fb7b3eef52799fe2575 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 1 Nov 2018 01:06:21 +0800 Subject: [PATCH 174/818] Add missing dependency gnupg & dirmngr in slim template --- Dockerfile-slim.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index d4e9f27619..4f822af783 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -17,7 +17,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ + && 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 \ "${NODE_KEYS[@]}" @@ -25,7 +25,7 @@ RUN buildDeps='xz-utils' \ 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 + 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 \ From daf910e1241580d468375380649239a87dd65e74 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 31 Oct 2018 17:46:23 +0800 Subject: [PATCH 175/818] Update node.js v11 slim image to use Debian Stretch --- 11/slim/Dockerfile | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/11/slim/Dockerfile b/11/slim/Dockerfile index c7001b7279..37ff88f366 100644 --- a/11/slim/Dockerfile +++ b/11/slim/Dockerfile @@ -1,26 +1,8 @@ -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 11.0.0 RUN buildDeps='xz-utils' \ @@ -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 --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 \ && 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 \ From adc272a9fd1370e6c54b4e5e9b31fb43ebb2137b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 31 Oct 2018 17:53:53 +0800 Subject: [PATCH 176/818] Remove node.js v11 Debian Jessie variant --- .travis.yml | 5 ---- 11/jessie/Dockerfile | 63 -------------------------------------------- 2 files changed, 68 deletions(-) delete mode 100644 11/jessie/Dockerfile diff --git a/.travis.yml b/.travis.yml index d9e1c9d5ca..27391bb9e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,11 +100,6 @@ jobs: - NODE_VERSION: "10" - VARIANT: "stretch" - - stage: Build - env: - - NODE_VERSION: "11" - - VARIANT: "jessie" - - stage: Build env: - NODE_VERSION: "11" diff --git a/11/jessie/Dockerfile b/11/jessie/Dockerfile deleted file mode 100644 index 475cc55323..0000000000 --- a/11/jessie/Dockerfile +++ /dev/null @@ -1,63 +0,0 @@ -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 -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 11.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.10.1 - -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" ; \ - 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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] From 8867c37cf8f6643aa4827f72c14d6bc8e892ffd0 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 2 Nov 2018 01:38:33 +0800 Subject: [PATCH 177/818] Add fixed architectures file for v10 --- 10/architectures | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 10/architectures diff --git a/10/architectures b/10/architectures new file mode 100644 index 0000000000..61e48194de --- /dev/null +++ b/10/architectures @@ -0,0 +1,8 @@ +bashbrew-arch variants +arm32v6 alpine +arm32v7 jessie,onbuild,slim,stretch +arm64v8 alpine,onbuild,slim,stretch +amd64 jessie,alpine,onbuild,slim,stretch +i386 alpine +ppc64le alpine,onbuild,slim,stretch +s390x alpine,onbuild,slim,stretch From e4ffb63b0d7999e50e4723c08c1acfd5473e626f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 2 Nov 2018 01:41:59 +0800 Subject: [PATCH 178/818] Temporarily remove some unsupported slim and onbuild architectures --- 10/architectures | 6 +++--- 6/architectures | 6 +++--- 8/architectures | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/10/architectures b/10/architectures index 61e48194de..4b3c4e3cd4 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine arm32v7 jessie,onbuild,slim,stretch -arm64v8 alpine,onbuild,slim,stretch +arm64v8 alpine,onbuild,stretch amd64 jessie,alpine,onbuild,slim,stretch i386 alpine -ppc64le alpine,onbuild,slim,stretch -s390x alpine,onbuild,slim,stretch +ppc64le alpine,onbuild,stretch +s390x alpine,onbuild,stretch diff --git a/6/architectures b/6/architectures index e6e713740e..f878f384aa 100644 --- a/6/architectures +++ b/6/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants arm32v7 jessie,onbuild,slim,stretch -arm64v8 onbuild,slim,stretch +arm64v8 stretch amd64 jessie,alpine,onbuild,slim,stretch i386 jessie,onbuild,slim,stretch -ppc64le onbuild,slim,stretch -s390x onbuild,slim,stretch +ppc64le stretch +s390x stretch diff --git a/8/architectures b/8/architectures index bbad436cd4..44e35db236 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine arm32v7 jessie,onbuild,slim,stretch -arm64v8 alpine,onbuild,slim,stretch +arm64v8 alpine,stretch amd64 jessie,alpine,onbuild,slim,stretch i386 jessie,alpine,onbuild,slim,stretch -ppc64le alpine,onbuild,slim,stretch -s390x alpine,onbuild,slim,stretch +ppc64le alpine,stretch +s390x alpine,stretch From 120b465c249cf08d7939a3a0c07fec897cfcf91d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 2 Nov 2018 20:40:34 +0800 Subject: [PATCH 179/818] Update node.js v11.x to v11.1.0 with Yarn v1.12.1 --- 11/alpine/Dockerfile | 4 ++-- 11/slim/Dockerfile | 4 ++-- 11/stretch/Dockerfile | 33 ++++++++++++++++----------------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index e8ad54634b..26327435b9 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.0.0 +ENV NODE_VERSION 11.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/11/slim/Dockerfile b/11/slim/Dockerfile index 37ff88f366..f84f2b7373 100644 --- a/11/slim/Dockerfile +++ b/11/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 11.0.0 +ENV NODE_VERSION 11.1.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -43,7 +43,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.1 RUN set -ex \ && for key in \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 3ad8c2c59e..1e4a72fd77 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -3,8 +3,20 @@ 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 \ +ENV NODE_VERSION 11.1.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # gpg keys listed at https://github.com/nodejs/node#release-team + && set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -19,20 +31,7 @@ RUN set -ex \ 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 11.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.1 RUN set -ex \ && for key in \ From 4d188a01fe3211707f5080a4705d86e6fb8e0faa Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 6 Nov 2018 14:27:40 +0800 Subject: [PATCH 180/818] Auto skip unnecessary builds --- .travis.yml | 35 +++++++++++++++++++++++++++++++++++ travis.yml.template | 16 ++++++++++++++++ update.sh | 1 + 3 files changed, 52 insertions(+) diff --git a/.travis.yml b/.travis.yml index 27391bb9e8..86c1060ed4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,22 @@ language: generic services: - docker +.before_script: &auto_skip +- | + if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then + TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" + fi + if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then + echo "This is a new branch" + elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then + echo "Change range not recognized" + elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then + echo "Change of $NODE_VERSION\\$VARIANT\Dockerfile detected." + else + echo "Skip build of $NODE_VERSION\\$VARIANT\Dockerfile as it's not changed." + exit + fi + script: ./test-build.sh $NODE_VERSION $VARIANT stages: @@ -81,96 +97,115 @@ jobs: # Docker Build # - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "10" - VARIANT: "jessie" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "10" - VARIANT: "alpine" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "10" - VARIANT: "slim" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "10" - VARIANT: "stretch" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "11" - VARIANT: "alpine" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "11" - VARIANT: "slim" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "11" - VARIANT: "stretch" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "6" - VARIANT: "jessie" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "6" - VARIANT: "alpine" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "6" - VARIANT: "onbuild" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "6" - VARIANT: "slim" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "6" - VARIANT: "stretch" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "8" - VARIANT: "jessie" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "8" - VARIANT: "alpine" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "8" - VARIANT: "onbuild" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "8" - VARIANT: "slim" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "8" - VARIANT: "stretch" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "chakracore/10" - VARIANT: "default" - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "chakracore/8" - VARIANT: "default" diff --git a/travis.yml.template b/travis.yml.template index 67769012c4..c96de169b5 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -8,6 +8,22 @@ language: generic services: - docker +.before_script: &auto_skip +- | + if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then + TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" + fi + if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then + echo "This is a new branch" + elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then + echo "Change range not recognized" + elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then + echo "Change of $NODE_VERSION\\$VARIANT\Dockerfile detected." + else + echo "Skip build of $NODE_VERSION\\$VARIANT\Dockerfile as it's not changed." + exit + fi + script: ./test-build.sh $NODE_VERSION $VARIANT stages: diff --git a/update.sh b/update.sh index 36fd841ac3..0c267fea2f 100755 --- a/update.sh +++ b/update.sh @@ -181,6 +181,7 @@ function add_stage() { echo ' - stage: Build + before_script: *auto_skip env: - NODE_VERSION: "'"${version}"'" - VARIANT: "'"${variant}"'"' >> .travis.yml From 99023fb878ce80bf7710577b064934109ed10ebe Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Thu, 8 Nov 2018 17:09:11 -0500 Subject: [PATCH 181/818] explain how to upgrade Yarn on Alpine (#902) Fixes #901 --- docs/BestPractices.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index d3190e5644..90c8ee6da6 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -45,6 +45,22 @@ RUN curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$ && rm yarn-v$YARN_VERSION.tar.gz ``` +If you're using an Alpine-based image, `curl` won't be present, so you'll need to make sure it's installed while using it: + +```Dockerfile +FROM node:6-alpine + +ENV YARN_VERSION 1.5.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl \ + && curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -snf /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -snf /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn +``` + ## Handling Kernel Signals Node.js was not designed to run as PID 1 which leads to unexpected behaviour when running inside of Docker. For example, a Node.js process running as PID 1 will not respond to `SIGTERM` (`CTRL-C`) and similar signals. As of Docker 1.13, you can use the `--init` flag to wrap your Node.js process with a [lightweight init system](https://github.com/krallin/tini) that properly handles running as PID 1. From 9c42cff9f1c0928c487c86a76e1383b0ace78c0a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 11 Nov 2018 17:09:03 +0800 Subject: [PATCH 182/818] Update shfmt to v2.6.0 --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86c1060ed4..e4bc7ec6fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.1 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.0 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index c96de169b5..b73d6ff912 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -72,7 +72,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.5.1 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.0 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From 5c23d96539cb4dcb9007b86f6bfd861cd2eec843 Mon Sep 17 00:00:00 2001 From: Max Winterstein Date: Mon, 12 Nov 2018 10:07:33 +0100 Subject: [PATCH 183/818] Fix wrong link to gpg keys --- 10/alpine/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 11/alpine/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 6/jessie/Dockerfile | 2 +- 6/slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 8/jessie/Dockerfile | 2 +- 8/slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- Dockerfile-jessie.template | 2 +- Dockerfile-stretch.template | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index f5c22ab304..901a3ea530 100644 --- a/10/alpine/Dockerfile +++ b/10/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 \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 100af7a052..b8d705c7f2 100644 --- a/10/jessie/Dockerfile +++ b/10/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 \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 20c9cb8f2e..92a60b0757 100644 --- a/10/slim/Dockerfile +++ b/10/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 \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index c9ad9bbf48..94ffe277d5 100644 --- a/10/stretch/Dockerfile +++ b/10/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 -# 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 \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 26327435b9..670e498452 100644 --- a/11/alpine/Dockerfile +++ b/11/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 \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 1e4a72fd77..960f1c6246 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -15,7 +15,7 @@ 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-team + # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 107a9afd82..194cca32a9 100644 --- a/6/alpine/Dockerfile +++ b/6/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 \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index b4acb817a1..69c899ca98 100644 --- a/6/jessie/Dockerfile +++ b/6/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 \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 3e13b9e7f2..81b1ca5649 100644 --- a/6/slim/Dockerfile +++ b/6/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 \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 17b227b238..306f111972 100644 --- a/6/stretch/Dockerfile +++ b/6/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 -# 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 \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index ebb0ec2882..f69616eb74 100644 --- a/8/alpine/Dockerfile +++ b/8/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 \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 8b7fef5424..1c28d038fc 100644 --- a/8/jessie/Dockerfile +++ b/8/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 \ diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index f2df83b560..76c5b1f1b3 100644 --- a/8/slim/Dockerfile +++ b/8/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 \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index bbd97f09b7..1816d67923 100644 --- a/8/stretch/Dockerfile +++ b/8/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 -# 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 \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 69f932c196..a79f327db0 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -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 \ "${NODE_KEYS[@]}" ; do \ diff --git a/Dockerfile-jessie.template b/Dockerfile-jessie.template index cccf1d96f7..4c6ffa8992 100644 --- a/Dockerfile-jessie.template +++ b/Dockerfile-jessie.template @@ -15,7 +15,7 @@ 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-team + # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ "${NODE_KEYS[@]}" diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template index f31efbf3f5..4902cddf1e 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -15,7 +15,7 @@ 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-team + # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ "${NODE_KEYS[@]}" From d0c51369c33e62b09f9e6bdc1a355481eb5c48d8 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 13 Nov 2018 15:36:33 +0800 Subject: [PATCH 184/818] Print not recognized $TRAVIS_COMMIT_RANGE on Travis CI --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4bc7ec6fe..8e627c744b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ services: if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then echo "This is a new branch" elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then - echo "Change range not recognized" + echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then echo "Change of $NODE_VERSION\\$VARIANT\Dockerfile detected." else diff --git a/travis.yml.template b/travis.yml.template index b73d6ff912..d7d05d6e20 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -16,7 +16,7 @@ services: if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then echo "This is a new branch" elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then - echo "Change range not recognized" + echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then echo "Change of $NODE_VERSION\\$VARIANT\Dockerfile detected." else From 15731bf4b25a7193dd829090378d5ffa4931dabf Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 13 Nov 2018 13:53:02 +0800 Subject: [PATCH 185/818] Update Travis CI environment to Ubuntu Xenial --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4bc7ec6fe..3c97fb60ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ --- -dist: trusty +dist: xenial sudo: false language: generic diff --git a/travis.yml.template b/travis.yml.template index b73d6ff912..d13d632a8a 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -1,6 +1,6 @@ --- -dist: trusty +dist: xenial sudo: false language: generic From 8c1a1b9e724b5c7b251bd2a3ee611975c9cca6fc Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 15 Nov 2018 12:19:21 +0800 Subject: [PATCH 186/818] Remove duplicated language setting in .travis.yml Already set global to generic, no need to set the same language again. --- .travis.yml | 1 - travis.yml.template | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c97fb60ce..7571b09664 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,6 @@ jobs: - stage: Test env: - TEST: .travis.yml and travis.yml.template consistency - language: generic script: - ./update.sh - git diff --stat --exit-code .travis.yml diff --git a/travis.yml.template b/travis.yml.template index d13d632a8a..0cd547edfb 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -84,7 +84,6 @@ jobs: - stage: Test env: - TEST: .travis.yml and travis.yml.template consistency - language: generic script: - ./update.sh - git diff --stat --exit-code .travis.yml From bfd0d320532059e1b568a62b50b500e4008f20bc Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 15 Nov 2018 12:22:12 +0800 Subject: [PATCH 187/818] Update Travis CI default environment to the minimal image Ref: - https://docs.travis-ci.com/user/languages/minimal-and-generic/ --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7571b09664..9a5eee56b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dist: xenial sudo: false -language: generic +language: minimal services: - docker diff --git a/travis.yml.template b/travis.yml.template index 0cd547edfb..f7c3984f50 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -3,7 +3,7 @@ dist: xenial sudo: false -language: generic +language: minimal services: - docker From b5714d0354ab6f27438bd60a763bbe4ea60f21ad Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 15 Nov 2018 19:18:33 +0800 Subject: [PATCH 188/818] Fix help message indentation in update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 0c267fea2f..5ed010a118 100755 --- a/update.sh +++ b/update.sh @@ -12,7 +12,7 @@ function usage() { Examples: - update.sh # Update all images - update.sh -s # Update all images, skip updating Alpine and Yarn - - update.sh 8,10 # Update version 8 and 10 and variants (default, slim, alpine etc.) + - update.sh 8,10 # Update version 8 and 10 and variants (default, slim, alpine etc.) - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn - update.sh 8 slim,stretch # Update only slim and stretch variants for version 8 - update.sh -s 8 slim,stretch # Update only slim and stretch variants for version 8, skip updating Alpine and Yarn From 241b2cfaca1ba225f312d439365d4410c94737fb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 16 Nov 2018 11:53:19 +0800 Subject: [PATCH 189/818] Update node.js v11 to v11.2.0 with Yarn v1.12.3 --- 11/alpine/Dockerfile | 4 ++-- 11/slim/Dockerfile | 4 ++-- 11/stretch/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 670e498452..e14465546b 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.1.0 +ENV NODE_VERSION 11.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.12.1 +ENV YARN_VERSION 1.12.3 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/11/slim/Dockerfile b/11/slim/Dockerfile index f84f2b7373..e77b190b33 100644 --- a/11/slim/Dockerfile +++ b/11/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 11.1.0 +ENV NODE_VERSION 11.2.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -43,7 +43,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.1 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 960f1c6246..f755150d00 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.1.0 +ENV NODE_VERSION 11.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -40,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.1 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ From 8ccd57c1457a1b47adc4d82f9fed9ad51ccef3c5 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Fri, 16 Nov 2018 12:15:31 -0500 Subject: [PATCH 190/818] Update gpg invocations to use --batch See: - https://bugs.debian.org/913614 - https://github.com/docker-library/busybox/pull/55 --- 10/alpine/Dockerfile | 12 ++++++------ 10/jessie/Dockerfile | 12 ++++++------ 10/slim/Dockerfile | 12 ++++++------ 10/stretch/Dockerfile | 12 ++++++------ 11/alpine/Dockerfile | 12 ++++++------ 11/slim/Dockerfile | 12 ++++++------ 11/stretch/Dockerfile | 12 ++++++------ 6/alpine/Dockerfile | 12 ++++++------ 6/jessie/Dockerfile | 12 ++++++------ 6/slim/Dockerfile | 12 ++++++------ 6/stretch/Dockerfile | 12 ++++++------ 8/alpine/Dockerfile | 12 ++++++------ 8/jessie/Dockerfile | 12 ++++++------ 8/slim/Dockerfile | 12 ++++++------ 8/stretch/Dockerfile | 12 ++++++------ Dockerfile-alpine.template | 12 ++++++------ Dockerfile-jessie.template | 12 ++++++------ Dockerfile-slim.template | 12 ++++++------ Dockerfile-stretch.template | 12 ++++++------ chakracore/10/Dockerfile | 6 +++--- chakracore/8/Dockerfile | 6 +++--- chakracore/Dockerfile.template | 6 +++--- 22 files changed, 123 insertions(+), 123 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 901a3ea530..df717084f2 100644 --- a/10/alpine/Dockerfile +++ b/10/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/10/jessie/Dockerfile b/10/jessie/Dockerfile index b8d705c7f2..136020c17b 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -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/10/slim/Dockerfile b/10/slim/Dockerfile index 92a60b0757..a40442ec43 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -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/10/stretch/Dockerfile b/10/stretch/Dockerfile index 94ffe277d5..f1519c43fb 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -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/11/alpine/Dockerfile b/11/alpine/Dockerfile index e14465546b..b3ba9dada9 100644 --- a/11/alpine/Dockerfile +++ b/11/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/11/slim/Dockerfile b/11/slim/Dockerfile index e77b190b33..05f84640a7 100644 --- a/11/slim/Dockerfile +++ b/11/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" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index f755150d00..699ea2b7f9 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/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/6/alpine/Dockerfile b/6/alpine/Dockerfile index 194cca32a9..319aa990e9 100644 --- a/6/alpine/Dockerfile +++ b/6/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/6/jessie/Dockerfile b/6/jessie/Dockerfile index 69c899ca98..88aa05435f 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -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/6/slim/Dockerfile b/6/slim/Dockerfile index 81b1ca5649..10a8e81b2b 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -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/6/stretch/Dockerfile b/6/stretch/Dockerfile index 306f111972..b86bf27cb7 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -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/8/alpine/Dockerfile b/8/alpine/Dockerfile index f69616eb74..62f762c7b9 100644 --- a/8/alpine/Dockerfile +++ b/8/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/8/jessie/Dockerfile b/8/jessie/Dockerfile index 1c28d038fc..cf8038ccb0 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -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 8.12.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/8/slim/Dockerfile b/8/slim/Dockerfile index 76c5b1f1b3..5ac114662e 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -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 8.12.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/8/stretch/Dockerfile b/8/stretch/Dockerfile index 1816d67923..7a55d4dfd3 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -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 8.12.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/Dockerfile-alpine.template b/Dockerfile-alpine.template index a79f327db0..ee54a07184 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -20,9 +20,9 @@ RUN addgroup -g 1000 node \ && for key in \ "${NODE_KEYS[@]}" ; 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" \ @@ -44,9 +44,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ "${YARN_KEYS[@]}" ; 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/Dockerfile-jessie.template b/Dockerfile-jessie.template index 4c6ffa8992..f5a638bb4b 100644 --- a/Dockerfile-jessie.template +++ b/Dockerfile-jessie.template @@ -20,9 +20,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ "${NODE_KEYS[@]}" ; 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" \ @@ -38,9 +38,9 @@ RUN set -ex \ && for key in \ "${YARN_KEYS[@]}" ; 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/Dockerfile-slim.template b/Dockerfile-slim.template index 4f822af783..5fc343b546 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -22,9 +22,9 @@ RUN buildDeps='xz-utils' \ && for key in \ "${NODE_KEYS[@]}" ; 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" \ @@ -41,9 +41,9 @@ RUN set -ex \ && for key in \ "${YARN_KEYS[@]}" ; 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/Dockerfile-stretch.template b/Dockerfile-stretch.template index 4902cddf1e..149d1b2611 100644 --- a/Dockerfile-stretch.template +++ b/Dockerfile-stretch.template @@ -20,9 +20,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ "${NODE_KEYS[@]}" ; 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" \ @@ -38,9 +38,9 @@ RUN set -ex \ && for key in \ "${YARN_KEYS[@]}" ; 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/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index bb99c406de..6b9eb684e5 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/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/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index f0913eb708..b268beee2f 100644 --- a/chakracore/8/Dockerfile +++ b/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/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index 3ce15cc62b..401f7d58e0 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -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" \ From 86f9c373e7e3b290f8b4f66bdb9ef4757756e349 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 18 Nov 2018 00:35:30 +0800 Subject: [PATCH 191/818] Fix output msg of Travis CI auto cancel job --- .travis.yml | 4 ++-- travis.yml.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e11dfb9982..a67cec35e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ services: elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then - echo "Change of $NODE_VERSION\\$VARIANT\Dockerfile detected." + echo "Change of $NODE_VERSION\/$VARIANT\/Dockerfile detected." else - echo "Skip build of $NODE_VERSION\\$VARIANT\Dockerfile as it's not changed." + echo "Skip build of $NODE_VERSION\/$VARIANT\/Dockerfile as it's not changed." exit fi diff --git a/travis.yml.template b/travis.yml.template index 2d1c3e9515..5e8bd7733b 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -18,9 +18,9 @@ services: elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then - echo "Change of $NODE_VERSION\\$VARIANT\Dockerfile detected." + echo "Change of $NODE_VERSION\/$VARIANT\/Dockerfile detected." else - echo "Skip build of $NODE_VERSION\\$VARIANT\Dockerfile as it's not changed." + echo "Skip build of $NODE_VERSION\/$VARIANT\/Dockerfile as it's not changed." exit fi From dca26e2122b4cf466ef21b08a3317b3f7c2ad088 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 18 Nov 2018 00:38:19 +0800 Subject: [PATCH 192/818] Fix auto skip Travis CI job for chakracore build --- .travis.yml | 11 ++++++++--- travis.yml.template | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a67cec35e8..39ad8bf305 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,19 @@ services: if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" fi + if [ "default" = "$VARIANT" ]; then + Dockerfile="$NODE_VERSION/Dockerfile" + else + Dockerfile="$NODE_VERSION/$VARIANT/Dockerfile" + fi if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then echo "This is a new branch" elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then - echo "Change of $NODE_VERSION\/$VARIANT\/Dockerfile detected." + elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile"; then + echo "Change of $Dockerfile detected." else - echo "Skip build of $NODE_VERSION\/$VARIANT\/Dockerfile as it's not changed." + echo "Skip build of $Dockerfile as it's not changed." exit fi diff --git a/travis.yml.template b/travis.yml.template index 5e8bd7733b..475c10ad42 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -13,14 +13,19 @@ services: if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" fi + if [ "default" = "$VARIANT" ]; then + Dockerfile="$NODE_VERSION/Dockerfile" + else + Dockerfile="$NODE_VERSION/$VARIANT/Dockerfile" + fi if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then echo "This is a new branch" elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$NODE_VERSION\/$VARIANT\/Dockerfile"; then - echo "Change of $NODE_VERSION\/$VARIANT\/Dockerfile detected." + elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile"; then + echo "Change of $Dockerfile detected." else - echo "Skip build of $NODE_VERSION\/$VARIANT\/Dockerfile as it's not changed." + echo "Skip build of $Dockerfile as it's not changed." exit fi From 00d7dfcbbf833bf8efb26673c5609f1e3b4751c4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 18 Nov 2018 01:13:15 +0800 Subject: [PATCH 193/818] Improve Travis CI auto skip build script --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39ad8bf305..352ea59d22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ services: echo "This is a new branch" elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile"; then + elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile$"; then echo "Change of $Dockerfile detected." else echo "Skip build of $Dockerfile as it's not changed." diff --git a/travis.yml.template b/travis.yml.template index 475c10ad42..657c39ce7e 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -22,7 +22,7 @@ services: echo "This is a new branch" elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile"; then + elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile$"; then echo "Change of $Dockerfile detected." else echo "Skip build of $Dockerfile as it's not changed." From 69c8a5f448f46f9e34d7fb577eca79ba01f6864d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 17 Nov 2018 22:30:07 +0800 Subject: [PATCH 194/818] Update chakracore v10 to v10.13.0 w/ Yarn@1.12.3 & Stretch base image --- chakracore/10/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index 6b9eb684e5..52a24d4d5d 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/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 -ENV NODE_VERSION 10.6.0 +ENV NODE_VERSION 10.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.7.0 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ From a40de0b31f581aa73238b287c0fbc13d74d0d373 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 18 Nov 2018 17:26:59 +0800 Subject: [PATCH 195/818] Update shfmt to v2.6.1 --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 352ea59d22..272a029f04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.0 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.1 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index 657c39ce7e..fd716ed715 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -77,7 +77,7 @@ jobs: env: - TEST: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.0 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.1 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From fe5a0629ef8a26551d9c3a3a06baf8dbcb5407b2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 19 Nov 2018 20:35:36 +0800 Subject: [PATCH 196/818] Add update.sh -t option to update .travis.yml only Close #909 --- update.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index 5ed010a118..2b25ce59ce 100755 --- a/update.sh +++ b/update.sh @@ -17,21 +17,28 @@ function usage() { - update.sh 8 slim,stretch # Update only slim and stretch variants for version 8 - update.sh -s 8 slim,stretch # Update only slim and stretch variants for version 8, skip updating Alpine and Yarn - update.sh . alpine # Update the alpine variant for all versions + - update.sh -t # Update .travis.yml only OPTIONS: -s Security update; skip updating the yarn and alpine versions. + -t Travis CI config update only -h Show this message EOF } SKIP=false -while getopts "sh" opt; do +TRAVIS_CI_ONLY=false +while getopts "sth" opt; do case "${opt}" in s) SKIP=true shift ;; + t) + TRAVIS_CI_ONLY=true + shift + ;; h) usage exit @@ -196,7 +203,7 @@ for version in "${versions[@]}"; do baseuri=$(get_config "${parentpath}" "baseuri") update_version=$(in_versions_to_update "${version}") - [ "${update_version}" -eq 0 ] && info "Updating version ${version}..." + [ "${update_version}" -eq 0 ] && [ true != "$TRAVIS_CI_ONLY" ] && info "Updating version ${version}..." # Get supported variants according the target architecture # See details in function.sh @@ -204,6 +211,7 @@ for version in "${versions[@]}"; do if [ -f "${version}/Dockerfile" ]; then add_stage "${baseuri}" "${version}" "default" + [ true = "$TRAVIS_CI_ONLY" ] && continue if [ "${update_version}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & @@ -214,6 +222,7 @@ for version in "${versions[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue add_stage "${baseuri}" "${version}" "${variant}" + [ true = "$TRAVIS_CI_ONLY" ] && continue update_variant=$(in_variants_to_update "${variant}") From 58a9bdd6f378a100b2f16770c7b6c888dfa35434 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 20 Nov 2018 17:54:09 +0800 Subject: [PATCH 197/818] Set markdown-link-check to allow_failures on Travis CI --- .travis.yml | 4 ++++ travis.yml.template | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 272a029f04..829bdf0cb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,10 @@ stages: if: branch = master AND type IN (push) jobs: + allow_failures: + - env: + - TEST: Markdown link check + include: - stage: Test env: diff --git a/travis.yml.template b/travis.yml.template index fd716ed715..a5a6bd8d99 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -38,6 +38,10 @@ stages: if: branch = master AND type IN (push) jobs: + allow_failures: + - env: + - TEST: Markdown link check + include: - stage: Test env: From 0ceefee0745a078709c60d92e4229f5eb6a3df42 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 21 Nov 2018 02:16:02 +0800 Subject: [PATCH 198/818] Update node@8.x to 8.13.0 w/ Yarn v1.12.3 and Stretch based images - https://github.com/nodejs/node/releases/tag/v8.13.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V8.md#8.13.0 --- 8/alpine/Dockerfile | 4 ++-- 8/jessie/Dockerfile | 33 ++++++++++++++++----------------- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 43 ++++++++++++++++++++----------------------- 8/stretch/Dockerfile | 33 ++++++++++++++++----------------- 5 files changed, 55 insertions(+), 60 deletions(-) diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 62f762c7b9..5b8de8de7e 100644 --- a/8/alpine/Dockerfile +++ b/8/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 \ @@ -46,7 +46,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index cf8038ccb0..ae8b16ae8d 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 8.13.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -19,20 +31,7 @@ RUN set -ex \ 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 8.12.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index ce8907ba3f..37fbfc74c5 100644 --- a/8/onbuild/Dockerfile +++ b/8/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/8/slim/Dockerfile b/8/slim/Dockerfile index 5ac114662e..8f3fc75d29 100644 --- a/8/slim/Dockerfile +++ b/8/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-keys -RUN 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 - -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,7 +43,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 7a55d4dfd3..85d7e5a96d 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 8.13.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -19,20 +31,7 @@ RUN set -ex \ 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 8.12.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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,7 +40,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.9.4 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ From bfdf133e3cc3be371aa208fca95b1fb7b1022b98 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 21 Nov 2018 03:44:45 +0800 Subject: [PATCH 199/818] Update v8 architectures, cc #893 --- 8/architectures | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/8/architectures b/8/architectures index 44e35db236..bbad436cd4 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine arm32v7 jessie,onbuild,slim,stretch -arm64v8 alpine,stretch +arm64v8 alpine,onbuild,slim,stretch amd64 jessie,alpine,onbuild,slim,stretch i386 jessie,alpine,onbuild,slim,stretch -ppc64le alpine,stretch -s390x alpine,stretch +ppc64le alpine,onbuild,slim,stretch +s390x alpine,onbuild,slim,stretch From 7e5b3f07e647e5b1850d261dcc15b37be7e4bc2c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 19 Nov 2018 16:09:56 +0800 Subject: [PATCH 200/818] Enable ccache for Alpine builds on Travis CI --- .travis.yml | 50 ++++++++++++++++++++++++++++++++++++++ 10/alpine/Dockerfile | 11 +++++++++ 11/alpine/Dockerfile | 11 +++++++++ 6/alpine/Dockerfile | 11 +++++++++ 8/alpine/Dockerfile | 11 +++++++++ Dockerfile-alpine.template | 11 +++++++++ travis.yml.template | 10 ++++++++ update.sh | 12 +++++++++ 8 files changed, 127 insertions(+) diff --git a/.travis.yml b/.travis.yml index 829bdf0cb1..17b96c3094 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,16 @@ services: echo "Skip build of $Dockerfile as it's not changed." exit fi + if [ "alpine" = "$VARIANT" ]; then + mkdir -p ccache + ( + cd ccache + ls -l + md5sum * + nc -v -l -p 5678 -q 1 < cache.tgz & + nc -v -l -p 1234 -q 1 > new-cache.tgz & + ) + fi script: ./test-build.sh $NODE_VERSION $VARIANT @@ -116,6 +126,16 @@ jobs: - NODE_VERSION: "10" - VARIANT: "alpine" + before_cache: + - ls -hl ccache/ + - ls -l ccache/ + - file ccache/* + - md5sum ccache/* + - mv ccache/new-cache.tgz ccache/cache.tgz + cache: + directories: + - ccache/ + - stage: Build before_script: *auto_skip env: @@ -134,6 +154,16 @@ jobs: - NODE_VERSION: "11" - VARIANT: "alpine" + before_cache: + - ls -hl ccache/ + - ls -l ccache/ + - file ccache/* + - md5sum ccache/* + - mv ccache/new-cache.tgz ccache/cache.tgz + cache: + directories: + - ccache/ + - stage: Build before_script: *auto_skip env: @@ -158,6 +188,16 @@ jobs: - NODE_VERSION: "6" - VARIANT: "alpine" + before_cache: + - ls -hl ccache/ + - ls -l ccache/ + - file ccache/* + - md5sum ccache/* + - mv ccache/new-cache.tgz ccache/cache.tgz + cache: + directories: + - ccache/ + - stage: Build before_script: *auto_skip env: @@ -188,6 +228,16 @@ jobs: - NODE_VERSION: "8" - VARIANT: "alpine" + before_cache: + - ls -hl ccache/ + - ls -l ccache/ + - file ccache/* + - md5sum ccache/* + - mv ccache/new-cache.tgz ccache/cache.tgz + cache: + directories: + - ccache/ + - stage: Build before_script: *auto_skip env: diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index df717084f2..948c5627b6 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -11,6 +11,8 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ + ccache \ + netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -38,10 +40,19 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ + && ln -s /usr/bin/ccache /usr/local/bin/cc \ + && ln -s /usr/bin/ccache /usr/local/bin/gcc \ + && ln -s /usr/bin/ccache /usr/local/bin/g++ \ + && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ + && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ + && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ + && ccache -s 1>&2 \ && apk del .build-deps \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index b3ba9dada9..cadc8f7754 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -11,6 +11,8 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ + ccache \ + netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -38,10 +40,19 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ + && ln -s /usr/bin/ccache /usr/local/bin/cc \ + && ln -s /usr/bin/ccache /usr/local/bin/gcc \ + && ln -s /usr/bin/ccache /usr/local/bin/g++ \ + && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ + && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ + && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ + && ccache -s 1>&2 \ && apk del .build-deps \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 319aa990e9..ff3d221f8f 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -11,6 +11,8 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ + ccache \ + netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -38,10 +40,19 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ + && ln -s /usr/bin/ccache /usr/local/bin/cc \ + && ln -s /usr/bin/ccache /usr/local/bin/gcc \ + && ln -s /usr/bin/ccache /usr/local/bin/g++ \ + && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ + && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ + && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ + && ccache -s 1>&2 \ && apk del .build-deps \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 62f762c7b9..b0351521d2 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -11,6 +11,8 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ + ccache \ + netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -38,10 +40,19 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ + && ln -s /usr/bin/ccache /usr/local/bin/cc \ + && ln -s /usr/bin/ccache /usr/local/bin/gcc \ + && ln -s /usr/bin/ccache /usr/local/bin/g++ \ + && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ + && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ + && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ + && ccache -s 1>&2 \ && apk del .build-deps \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ee54a07184..1ab2aa4ef7 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -11,6 +11,8 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ + ccache \ + netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -30,10 +32,19 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ + && ln -s /usr/bin/ccache /usr/local/bin/cc \ + && ln -s /usr/bin/ccache /usr/local/bin/gcc \ + && ln -s /usr/bin/ccache /usr/local/bin/g++ \ + && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ + && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ + && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ + && ccache -s 1>&2 \ && apk del .build-deps \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/travis.yml.template b/travis.yml.template index a5a6bd8d99..fe8e052bfe 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -28,6 +28,16 @@ services: echo "Skip build of $Dockerfile as it's not changed." exit fi + if [ "alpine" = "$VARIANT" ]; then + mkdir -p ccache + ( + cd ccache + ls -l + md5sum * + nc -v -l -p 5678 -q 1 < cache.tgz & + nc -v -l -p 1234 -q 1 > new-cache.tgz & + ) + fi script: ./test-build.sh $NODE_VERSION $VARIANT diff --git a/update.sh b/update.sh index 2b25ce59ce..8a747f6928 100755 --- a/update.sh +++ b/update.sh @@ -192,6 +192,18 @@ function add_stage() { env: - NODE_VERSION: "'"${version}"'" - VARIANT: "'"${variant}"'"' >> .travis.yml + if [ "alpine" = "${variant}" ]; then + echo ' + before_cache: + - ls -hl ccache/ + - ls -l ccache/ + - file ccache/* + - md5sum ccache/* + - mv ccache/new-cache.tgz ccache/cache.tgz + cache: + directories: + - ccache/' >> .travis.yml + fi } echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # From 28932215645dbdc08ea1a8f360557d4490d0207c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 21 Nov 2018 23:43:47 +0800 Subject: [PATCH 201/818] Fix Alpine build with the missing `|| true` This can prevent the build failed when there is no outside netcat listening for cache transferring. --- 10/alpine/Dockerfile | 2 +- 11/alpine/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 948c5627b6..ee9814a4e1 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -51,7 +51,7 @@ RUN addgroup -g 1000 node \ && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index cadc8f7754..ac3b67d45f 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -51,7 +51,7 @@ RUN addgroup -g 1000 node \ && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index ff3d221f8f..b1691e9669 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -51,7 +51,7 @@ RUN addgroup -g 1000 node \ && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 5ce746afdf..2ac71d7759 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -51,7 +51,7 @@ RUN addgroup -g 1000 node \ && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 1ab2aa4ef7..6cdda2ca9a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -43,7 +43,7 @@ RUN addgroup -g 1000 node \ && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 \ + && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ From a7b5c940e7a71d52f1ee1ac6cddfc1f2342ff0dc Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Wed, 21 Nov 2018 12:01:38 -0500 Subject: [PATCH 202/818] keys: add new keys and remove old keys Added New Releasers: * Beth Griggs - bethany.griggs@uk.ibm.com - 4ED778F539E3634C779C87C6D7062848A1AB005C * Ruben Bridgewater - ruben@bridgewater.de - A48C2BEE680E841632CD4E44F07496B3EB3C1762 Removed Emeritus Releaser: * Italo A. Casas - me@italoacasas.com - 56730D5401028683275BD23C23EFEFE93C4CFFFE Closes: #924 --- keys/node.keys | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keys/node.keys b/keys/node.keys index c0b68fea00..9d88c1505e 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -4,6 +4,7 @@ FD3A5288F042B6850C66B31F09FE44734EB7990E DD8F2338BAE7501E3DD5AC78C273792F7D83545D C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 B9AE9905FFD7803F25714661B63B535A4C206CA9 -56730D5401028683275BD23C23EFEFE93C4CFFFE 77984A986EBC2AA786BC0F66B01FBB92821C587A 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 +4ED778F539E3634C779C87C6D7062848A1AB005C +A48C2BEE680E841632CD4E44F07496B3EB3C1762 From 77c2d0850a520de5e202757f54e5bc9b142f9adf Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 22 Nov 2018 10:09:39 -0800 Subject: [PATCH 203/818] Revert "Enable ccache for Alpine builds on Travis CI" and "Fix Alpine build with the missing `|| true`" This reverts commits 28932215645dbdc08ea1a8f360557d4490d0207c and 7e5b3f07e647e5b1850d261dcc15b37be7e4bc2c. --- .travis.yml | 50 -------------------------------------- 10/alpine/Dockerfile | 11 --------- 11/alpine/Dockerfile | 11 --------- 6/alpine/Dockerfile | 11 --------- 8/alpine/Dockerfile | 11 --------- Dockerfile-alpine.template | 11 --------- travis.yml.template | 10 -------- update.sh | 12 --------- 8 files changed, 127 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17b96c3094..829bdf0cb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,16 +30,6 @@ services: echo "Skip build of $Dockerfile as it's not changed." exit fi - if [ "alpine" = "$VARIANT" ]; then - mkdir -p ccache - ( - cd ccache - ls -l - md5sum * - nc -v -l -p 5678 -q 1 < cache.tgz & - nc -v -l -p 1234 -q 1 > new-cache.tgz & - ) - fi script: ./test-build.sh $NODE_VERSION $VARIANT @@ -126,16 +116,6 @@ jobs: - NODE_VERSION: "10" - VARIANT: "alpine" - before_cache: - - ls -hl ccache/ - - ls -l ccache/ - - file ccache/* - - md5sum ccache/* - - mv ccache/new-cache.tgz ccache/cache.tgz - cache: - directories: - - ccache/ - - stage: Build before_script: *auto_skip env: @@ -154,16 +134,6 @@ jobs: - NODE_VERSION: "11" - VARIANT: "alpine" - before_cache: - - ls -hl ccache/ - - ls -l ccache/ - - file ccache/* - - md5sum ccache/* - - mv ccache/new-cache.tgz ccache/cache.tgz - cache: - directories: - - ccache/ - - stage: Build before_script: *auto_skip env: @@ -188,16 +158,6 @@ jobs: - NODE_VERSION: "6" - VARIANT: "alpine" - before_cache: - - ls -hl ccache/ - - ls -l ccache/ - - file ccache/* - - md5sum ccache/* - - mv ccache/new-cache.tgz ccache/cache.tgz - cache: - directories: - - ccache/ - - stage: Build before_script: *auto_skip env: @@ -228,16 +188,6 @@ jobs: - NODE_VERSION: "8" - VARIANT: "alpine" - before_cache: - - ls -hl ccache/ - - ls -l ccache/ - - file ccache/* - - md5sum ccache/* - - mv ccache/new-cache.tgz ccache/cache.tgz - cache: - directories: - - ccache/ - - stage: Build before_script: *auto_skip env: diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index ee9814a4e1..df717084f2 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ - ccache \ - netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ - && ln -s /usr/bin/ccache /usr/local/bin/cc \ - && ln -s /usr/bin/ccache /usr/local/bin/gcc \ - && ln -s /usr/bin/ccache /usr/local/bin/g++ \ - && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ - && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ - && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ - && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ - && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index ac3b67d45f..b3ba9dada9 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ - ccache \ - netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ - && ln -s /usr/bin/ccache /usr/local/bin/cc \ - && ln -s /usr/bin/ccache /usr/local/bin/gcc \ - && ln -s /usr/bin/ccache /usr/local/bin/g++ \ - && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ - && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ - && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ - && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ - && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index b1691e9669..319aa990e9 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ - ccache \ - netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ - && ln -s /usr/bin/ccache /usr/local/bin/cc \ - && ln -s /usr/bin/ccache /usr/local/bin/gcc \ - && ln -s /usr/bin/ccache /usr/local/bin/g++ \ - && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ - && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ - && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ - && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ - && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 2ac71d7759..5b8de8de7e 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ - ccache \ - netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -40,19 +38,10 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ - && ln -s /usr/bin/ccache /usr/local/bin/cc \ - && ln -s /usr/bin/ccache /usr/local/bin/gcc \ - && ln -s /usr/bin/ccache /usr/local/bin/g++ \ - && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ - && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ - && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ - && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ - && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6cdda2ca9a..ee54a07184 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -11,8 +11,6 @@ RUN addgroup -g 1000 node \ curl \ g++ \ gcc \ - ccache \ - netcat-openbsd \ gnupg \ libgcc \ linux-headers \ @@ -32,19 +30,10 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ - && ln -s /usr/bin/ccache /usr/local/bin/cc \ - && ln -s /usr/bin/ccache /usr/local/bin/gcc \ - && ln -s /usr/bin/ccache /usr/local/bin/g++ \ - && HOST_IP="$(ip route | awk '/default/ { print $3 }')" \ - && nc -v "$HOST_IP" 5678 | tar -xz -C / || true \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) \ && make install \ - && rm -f /usr/local/bin/gcc /usr/local/bin/g++ \ - && ccache -s 1>&2 \ && apk del .build-deps \ - && tar -czf - /root/.ccache/ | nc -v -w 3 "$HOST_IP" 1234 || true \ - && rm -rf /root/.ccache/ \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt diff --git a/travis.yml.template b/travis.yml.template index fe8e052bfe..a5a6bd8d99 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -28,16 +28,6 @@ services: echo "Skip build of $Dockerfile as it's not changed." exit fi - if [ "alpine" = "$VARIANT" ]; then - mkdir -p ccache - ( - cd ccache - ls -l - md5sum * - nc -v -l -p 5678 -q 1 < cache.tgz & - nc -v -l -p 1234 -q 1 > new-cache.tgz & - ) - fi script: ./test-build.sh $NODE_VERSION $VARIANT diff --git a/update.sh b/update.sh index 8a747f6928..2b25ce59ce 100755 --- a/update.sh +++ b/update.sh @@ -192,18 +192,6 @@ function add_stage() { env: - NODE_VERSION: "'"${version}"'" - VARIANT: "'"${variant}"'"' >> .travis.yml - if [ "alpine" = "${variant}" ]; then - echo ' - before_cache: - - ls -hl ccache/ - - ls -l ccache/ - - file ccache/* - - md5sum ccache/* - - mv ccache/new-cache.tgz ccache/cache.tgz - cache: - directories: - - ccache/' >> .travis.yml - fi } echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # From 1d770f3d92fe972030d4914fe9fcdca4d37bbeed Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Sun, 25 Nov 2018 14:10:24 -0500 Subject: [PATCH 204/818] Added the 'lts' and 'current' tags (#930) Fixes #527 --- generate-stackbrew-library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d89798ae90..f549c4b030 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,9 +11,9 @@ array_6='6 boron' # shellcheck disable=SC2034 array_8='8 carbon' # shellcheck disable=SC2034 -array_10='10 dubnium' +array_10='10 dubnium lts' # shellcheck disable=SC2034 -array_11='11 latest' +array_11='11 current latest' # shellcheck disable=SC2034 array_chakracore_8='chakracore-8' # shellcheck disable=SC2034 From 0aae692a71251b60c489c41b7b1f28daa05829e5 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Wed, 28 Nov 2018 13:19:16 +1100 Subject: [PATCH 205/818] Security releases: 6.15.0, 8.14.0, 10.14.0, 11.3.0 (#938) * Security releases: 6.15.0, 8.14.0, 10.14.0, 11.3.0 Ref: https://nodejs.org/en/blog/vulnerability/november-2018-security-releases/ --- 10/alpine/Dockerfile | 5 +++-- 10/jessie/Dockerfile | 34 +++++++++++++++++----------------- 10/slim/Dockerfile | 40 +++++++++++++++++++--------------------- 10/stretch/Dockerfile | 34 +++++++++++++++++----------------- 11/alpine/Dockerfile | 5 +++-- 11/slim/Dockerfile | 5 +++-- 11/stretch/Dockerfile | 5 +++-- 6/alpine/Dockerfile | 5 +++-- 6/jessie/Dockerfile | 34 +++++++++++++++++----------------- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 42 ++++++++++++++++++++---------------------- 6/stretch/Dockerfile | 34 +++++++++++++++++----------------- 8/alpine/Dockerfile | 5 +++-- 8/jessie/Dockerfile | 5 +++-- 8/onbuild/Dockerfile | 2 +- 8/slim/Dockerfile | 5 +++-- 8/stretch/Dockerfile | 5 +++-- 17 files changed, 136 insertions(+), 131 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index df717084f2..232361b89b 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.13.0 +ENV NODE_VERSION 10.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/10/jessie/Dockerfile b/10/jessie/Dockerfile index 136020c17b..fcf675407b 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 10.14.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 10.13.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index a40442ec43..68c1a07ec0 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -3,25 +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-keys -RUN 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 - -ENV NODE_VERSION 10.13.0 +ENV NODE_VERSION 10.14.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -34,9 +16,25 @@ 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + ; 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 \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index f1519c43fb..95719b22c7 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 10.14.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 10.13.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index b3ba9dada9..7578174b34 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.2.0 +ENV NODE_VERSION 11.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/11/slim/Dockerfile b/11/slim/Dockerfile index 05f84640a7..238595859a 100644 --- a/11/slim/Dockerfile +++ b/11/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 11.2.0 +ENV NODE_VERSION 11.3.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -26,9 +26,10 @@ RUN buildDeps='xz-utils' \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/11/stretch/Dockerfile b/11/stretch/Dockerfile index 699ea2b7f9..304932993c 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.2.0 +ENV NODE_VERSION 11.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,9 +24,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/6/alpine/Dockerfile b/6/alpine/Dockerfile index 319aa990e9..b858213304 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.4 -ENV NODE_VERSION 6.14.4 +ENV NODE_VERSION 6.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/6/jessie/Dockerfile b/6/jessie/Dockerfile index 88aa05435f..f4a4ef369b 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 6.15.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 6.14.4 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 870322abfb..269dd723be 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.14.4-jessie +FROM node:6.15.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 10a8e81b2b..28563bab22 100644 --- a/6/slim/Dockerfile +++ b/6/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-keys -RUN 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 - -ENV NODE_VERSION 6.14.4 +ENV NODE_VERSION 6.15.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -34,9 +16,25 @@ 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + ; 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 \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index b86bf27cb7..83a805bf38 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 6.15.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 6.14.4 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 5b8de8de7e..a84235c2b7 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 8.13.0 +ENV NODE_VERSION 8.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/jessie/Dockerfile b/8/jessie/Dockerfile index ae8b16ae8d..8195c89c22 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.13.0 +ENV NODE_VERSION 8.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,9 +24,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 37fbfc74c5..2e18eced23 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.13.0-stretch +FROM node:8.14.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/slim/Dockerfile b/8/slim/Dockerfile index 8f3fc75d29..8dd30efbb4 100644 --- a/8/slim/Dockerfile +++ b/8/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 8.13.0 +ENV NODE_VERSION 8.14.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -26,9 +26,10 @@ RUN buildDeps='xz-utils' \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/stretch/Dockerfile b/8/stretch/Dockerfile index 85d7e5a96d..74bb4a896d 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.13.0 +ENV NODE_VERSION 8.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,9 +24,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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" || \ From ed3e8825b01649d43188e1f606243396a0b995de Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 27 Nov 2018 21:57:52 -0800 Subject: [PATCH 206/818] Revert and re-apply security bump with ONLY version bumps (#939) This is the result of applying a revert of https://github.com/nodejs/docker-node/pull/938 (d2cab2e) followed by applying my simplified "bump-only" patch from https://github.com/nodejs/docker-node/pull/938#issuecomment-442294723 (a1ad45a). --- 10/alpine/Dockerfile | 3 +-- 10/jessie/Dockerfile | 34 +++++++++++++++++----------------- 10/slim/Dockerfile | 38 ++++++++++++++++++++------------------ 10/stretch/Dockerfile | 34 +++++++++++++++++----------------- 11/alpine/Dockerfile | 3 +-- 11/slim/Dockerfile | 3 +-- 11/stretch/Dockerfile | 3 +-- 6/alpine/Dockerfile | 3 +-- 6/jessie/Dockerfile | 34 +++++++++++++++++----------------- 6/onbuild/Dockerfile | 2 +- 6/slim/Dockerfile | 40 +++++++++++++++++++++------------------- 6/stretch/Dockerfile | 34 +++++++++++++++++----------------- 8/alpine/Dockerfile | 3 +-- 8/jessie/Dockerfile | 3 +-- 8/slim/Dockerfile | 3 +-- 8/stretch/Dockerfile | 3 +-- 16 files changed, 119 insertions(+), 124 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 232361b89b..8921b4faa9 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -24,10 +24,9 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/10/jessie/Dockerfile b/10/jessie/Dockerfile index fcf675407b..906d3bfc53 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -3,20 +3,8 @@ FROM buildpack-deps:jessie RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 10.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ +# gpg keys listed at https://github.com/nodejs/node#release-keys +RUN set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -24,15 +12,27 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 \ + done + +ENV NODE_VERSION 10.14.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ && 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 \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index 68c1a07ec0..b509d275f7 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -3,6 +3,24 @@ 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-keys +RUN 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 + ENV NODE_VERSION 10.14.0 RUN buildDeps='xz-utils' \ @@ -16,25 +34,9 @@ RUN buildDeps='xz-utils' \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && set -x \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - ; 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 \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 95719b22c7..8ecd53537d 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -3,20 +3,8 @@ FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 10.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ +# gpg keys listed at https://github.com/nodejs/node#release-keys +RUN set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -24,15 +12,27 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 \ + done + +ENV NODE_VERSION 10.14.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ && 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 \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 7578174b34..bb612d2b5a 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -24,10 +24,9 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/11/slim/Dockerfile b/11/slim/Dockerfile index 238595859a..1c72a09ae9 100644 --- a/11/slim/Dockerfile +++ b/11/slim/Dockerfile @@ -26,10 +26,9 @@ RUN buildDeps='xz-utils' \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/11/stretch/Dockerfile b/11/stretch/Dockerfile index 304932993c..b51672acc5 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -24,10 +24,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/6/alpine/Dockerfile b/6/alpine/Dockerfile index b858213304..dca3ebd695 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -24,10 +24,9 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/6/jessie/Dockerfile b/6/jessie/Dockerfile index f4a4ef369b..905eef516f 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -3,20 +3,8 @@ FROM buildpack-deps:jessie RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 6.15.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ +# gpg keys listed at https://github.com/nodejs/node#release-keys +RUN set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -24,15 +12,27 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 \ + done + +ENV NODE_VERSION 6.15.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ && 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 \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 269dd723be..cc0b0cf0e4 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.15.0-stretch +FROM node:6.15.0-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 28563bab22..0ce6682f58 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -1,8 +1,26 @@ -FROM debian:stretch-slim +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-keys +RUN 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 + ENV NODE_VERSION 6.15.0 RUN buildDeps='xz-utils' \ @@ -16,25 +34,9 @@ RUN buildDeps='xz-utils' \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ - && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && set -x \ + && apt-get update && apt-get install -y ca-certificates curl wget $buildDeps --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - ; 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 \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 83a805bf38..da636cc0a8 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -3,20 +3,8 @@ FROM buildpack-deps:stretch RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 6.15.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ +# gpg keys listed at https://github.com/nodejs/node#release-keys +RUN set -ex \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ @@ -24,15 +12,27 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 \ + done + +ENV NODE_VERSION 6.15.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ && 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 \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index a84235c2b7..ce0d274650 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -24,10 +24,9 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/jessie/Dockerfile b/8/jessie/Dockerfile index 8195c89c22..192d64bd46 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -24,10 +24,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/slim/Dockerfile b/8/slim/Dockerfile index 8dd30efbb4..d30c7867ce 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -26,10 +26,9 @@ RUN buildDeps='xz-utils' \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/stretch/Dockerfile b/8/stretch/Dockerfile index 74bb4a896d..e15dfc3381 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -24,10 +24,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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" || \ From fd2bad889b28587d4722f69c4a51d025df2ae624 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 28 Nov 2018 10:06:39 -0500 Subject: [PATCH 207/818] Updated image to reflect changes in the template --- 10/alpine/Dockerfile | 3 ++- 10/jessie/Dockerfile | 34 +++++++++++++++++----------------- 10/slim/Dockerfile | 38 ++++++++++++++++++-------------------- 10/stretch/Dockerfile | 34 +++++++++++++++++----------------- 11/alpine/Dockerfile | 3 ++- 11/slim/Dockerfile | 3 ++- 11/stretch/Dockerfile | 3 ++- 6/alpine/Dockerfile | 3 ++- 6/jessie/Dockerfile | 34 +++++++++++++++++----------------- 6/slim/Dockerfile | 38 ++++++++++++++++++-------------------- 6/stretch/Dockerfile | 34 +++++++++++++++++----------------- 8/alpine/Dockerfile | 3 ++- 8/jessie/Dockerfile | 3 ++- 8/slim/Dockerfile | 3 ++- 8/stretch/Dockerfile | 3 ++- 15 files changed, 122 insertions(+), 117 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 8921b4faa9..232361b89b 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/10/jessie/Dockerfile b/10/jessie/Dockerfile index 906d3bfc53..fcf675407b 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 10.14.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 10.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/10/slim/Dockerfile b/10/slim/Dockerfile index b509d275f7..68c1a07ec0 100644 --- a/10/slim/Dockerfile +++ b/10/slim/Dockerfile @@ -3,24 +3,6 @@ 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-keys -RUN 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 - ENV NODE_VERSION 10.14.0 RUN buildDeps='xz-utils' \ @@ -34,9 +16,25 @@ 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + ; 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 \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 8ecd53537d..95719b22c7 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 10.14.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 10.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index bb612d2b5a..7578174b34 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/11/slim/Dockerfile b/11/slim/Dockerfile index 1c72a09ae9..238595859a 100644 --- a/11/slim/Dockerfile +++ b/11/slim/Dockerfile @@ -26,9 +26,10 @@ RUN buildDeps='xz-utils' \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/11/stretch/Dockerfile b/11/stretch/Dockerfile index b51672acc5..304932993c 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -24,9 +24,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/6/alpine/Dockerfile b/6/alpine/Dockerfile index dca3ebd695..b858213304 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/6/jessie/Dockerfile b/6/jessie/Dockerfile index 905eef516f..f4a4ef369b 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 6.15.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 6.15.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/6/slim/Dockerfile b/6/slim/Dockerfile index 0ce6682f58..0dca3c559a 100644 --- a/6/slim/Dockerfile +++ b/6/slim/Dockerfile @@ -3,24 +3,6 @@ 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-keys -RUN 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 - ENV NODE_VERSION 6.15.0 RUN buildDeps='xz-utils' \ @@ -34,9 +16,25 @@ 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + ; 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 \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index da636cc0a8..83a805bf38 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -3,8 +3,20 @@ 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-keys -RUN set -ex \ +ENV NODE_VERSION 6.15.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ @@ -12,27 +24,15 @@ RUN set -ex \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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 - -ENV NODE_VERSION 6.15.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ + 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 \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index ce0d274650..a84235c2b7 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -24,9 +24,10 @@ RUN addgroup -g 1000 node \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/jessie/Dockerfile b/8/jessie/Dockerfile index 192d64bd46..8195c89c22 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -24,9 +24,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/slim/Dockerfile b/8/slim/Dockerfile index d30c7867ce..8dd30efbb4 100644 --- a/8/slim/Dockerfile +++ b/8/slim/Dockerfile @@ -26,9 +26,10 @@ RUN buildDeps='xz-utils' \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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/8/stretch/Dockerfile b/8/stretch/Dockerfile index e15dfc3381..74bb4a896d 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -24,9 +24,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ 77984A986EBC2AA786BC0F66B01FBB92821C587A \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ ; 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" || \ From 8c0a9f2c144904631cf783bdd57b4a19300e6b1f Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 29 Nov 2018 09:20:12 -0500 Subject: [PATCH 208/818] Multiple slim (#850) --- .travis.yml | 34 +++++++--- 10/architectures | 4 +- 10/{slim => jessie-slim}/Dockerfile | 0 10/stretch-slim/Dockerfile | 66 +++++++++++++++++++ 11/{slim => stretch-slim}/Dockerfile | 0 6/architectures | 6 +- 6/{slim => jessie-slim}/Dockerfile | 0 6/onbuild/Dockerfile | 2 +- 6/stretch-slim/Dockerfile | 66 +++++++++++++++++++ 8/architectures | 12 ++-- 8/jessie-slim/Dockerfile | 66 +++++++++++++++++++ 8/{slim => stretch-slim}/Dockerfile | 0 ...sie.template => Dockerfile-debian.template | 2 +- Dockerfile-slim.template | 2 +- Dockerfile-stretch.template | 54 --------------- architectures | 10 +-- config | 1 + functions.sh | 28 ++++++++ generate-stackbrew-library.sh | 3 + update.sh | 13 +++- 20 files changed, 287 insertions(+), 82 deletions(-) rename 10/{slim => jessie-slim}/Dockerfile (100%) create mode 100644 10/stretch-slim/Dockerfile rename 11/{slim => stretch-slim}/Dockerfile (100%) rename 6/{slim => jessie-slim}/Dockerfile (100%) create mode 100644 6/stretch-slim/Dockerfile create mode 100644 8/jessie-slim/Dockerfile rename 8/{slim => stretch-slim}/Dockerfile (100%) rename Dockerfile-jessie.template => Dockerfile-debian.template (98%) delete mode 100644 Dockerfile-stretch.template diff --git a/.travis.yml b/.travis.yml index 829bdf0cb1..5f072e3488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,13 +114,13 @@ jobs: before_script: *auto_skip env: - NODE_VERSION: "10" - - VARIANT: "alpine" + - VARIANT: "jessie-slim" - stage: Build before_script: *auto_skip env: - NODE_VERSION: "10" - - VARIANT: "slim" + - VARIANT: "alpine" - stage: Build before_script: *auto_skip @@ -128,6 +128,12 @@ jobs: - NODE_VERSION: "10" - VARIANT: "stretch" + - stage: Build + before_script: *auto_skip + env: + - NODE_VERSION: "10" + - VARIANT: "stretch-slim" + - stage: Build before_script: *auto_skip env: @@ -138,13 +144,13 @@ jobs: before_script: *auto_skip env: - NODE_VERSION: "11" - - VARIANT: "slim" + - VARIANT: "stretch" - stage: Build before_script: *auto_skip env: - NODE_VERSION: "11" - - VARIANT: "stretch" + - VARIANT: "stretch-slim" - stage: Build before_script: *auto_skip @@ -152,6 +158,12 @@ jobs: - NODE_VERSION: "6" - VARIANT: "jessie" + - stage: Build + before_script: *auto_skip + env: + - NODE_VERSION: "6" + - VARIANT: "jessie-slim" + - stage: Build before_script: *auto_skip env: @@ -168,13 +180,13 @@ jobs: before_script: *auto_skip env: - NODE_VERSION: "6" - - VARIANT: "slim" + - VARIANT: "stretch" - stage: Build before_script: *auto_skip env: - NODE_VERSION: "6" - - VARIANT: "stretch" + - VARIANT: "stretch-slim" - stage: Build before_script: *auto_skip @@ -182,6 +194,12 @@ jobs: - NODE_VERSION: "8" - VARIANT: "jessie" + - stage: Build + before_script: *auto_skip + env: + - NODE_VERSION: "8" + - VARIANT: "jessie-slim" + - stage: Build before_script: *auto_skip env: @@ -198,13 +216,13 @@ jobs: before_script: *auto_skip env: - NODE_VERSION: "8" - - VARIANT: "slim" + - VARIANT: "stretch" - stage: Build before_script: *auto_skip env: - NODE_VERSION: "8" - - VARIANT: "stretch" + - VARIANT: "stretch-slim" - stage: Build before_script: *auto_skip diff --git a/10/architectures b/10/architectures index 4b3c4e3cd4..dff4d3459f 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine -arm32v7 jessie,onbuild,slim,stretch +arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim arm64v8 alpine,onbuild,stretch -amd64 jessie,alpine,onbuild,slim,stretch +amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim i386 alpine ppc64le alpine,onbuild,stretch s390x alpine,onbuild,stretch diff --git a/10/slim/Dockerfile b/10/jessie-slim/Dockerfile similarity index 100% rename from 10/slim/Dockerfile rename to 10/jessie-slim/Dockerfile diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile new file mode 100644 index 0000000000..c270ccd432 --- /dev/null +++ b/10/stretch-slim/Dockerfile @@ -0,0 +1,66 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 10.14.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.10.1 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/11/slim/Dockerfile b/11/stretch-slim/Dockerfile similarity index 100% rename from 11/slim/Dockerfile rename to 11/stretch-slim/Dockerfile diff --git a/6/architectures b/6/architectures index f878f384aa..264b7851ed 100644 --- a/6/architectures +++ b/6/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants -arm32v7 jessie,onbuild,slim,stretch +arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim arm64v8 stretch -amd64 jessie,alpine,onbuild,slim,stretch -i386 jessie,onbuild,slim,stretch +amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +i386 jessie,jessie-slim,onbuild,stretch,stretch-slim ppc64le stretch s390x stretch diff --git a/6/slim/Dockerfile b/6/jessie-slim/Dockerfile similarity index 100% rename from 6/slim/Dockerfile rename to 6/jessie-slim/Dockerfile diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index cc0b0cf0e4..269dd723be 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.15.0-jessie +FROM node:6.15.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/stretch-slim/Dockerfile b/6/stretch-slim/Dockerfile new file mode 100644 index 0000000000..28563bab22 --- /dev/null +++ b/6/stretch-slim/Dockerfile @@ -0,0 +1,66 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 6.15.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.6.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/8/architectures b/8/architectures index bbad436cd4..62711562a4 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine -arm32v7 jessie,onbuild,slim,stretch -arm64v8 alpine,onbuild,slim,stretch -amd64 jessie,alpine,onbuild,slim,stretch -i386 jessie,alpine,onbuild,slim,stretch -ppc64le alpine,onbuild,slim,stretch -s390x alpine,onbuild,slim,stretch +arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim +arm64v8 alpine,onbuild,stretch,stretch-slim +amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +ppc64le alpine,onbuild,stretch,stretch-slim +s390x alpine,onbuild,stretch,stretch-slim diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile new file mode 100644 index 0000000000..4d778f4643 --- /dev/null +++ b/8/jessie-slim/Dockerfile @@ -0,0 +1,66 @@ +FROM debian:jessie-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 8.14.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.12.3 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/8/slim/Dockerfile b/8/stretch-slim/Dockerfile similarity index 100% rename from 8/slim/Dockerfile rename to 8/stretch-slim/Dockerfile diff --git a/Dockerfile-jessie.template b/Dockerfile-debian.template similarity index 98% rename from Dockerfile-jessie.template rename to Dockerfile-debian.template index f5a638bb4b..425b982f27 100644 --- a/Dockerfile-jessie.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM buildpack-deps:jessie +FROM buildpack-deps:name RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 5fc343b546..bed6237ca9 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -1,4 +1,4 @@ -FROM debian:stretch-slim +FROM debian:name-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node diff --git a/Dockerfile-stretch.template b/Dockerfile-stretch.template deleted file mode 100644 index 149d1b2611..0000000000 --- a/Dockerfile-stretch.template +++ /dev/null @@ -1,54 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 0.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - "${NODE_KEYS[@]}" - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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 0.0.0 - -RUN set -ex \ - && for key in \ - "${YARN_KEYS[@]}" - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/architectures b/architectures index 61e48194de..d66692de56 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants arm32v6 alpine -arm32v7 jessie,onbuild,slim,stretch -arm64v8 alpine,onbuild,slim,stretch -amd64 jessie,alpine,onbuild,slim,stretch +arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim +arm64v8 alpine,onbuild,stretch,stretch-slim +amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim i386 alpine -ppc64le alpine,onbuild,slim,stretch -s390x alpine,onbuild,slim,stretch +ppc64le alpine,onbuild,stretch,stretch-slim +s390x alpine,onbuild,stretch,stretch-slim diff --git a/config b/config index 07517578cb..6a3cbd6ca9 100644 --- a/config +++ b/config @@ -1,3 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch alpine_version 3.8 +debian_versions jessie stretch diff --git a/functions.sh b/functions.sh index 70f78a6ca7..203b08a0e8 100755 --- a/functions.sh +++ b/functions.sh @@ -169,6 +169,34 @@ function get_versions() { fi } +function is_debian() { + local variant + variant=$1 + shift + + IFS=' ' read -ra debianVersions <<< "$(get_config "./" "debian_versions")" + for d in "${debianVersions[@]}"; do + if [ "${d}" = "${variant}" ]; then + return 0 + fi + done + return 1 +} + +function is_debian_slim() { + local variant + variant=$1 + shift + + IFS=' ' read -ra debianVersions <<< "$(get_config "./" "debian_versions")" + for d in "${debianVersions[@]}"; do + if [ "${d}-slim" = "${variant}" ]; then + return 0 + fi + done + return 1 +} + function get_fork_name() { local version version=$1 diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index f549c4b030..32015cc6c5 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -91,6 +91,9 @@ for version in "${versions[@]}"; do slash='/' variantAliases=("${versionAliases[@]/%/-${variant//${slash}/-}}") + if [ "${variant}" = "${default_variant}-slim" ]; then + variantAliases+=("${versionAliases[@]/%/-slim}") + fi variantAliases=("${variantAliases[@]//latest-/}") if [ "${variant}" = "${default_variant}" ]; then variantAliases+=("${versionAliases[@]}") diff --git a/update.sh b/update.sh index 2b25ce59ce..992a617289 100755 --- a/update.sh +++ b/update.sh @@ -168,6 +168,10 @@ function update_node_version() { alpine_version=$(grep "FROM" "${dockerfile}" | cut -d':' -f2) fi sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" + elif is_debian "${variant}"; then + sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp" + elif is_debian_slim "${variant}"; then + sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp" fi # Required for POSIX sed @@ -225,9 +229,16 @@ for version in "${versions[@]}"; do [ true = "$TRAVIS_CI_ONLY" ] && continue update_variant=$(in_variants_to_update "${variant}") + template_file="${parentpath}/Dockerfile-${variant}.template" + + if is_debian "${variant}"; then + template_file="${parentpath}/Dockerfile-debian.template" + elif is_debian_slim "${variant}"; then + template_file="${parentpath}/Dockerfile-slim.template" + fi if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then - update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile-${variant}.template" "${version}/${variant}/Dockerfile" "${variant}" & + update_node_version "${baseuri}" "${versionnum}" "${template_file}" "${version}/${variant}/Dockerfile" "${variant}" & fi done done From e1f2520c7a5f29dc5896edc3816357c0267cb931 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 30 Nov 2018 01:00:40 +0800 Subject: [PATCH 209/818] Update nodejs v10.14.0 to v10.14.1 w/ Yarn v1.12.3 - https://github.com/nodejs/node/releases/tag/v10.14.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.14.1 --- 10/alpine/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 232361b89b..5c373148d0 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.14.0 +ENV NODE_VERSION 10.14.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -47,7 +47,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.3 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 68c1a07ec0..fc3f43b852 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.14.0 +ENV NODE_VERSION 10.14.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -44,7 +44,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index fcf675407b..9e6e7368a0 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.14.0 +ENV NODE_VERSION 10.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index c270ccd432..fec8ef3292 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.14.0 +ENV NODE_VERSION 10.14.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -44,7 +44,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 95719b22c7..f3d773a0b4 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.14.0 +ENV NODE_VERSION 10.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.10.1 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ From 7db40ed0972a8156e9573672ac908c5c5b67c75b Mon Sep 17 00:00:00 2001 From: Daniel Cohen Date: Sun, 2 Dec 2018 11:05:18 +0200 Subject: [PATCH 210/818] Adds documentation for using node-gyp in alpine release (#907) --- docs/BestPractices.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 90c8ee6da6..6271b45ddb 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -10,6 +10,7 @@ - [CMD](#cmd) - [Docker Run](#docker-run) - [Security](#security) +- [node-gyp in apline variant](#node-gyp-alpine) ## Environment Variables @@ -153,3 +154,30 @@ $ docker run \ ## Security The Docker team has provided a tool to analyze your running containers for potential security issues. You can download and run this tool from here: https://github.com/docker/docker-bench-security + +## node-gyp alpine + +Here is an example of how you would install dependencies for packages that require node-gyp support on the alpine variant: + +```Dockerfile +FROM node:alpine + +RUN apk add --no-cache --virtual .gyp python make g++ \ + && npm install [ your npm dependencies here ] \ + && apk del .gyp +``` + +And Here's a multistage build example + +```Dockerfile +FROM node:alpine as builder + +## Install build toolchain, install node deps and compile native add-ons +RUN apk add --no-cache --virtual .gyp python make g++ \ +RUN npm install [ your npm dependencies here ] + +FROM node:alpine as app + +## Copy built node modules and binaries without including the toolchain +COPY --from=builder node_modules . +``` From 50ee09688e28b138b1454a74deaa710d558b6b58 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 3 Dec 2018 22:18:44 +0800 Subject: [PATCH 211/818] Update node.js v6 to v6.15.1 with Yarn v1.12.3 --- 6/alpine/Dockerfile | 6 +++--- 6/jessie-slim/Dockerfile | 4 ++-- 6/jessie/Dockerfile | 4 ++-- 6/onbuild/Dockerfile | 2 +- 6/stretch-slim/Dockerfile | 4 ++-- 6/stretch/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index b858213304..fff04b569b 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.4 +FROM alpine:3.8 -ENV NODE_VERSION 6.15.0 +ENV NODE_VERSION 6.15.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -47,7 +47,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.12.3 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/6/jessie-slim/Dockerfile b/6/jessie-slim/Dockerfile index 0dca3c559a..042b6d93d7 100644 --- a/6/jessie-slim/Dockerfile +++ b/6/jessie-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 -ENV NODE_VERSION 6.15.0 +ENV NODE_VERSION 6.15.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -44,7 +44,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index f4a4ef369b..18011ed553 100644 --- a/6/jessie/Dockerfile +++ b/6/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 -ENV NODE_VERSION 6.15.0 +ENV NODE_VERSION 6.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 269dd723be..35f53cc66b 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.15.0-stretch +FROM node:6.15.1-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/stretch-slim/Dockerfile b/6/stretch-slim/Dockerfile index 28563bab22..e180760d0a 100644 --- a/6/stretch-slim/Dockerfile +++ b/6/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 6.15.0 +ENV NODE_VERSION 6.15.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -44,7 +44,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 83a805bf38..aa8a0616da 100644 --- a/6/stretch/Dockerfile +++ b/6/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 6.15.0 +ENV NODE_VERSION 6.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -41,7 +41,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.12.3 RUN set -ex \ && for key in \ From dec48312c8b742b14aaeca17e86fc9e42b41c318 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 6 Dec 2018 08:13:34 -0500 Subject: [PATCH 212/818] Fixed the Travis Env Var error message Fixes #920 --- .travis.yml | 130 +++++++++++++++++++++++++------------------- travis.yml.template | 20 +++---- update.sh | 5 +- 3 files changed, 85 insertions(+), 70 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f072e3488..1f34a3606e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,12 +42,13 @@ stages: jobs: allow_failures: - env: - - TEST: Markdown link check + - TEST=mardown_lint include: - stage: Test + name: Markdown link check env: - - TEST: Markdown link check + - TEST=mardown_lint language: node_js node_js: - lts/* @@ -57,8 +58,7 @@ jobs: - find . -name "*.md" | xargs -n 1 markdown-link-check - stage: Test - env: - - TEST: Editor Config check + name: Editor Config check language: node_js node_js: - lts/* @@ -68,8 +68,7 @@ jobs: - eclint check - stage: Test - env: - - TEST: Doc Toc Check + name: Doc Toc Check language: node_js node_js: - lts/* @@ -80,21 +79,18 @@ jobs: diff -q README.md README.md.tmp - stage: Test - env: - - TEST: shfmt check + name: shfmt check script: - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.1 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code - stage: Test - env: - - TEST: Shell Check + name: Shell Check script: shellcheck *.sh - stage: Test - env: - - TEST: .travis.yml and travis.yml.template consistency + name: .travis.yml and travis.yml.template consistency script: - ./update.sh - git diff --stat --exit-code .travis.yml @@ -106,132 +102,154 @@ jobs: - stage: Build before_script: *auto_skip + name: 10 on jessie env: - - NODE_VERSION: "10" - - VARIANT: "jessie" + - NODE_VERSION="10" + - VARIANT="jessie" - stage: Build before_script: *auto_skip + name: 10 on jessie-slim env: - - NODE_VERSION: "10" - - VARIANT: "jessie-slim" + - NODE_VERSION="10" + - VARIANT="jessie-slim" - stage: Build before_script: *auto_skip + name: 10 on alpine env: - - NODE_VERSION: "10" - - VARIANT: "alpine" + - NODE_VERSION="10" + - VARIANT="alpine" - stage: Build before_script: *auto_skip + name: 10 on stretch env: - - NODE_VERSION: "10" - - VARIANT: "stretch" + - NODE_VERSION="10" + - VARIANT="stretch" - stage: Build before_script: *auto_skip + name: 10 on stretch-slim env: - - NODE_VERSION: "10" - - VARIANT: "stretch-slim" + - NODE_VERSION="10" + - VARIANT="stretch-slim" - stage: Build before_script: *auto_skip + name: 11 on alpine env: - - NODE_VERSION: "11" - - VARIANT: "alpine" + - NODE_VERSION="11" + - VARIANT="alpine" - stage: Build before_script: *auto_skip + name: 11 on stretch env: - - NODE_VERSION: "11" - - VARIANT: "stretch" + - NODE_VERSION="11" + - VARIANT="stretch" - stage: Build before_script: *auto_skip + name: 11 on stretch-slim env: - - NODE_VERSION: "11" - - VARIANT: "stretch-slim" + - NODE_VERSION="11" + - VARIANT="stretch-slim" - stage: Build before_script: *auto_skip + name: 6 on jessie env: - - NODE_VERSION: "6" - - VARIANT: "jessie" + - NODE_VERSION="6" + - VARIANT="jessie" - stage: Build before_script: *auto_skip + name: 6 on jessie-slim env: - - NODE_VERSION: "6" - - VARIANT: "jessie-slim" + - NODE_VERSION="6" + - VARIANT="jessie-slim" - stage: Build before_script: *auto_skip + name: 6 on alpine env: - - NODE_VERSION: "6" - - VARIANT: "alpine" + - NODE_VERSION="6" + - VARIANT="alpine" - stage: Build before_script: *auto_skip + name: 6 on onbuild env: - - NODE_VERSION: "6" - - VARIANT: "onbuild" + - NODE_VERSION="6" + - VARIANT="onbuild" - stage: Build before_script: *auto_skip + name: 6 on stretch env: - - NODE_VERSION: "6" - - VARIANT: "stretch" + - NODE_VERSION="6" + - VARIANT="stretch" - stage: Build before_script: *auto_skip + name: 6 on stretch-slim env: - - NODE_VERSION: "6" - - VARIANT: "stretch-slim" + - NODE_VERSION="6" + - VARIANT="stretch-slim" - stage: Build before_script: *auto_skip + name: 8 on jessie env: - - NODE_VERSION: "8" - - VARIANT: "jessie" + - NODE_VERSION="8" + - VARIANT="jessie" - stage: Build before_script: *auto_skip + name: 8 on jessie-slim env: - - NODE_VERSION: "8" - - VARIANT: "jessie-slim" + - NODE_VERSION="8" + - VARIANT="jessie-slim" - stage: Build before_script: *auto_skip + name: 8 on alpine env: - - NODE_VERSION: "8" - - VARIANT: "alpine" + - NODE_VERSION="8" + - VARIANT="alpine" - stage: Build before_script: *auto_skip + name: 8 on onbuild env: - - NODE_VERSION: "8" - - VARIANT: "onbuild" + - NODE_VERSION="8" + - VARIANT="onbuild" - stage: Build before_script: *auto_skip + name: 8 on stretch env: - - NODE_VERSION: "8" - - VARIANT: "stretch" + - NODE_VERSION="8" + - VARIANT="stretch" - stage: Build before_script: *auto_skip + name: 8 on stretch-slim env: - - NODE_VERSION: "8" - - VARIANT: "stretch-slim" + - NODE_VERSION="8" + - VARIANT="stretch-slim" - stage: Build before_script: *auto_skip + name: chakracore/10 on default env: - - NODE_VERSION: "chakracore/10" - - VARIANT: "default" + - NODE_VERSION="chakracore/10" + - VARIANT="default" - stage: Build before_script: *auto_skip + name: chakracore/8 on default env: - - NODE_VERSION: "chakracore/8" - - VARIANT: "default" + - NODE_VERSION="chakracore/8" + - VARIANT="default" diff --git a/travis.yml.template b/travis.yml.template index a5a6bd8d99..fee30b1971 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -40,12 +40,13 @@ stages: jobs: allow_failures: - env: - - TEST: Markdown link check + - TEST=mardown_lint include: - stage: Test + name: Markdown link check env: - - TEST: Markdown link check + - TEST=mardown_lint language: node_js node_js: - lts/* @@ -55,8 +56,7 @@ jobs: - find . -name "*.md" | xargs -n 1 markdown-link-check - stage: Test - env: - - TEST: Editor Config check + name: Editor Config check language: node_js node_js: - lts/* @@ -66,8 +66,7 @@ jobs: - eclint check - stage: Test - env: - - TEST: Doc Toc Check + name: Doc Toc Check language: node_js node_js: - lts/* @@ -78,21 +77,18 @@ jobs: diff -q README.md README.md.tmp - stage: Test - env: - - TEST: shfmt check + name: shfmt check script: - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.1 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code - stage: Test - env: - - TEST: Shell Check + name: Shell Check script: shellcheck *.sh - stage: Test - env: - - TEST: .travis.yml and travis.yml.template consistency + name: .travis.yml and travis.yml.template consistency script: - ./update.sh - git diff --stat --exit-code .travis.yml diff --git a/update.sh b/update.sh index 992a617289..85ed12770f 100755 --- a/update.sh +++ b/update.sh @@ -193,9 +193,10 @@ function add_stage() { echo ' - stage: Build before_script: *auto_skip + name: '"${version}"' on '"${variant}"' env: - - NODE_VERSION: "'"${version}"'" - - VARIANT: "'"${variant}"'"' >> .travis.yml + - NODE_VERSION="'"${version}"'" + - VARIANT="'"${variant}"'"' >> .travis.yml } echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # From 5772e5c27fa5e9a27672584fef34ac7cdd7f9589 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 7 Dec 2018 13:32:55 +0800 Subject: [PATCH 213/818] Add -t arg to update.sh when testing .travis.yml consistency --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f34a3606e..963864d974 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,7 +92,7 @@ jobs: - stage: Test name: .travis.yml and travis.yml.template consistency script: - - ./update.sh + - ./update.sh -t - git diff --stat --exit-code .travis.yml - stage: Deploy diff --git a/travis.yml.template b/travis.yml.template index fee30b1971..67e1df64f2 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -90,7 +90,7 @@ jobs: - stage: Test name: .travis.yml and travis.yml.template consistency script: - - ./update.sh + - ./update.sh -t - git diff --stat --exit-code .travis.yml - stage: Deploy From 438f5dead5a7432dd72fe8946f4faf3942d89a21 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 8 Dec 2018 02:25:30 +0800 Subject: [PATCH 214/818] Update node.js v11 from v11.3.0 to v11.4.0 - https://github.com/nodejs/node/releases/tag/v11.4.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.4.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 7578174b34..a5aa42a9d2 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.3.0 +ENV NODE_VERSION 11.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 238595859a..e75b454eaf 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.3.0 +ENV NODE_VERSION 11.4.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 304932993c..bb49751837 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.3.0 +ENV NODE_VERSION 11.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 87cd10a96dedf717fc61573d38456265776218bb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 8 Dec 2018 21:35:59 +0800 Subject: [PATCH 215/818] Update shfmt on Travis CI to v2.6.2 --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 963864d974..d8c4714168 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ jobs: - stage: Test name: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.1 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.2 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index 67e1df64f2..c1eb48359a 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -79,7 +79,7 @@ jobs: - stage: Test name: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.1 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.2 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From 3e539e6925a524bf4fda47ea33ed33d0d4fb0e20 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 12 Dec 2018 12:27:50 +0800 Subject: [PATCH 216/818] Update node.js v10 from v10.14.1 to v10.14.2 - https://github.com/nodejs/node/releases/tag/v10.14.2 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.14.2 --- 10/alpine/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 5c373148d0..614559c398 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.14.1 +ENV NODE_VERSION 10.14.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index fc3f43b852..85d902b590 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.14.1 +ENV NODE_VERSION 10.14.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 9e6e7368a0..c492ae73b4 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.14.1 +ENV NODE_VERSION 10.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index fec8ef3292..02ec1c139e 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.14.1 +ENV NODE_VERSION 10.14.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index f3d773a0b4..4210c4f99f 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.14.1 +ENV NODE_VERSION 10.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 4df0614998dbf1d728e709d2be1dae4f8343d944 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 18 Dec 2018 01:53:27 -0700 Subject: [PATCH 217/818] keys: add codebytere's gpg key (#956) --- 10/alpine/Dockerfile | 1 + 10/jessie-slim/Dockerfile | 1 + 10/jessie/Dockerfile | 1 + 10/stretch-slim/Dockerfile | 1 + 10/stretch/Dockerfile | 1 + 11/alpine/Dockerfile | 1 + 11/stretch-slim/Dockerfile | 1 + 11/stretch/Dockerfile | 1 + 6/alpine/Dockerfile | 1 + 6/jessie-slim/Dockerfile | 1 + 6/jessie/Dockerfile | 1 + 6/stretch-slim/Dockerfile | 1 + 6/stretch/Dockerfile | 1 + 8/alpine/Dockerfile | 1 + 8/jessie-slim/Dockerfile | 1 + 8/jessie/Dockerfile | 1 + 8/stretch-slim/Dockerfile | 1 + 8/stretch/Dockerfile | 1 + keys/node.keys | 1 + 19 files changed, 19 insertions(+) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 614559c398..89eb190c8c 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -28,6 +28,7 @@ RUN addgroup -g 1000 node \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 85d902b590..5358d54438 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-slim/Dockerfile @@ -30,6 +30,7 @@ RUN buildDeps='xz-utils' \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/10/jessie/Dockerfile b/10/jessie/Dockerfile index c492ae73b4..060a630fe7 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 02ec1c139e..0994841298 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/stretch-slim/Dockerfile @@ -30,6 +30,7 @@ RUN buildDeps='xz-utils' \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/10/stretch/Dockerfile b/10/stretch/Dockerfile index 4210c4f99f..6383e939f1 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/11/alpine/Dockerfile b/11/alpine/Dockerfile index a5aa42a9d2..95a85be6cb 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -28,6 +28,7 @@ RUN addgroup -g 1000 node \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index e75b454eaf..0c94a1681f 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/stretch-slim/Dockerfile @@ -30,6 +30,7 @@ RUN buildDeps='xz-utils' \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/11/stretch/Dockerfile b/11/stretch/Dockerfile index bb49751837..481a12051b 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/6/alpine/Dockerfile b/6/alpine/Dockerfile index fff04b569b..abae2e5fd7 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -28,6 +28,7 @@ RUN addgroup -g 1000 node \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/6/jessie-slim/Dockerfile b/6/jessie-slim/Dockerfile index 042b6d93d7..f3c8b81094 100644 --- a/6/jessie-slim/Dockerfile +++ b/6/jessie-slim/Dockerfile @@ -30,6 +30,7 @@ RUN buildDeps='xz-utils' \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/6/jessie/Dockerfile b/6/jessie/Dockerfile index 18011ed553..41e3eec4f7 100644 --- a/6/jessie/Dockerfile +++ b/6/jessie/Dockerfile @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/6/stretch-slim/Dockerfile b/6/stretch-slim/Dockerfile index e180760d0a..acc3d9431c 100644 --- a/6/stretch-slim/Dockerfile +++ b/6/stretch-slim/Dockerfile @@ -30,6 +30,7 @@ RUN buildDeps='xz-utils' \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/6/stretch/Dockerfile b/6/stretch/Dockerfile index aa8a0616da..758fefb48d 100644 --- a/6/stretch/Dockerfile +++ b/6/stretch/Dockerfile @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/8/alpine/Dockerfile b/8/alpine/Dockerfile index a84235c2b7..756e219dc0 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -28,6 +28,7 @@ RUN addgroup -g 1000 node \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index 4d778f4643..13c37d20d3 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-slim/Dockerfile @@ -30,6 +30,7 @@ RUN buildDeps='xz-utils' \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/8/jessie/Dockerfile b/8/jessie/Dockerfile index 8195c89c22..8a3f5438a4 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index 8dd30efbb4..1a8a68a935 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/stretch-slim/Dockerfile @@ -30,6 +30,7 @@ RUN buildDeps='xz-utils' \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/8/stretch/Dockerfile b/8/stretch/Dockerfile index 74bb4a896d..6628bf107a 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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/keys/node.keys b/keys/node.keys index 9d88c1505e..94a01e332c 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -8,3 +8,4 @@ B9AE9905FFD7803F25714661B63B535A4C206CA9 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 4ED778F539E3634C779C87C6D7062848A1AB005C A48C2BEE680E841632CD4E44F07496B3EB3C1762 +B9E2F5981AA6E0CD28160D9FF13993A75599653C From 617a31de36772c5e8c3b6fe3d7ad35081034a1fb Mon Sep 17 00:00:00 2001 From: Michael Salaverry Date: Tue, 18 Dec 2018 15:15:39 +0200 Subject: [PATCH 218/818] documentation: fix typo in recommended multistage Dockerfile (#958) --- docs/BestPractices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 6271b45ddb..8f89ad3a5a 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -173,7 +173,7 @@ And Here's a multistage build example FROM node:alpine as builder ## Install build toolchain, install node deps and compile native add-ons -RUN apk add --no-cache --virtual .gyp python make g++ \ +RUN apk add --no-cache --virtual .gyp python make g++ RUN npm install [ your npm dependencies here ] FROM node:alpine as app From bfb02b9ff6356023dcefcce376b4dfaf8a27a909 Mon Sep 17 00:00:00 2001 From: Michael Salaverry Date: Tue, 18 Dec 2018 15:22:47 +0200 Subject: [PATCH 219/818] additional typo fix realized there was another minor typo apline should be alpine --- docs/BestPractices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 8f89ad3a5a..ac2141d930 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -10,7 +10,7 @@ - [CMD](#cmd) - [Docker Run](#docker-run) - [Security](#security) -- [node-gyp in apline variant](#node-gyp-alpine) +- [node-gyp in alpine variant](#node-gyp-alpine) ## Environment Variables From 6d595cd0d4e0be708a48f0fee63dd1e29dff3b67 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 19 Dec 2018 01:35:47 +0800 Subject: [PATCH 220/818] Update node.js v8.x from v8.14.0 to v8.14.1 - https://github.com/nodejs/node/releases/tag/v8.14.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V8.md#8.14.1 --- 8/alpine/Dockerfile | 2 +- 8/jessie-slim/Dockerfile | 2 +- 8/jessie/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 756e219dc0..9edf440212 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 8.14.0 +ENV NODE_VERSION 8.14.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index 13c37d20d3..b75e41e71c 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-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 -ENV NODE_VERSION 8.14.0 +ENV NODE_VERSION 8.14.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 8a3f5438a4..0a978026b9 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.14.0 +ENV NODE_VERSION 8.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 2e18eced23..28bb6fb936 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.14.0-stretch +FROM node:8.14.1-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 6628bf107a..4fc5934ccd 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.14.0 +ENV NODE_VERSION 8.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 33feb454563058f4d543149956dee373c7b938e4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 19 Dec 2018 03:03:11 +0800 Subject: [PATCH 221/818] Update node.js v11.x from v11.4.0 to v11.5.0 - https://github.com/nodejs/node/releases/tag/v11.5.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.5.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 95a85be6cb..39458b3838 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.4.0 +ENV NODE_VERSION 11.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 0c94a1681f..11c3613092 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.4.0 +ENV NODE_VERSION 11.5.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 481a12051b..b9bf6dbac9 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.4.0 +ENV NODE_VERSION 11.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 95bf09c7fda8564869f06231c67319b8ca874e6f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 19 Dec 2018 03:06:26 +0800 Subject: [PATCH 222/818] Add prompt msg about Dockerfile updated in update.sh --- update.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/update.sh b/update.sh index 85ed12770f..5565383ebd 100755 --- a/update.sh +++ b/update.sh @@ -178,6 +178,13 @@ function update_node_version() { if [ -f "${dockerfile}-tmp-e" ]; then rm "${dockerfile}-tmp-e" fi + + if diff -q "${dockerfile}-tmp" "${dockerfile}" > /dev/null; then + echo "${dockerfile} is already up to date!" + else + echo "${dockerfile} updated!" + fi + mv -f "${dockerfile}-tmp" "${dockerfile}" ) } From 594f25e585bfcebaa150e4650d3de5cbd51a1e55 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 18 Dec 2018 16:48:53 -0500 Subject: [PATCH 223/818] Add missing v8.14.1 update for stretch slim See #960 --- 8/stretch-slim/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index 1a8a68a935..ae999f02e7 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/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 8.14.0 +ENV NODE_VERSION 8.14.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ From daa131d713cf42ae181292471766879f750b5230 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 27 Dec 2018 00:28:49 +0800 Subject: [PATCH 224/818] Update node.js v6.x from 6.15.1 to 6.16.0 - https://github.com/nodejs/node/releases/tag/v6.16.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V6.md#6.16.0 --- 6/alpine/Dockerfile | 2 +- 6/jessie-slim/Dockerfile | 2 +- 6/jessie/Dockerfile | 2 +- 6/onbuild/Dockerfile | 2 +- 6/stretch-slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index abae2e5fd7..46c3a466fa 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 6.15.1 +ENV NODE_VERSION 6.16.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/6/jessie-slim/Dockerfile b/6/jessie-slim/Dockerfile index f3c8b81094..85cb3adb22 100644 --- a/6/jessie-slim/Dockerfile +++ b/6/jessie-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 -ENV NODE_VERSION 6.15.1 +ENV NODE_VERSION 6.16.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index 41e3eec4f7..d36348e50e 100644 --- a/6/jessie/Dockerfile +++ b/6/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 -ENV NODE_VERSION 6.15.1 +ENV NODE_VERSION 6.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 35f53cc66b..66e5f74b91 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.15.1-stretch +FROM node:6.16.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/stretch-slim/Dockerfile b/6/stretch-slim/Dockerfile index acc3d9431c..4e9219feac 100644 --- a/6/stretch-slim/Dockerfile +++ b/6/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 6.15.1 +ENV NODE_VERSION 6.16.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 758fefb48d..684b1a69c6 100644 --- a/6/stretch/Dockerfile +++ b/6/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 6.15.1 +ENV NODE_VERSION 6.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 86b9618674b01fc5549f83696a90d5bc21f38af0 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 27 Dec 2018 00:30:10 +0800 Subject: [PATCH 225/818] Update node.js v8.x from 8.14.1 to 8.15.0 - https://github.com/nodejs/node/releases/tag/v8.15.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V8.md#8.15.0 --- 8/alpine/Dockerfile | 2 +- 8/jessie-slim/Dockerfile | 2 +- 8/jessie/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/stretch-slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 9edf440212..2e579beb95 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 8.14.1 +ENV NODE_VERSION 8.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index b75e41e71c..c9493a4dc2 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-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 -ENV NODE_VERSION 8.14.1 +ENV NODE_VERSION 8.15.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 0a978026b9..e7ecff3066 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.14.1 +ENV NODE_VERSION 8.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 28bb6fb936..e524d35763 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.14.1-stretch +FROM node:8.15.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index ae999f02e7..f32967bf06 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/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 8.14.1 +ENV NODE_VERSION 8.15.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 4fc5934ccd..586261ef85 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.14.1 +ENV NODE_VERSION 8.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f8c22aeb318ec3df876f8271b9b8a86005f0f53d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 27 Dec 2018 00:31:13 +0800 Subject: [PATCH 226/818] Update node.js v10.x from v10.14.2 to v10.15.0 - https://github.com/nodejs/node/releases/tag/v10.15.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.0 --- 10/alpine/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 89eb190c8c..c2212c482f 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.14.2 +ENV NODE_VERSION 10.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 5358d54438..9791427017 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.14.2 +ENV NODE_VERSION 10.15.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 060a630fe7..a98091deb8 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.14.2 +ENV NODE_VERSION 10.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 0994841298..cb0a54e63a 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.14.2 +ENV NODE_VERSION 10.15.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 6383e939f1..6e0f38bbef 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.14.2 +ENV NODE_VERSION 10.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From e9d9c1ce0f4e87b11d7b0ecff529b715038782ae Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 27 Dec 2018 00:31:33 +0800 Subject: [PATCH 227/818] Update node.js v11.x from v11.5.0 to v11.6.0 - https://github.com/nodejs/node/releases/tag/v11.6.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.6.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 39458b3838..65548bd089 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.5.0 +ENV NODE_VERSION 11.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 11c3613092..c8e94ae44e 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.5.0 +ENV NODE_VERSION 11.6.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index b9bf6dbac9..5bd0dc27f3 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.5.0 +ENV NODE_VERSION 11.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c12707184614cc78d60280d5959889073bf5b292 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 29 Dec 2018 16:38:35 +0800 Subject: [PATCH 228/818] Drop deprecated Travis CI container-based env config --- .travis.yml | 1 - travis.yml.template | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8c4714168..157bd33cbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ --- dist: xenial -sudo: false language: minimal diff --git a/travis.yml.template b/travis.yml.template index c1eb48359a..2cd86e3a94 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -1,7 +1,6 @@ --- dist: xenial -sudo: false language: minimal From fc235b33a5f0cbb45a2b7e14491c13c416c54a58 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 2 Jan 2019 09:36:31 -0500 Subject: [PATCH 229/818] Fixed the Auto PR Script --- .travis.yml | 7 +++++- generate-stackbrew-pr.sh | 50 +++++++++++++++++++++++++--------------- travis.yml.template | 7 +++++- 3 files changed, 43 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 157bd33cbc..db8f05d515 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,12 @@ jobs: - git diff --stat --exit-code .travis.yml - stage: Deploy - script: ./generate-stackbrew-pr.sh + script: + - | + if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then + TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" + fi + - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" # Docker Build # diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 4f6aebab7c..a07d8b6605 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -3,15 +3,16 @@ set -e . functions.sh -if [ -z "${1}" ]; then - COMMIT_ID="${TRAVIS_COMMIT}" +COMMIT_RANGE="${1}" +COMMIT_ID="$(git show -s --format="%H" "${COMMIT_RANGE}" | head -n 1)" + +if [ ! -z "$TRAVIS" ]; then COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE}" BRANCH_NAME="travis-${TRAVIS_BUILD_ID}" - GITHUB_USERNAME="nodejs-github-bot" + GITHUB_USERNAME="${AUTOPR_GITHUB_USERNAME:-nodejs-github-bot}" else - COMMIT_ID="${1}" COMMIT_MESSAGE="$(git show -s --format=%B "${COMMIT_ID}")" - BRANCH_NAME="travis-$(date +%s)" + BRANCH_NAME="autopr-$(date +%s)" if [[ "$(git remote get-url origin)" =~ github.com/([^/]*)/docker-node.git ]]; then GITHUB_USERNAME="${BASH_REMATCH[1]}" fi @@ -27,8 +28,8 @@ fi IMAGES_FILE="library/node" REPO_NAME="official-images" ORIGIN_SLUG="${GITHUB_USERNAME}/${REPO_NAME}" -UPSTREAM_SLUG="docker-library/${REPO_NAME}" -DOCKER_SLUG="nodejs/docker-node" +UPSTREAM_SLUG="${AUTOPR_UPSTREAM:-docker-library}/${REPO_NAME}" +DOCKER_SLUG="${TRAVIS_REPO_SLUG:-nodejs/docker-node}" gitpath="../${REPO_NAME}" function auth_header() { @@ -57,10 +58,11 @@ function permission_check() { } function setup_git_author() { - GIT_AUTHOR_NAME="$(git show -s --format="%aN" "${COMMIT_ID}")" - GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "${COMMIT_ID}")" - GIT_COMMITTER_NAME="$(git show -s --format="%cN" "${COMMIT_ID}")" - GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "${COMMIT_ID}")" + # Set Git User Info + GIT_AUTHOR_NAME="Node.js GitHub Bot" + GIT_AUTHOR_EMAIL="gh_bot@nodejs.org" + GIT_COMMITTER_NAME="Node.js GitHub Bot" + GIT_COMMITTER_EMAIL="gh_bot@nodejs.org" export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL } @@ -71,12 +73,21 @@ function message() { function pr_payload() { local escaped_message + local body + escaped_message="$(echo "${COMMIT_MESSAGE}" | sed -E -e "s/\"/\\\\\"/g")" + + if [ ! -z "${PR_NUMBER}" ]; then + body="Pull Request: ${DOCKER_SLUG}#${PR_NUMBER}" + else + body="Commit: https://github.com/${DOCKER_SLUG}/compare/${COMMIT_RANGE}" + fi + echo "{ - 'title': 'Node: ${escaped_message}', - 'body': 'Commit: nodejs/docker-node@${COMMIT_ID}', - 'head': '${GITHUB_USERNAME}:${BRANCH_NAME}', - 'base': 'master' + \"title\": \"Node: ${escaped_message}\", + \"body\" : \"${body}\", + \"head\" : \"${GITHUB_USERNAME}:${BRANCH_NAME}\", + \"base\": \"master\" }" } @@ -84,16 +95,16 @@ function comment_payload() { local pr_url pr_url="${1}" echo "{ - 'body': 'Created PR to the ${REPO_NAME} repo (${pr_url})' + \"body\": \"Created PR to the ${REPO_NAME} repo (${pr_url})\" }" } -if images_updated "${COMMIT_ID}"; then +if images_updated "${COMMIT_RANGE}"; then permission_check # Set Git User Info - setup_git_author + [ -z "$(git config user.name)" ] && [ -z "$GIT_AUTHOR_NAME" ] && setup_git_author info "Cloning..." git clone --depth 50 "https://github.com/${UPSTREAM_SLUG}.git" ${gitpath} 2> /dev/null @@ -108,7 +119,8 @@ if images_updated "${COMMIT_ID}"; then git commit -m "$(message)" info "Pushing..." - git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" 2> /dev/null || fatal "Error pushing the updated stackbrew" + git fetch --unshallow "https://github.com/${ORIGIN_SLUG}.git" + git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" || fatal "Error pushing the updated stackbrew" cd - && rm -rf ${gitpath} diff --git a/travis.yml.template b/travis.yml.template index 2cd86e3a94..c999829ea0 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -93,6 +93,11 @@ jobs: - git diff --stat --exit-code .travis.yml - stage: Deploy - script: ./generate-stackbrew-pr.sh + script: + - | + if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then + TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" + fi + - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" # Docker Build # From e4573b3435e997414fbcfe8df42bbee108985181 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 18 Jan 2019 21:52:13 +0800 Subject: [PATCH 230/818] Use `-n` instead of `! -z`, fix ShellCheck SC2236 in generate-stackbrew-pr.sh --- generate-stackbrew-pr.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index a07d8b6605..d5e3baefa6 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -6,7 +6,7 @@ set -e COMMIT_RANGE="${1}" COMMIT_ID="$(git show -s --format="%H" "${COMMIT_RANGE}" | head -n 1)" -if [ ! -z "$TRAVIS" ]; then +if [ -n "$TRAVIS" ]; then COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE}" BRANCH_NAME="travis-${TRAVIS_BUILD_ID}" GITHUB_USERNAME="${AUTOPR_GITHUB_USERNAME:-nodejs-github-bot}" @@ -77,7 +77,7 @@ function pr_payload() { escaped_message="$(echo "${COMMIT_MESSAGE}" | sed -E -e "s/\"/\\\\\"/g")" - if [ ! -z "${PR_NUMBER}" ]; then + if [ -n "${PR_NUMBER}" ]; then body="Pull Request: ${DOCKER_SLUG}#${PR_NUMBER}" else body="Commit: https://github.com/${DOCKER_SLUG}/compare/${COMMIT_RANGE}" @@ -135,7 +135,7 @@ if images_updated "${COMMIT_RANGE}"; then if [ "${url}" != "null" ]; then info "Pull request created at ${url}" - if [ ! -z "${PR_NUMBER}" ]; then + if [ -n "${PR_NUMBER}" ]; then comment_endpoint="https://api.github.com/repos/${DOCKER_SLUG}/issues/${PR_NUMBER}/comments" else comment_endpoint="https://api.github.com/repos/${DOCKER_SLUG}/commits/${COMMIT_ID}/comments" From 1656ace58dc5c913d8780e27a6c7478bbf1cb72f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 18 Jan 2019 21:26:51 +0800 Subject: [PATCH 231/818] Update node.js v11 to v11.7.0 with Yarn v1.13.0 --- 11/alpine/Dockerfile | 4 ++-- 11/stretch-slim/Dockerfile | 4 ++-- 11/stretch/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 65548bd089..4a2e701f05 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.6.0 +ENV NODE_VERSION 11.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index c8e94ae44e..38d8687535 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.6.0 +ENV NODE_VERSION 11.7.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN set -ex \ && for key in \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 5bd0dc27f3..e9689e495a 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.6.0 +ENV NODE_VERSION 11.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN set -ex \ && for key in \ From 680ddb74669a251a60075ea2e481a294fc7dc54b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 18 Jan 2019 23:08:05 +0800 Subject: [PATCH 232/818] Clean up Travis CI deployment script "$TRAVIS_COMMIT_RANGE" is not referenced in generate-stackbrew-pr.sh --- .travis.yml | 4 ---- travis.yml.template | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index db8f05d515..1307358459 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,10 +96,6 @@ jobs: - stage: Deploy script: - - | - if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then - TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" - fi - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" # Docker Build # diff --git a/travis.yml.template b/travis.yml.template index c999829ea0..0f8cedc656 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -94,10 +94,6 @@ jobs: - stage: Deploy script: - - | - if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then - TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" - fi - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" # Docker Build # From b78b0126d79408acc4c5ad302aeb2d8ef7c1e1d6 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 18 Jan 2019 23:18:07 +0800 Subject: [PATCH 233/818] Skip Travis CI deploy job earlier --- .travis.yml | 6 ++++++ travis.yml.template | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1307358459..fd36554b8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,6 +95,12 @@ jobs: - git diff --stat --exit-code .travis.yml - stage: Deploy + before_script: + - | + if ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "Dockerfile$"; then + echo "Skip deployment as none of the Dockerfiles has been changed." + exit + fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" diff --git a/travis.yml.template b/travis.yml.template index 0f8cedc656..79d3bb66e8 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -93,6 +93,12 @@ jobs: - git diff --stat --exit-code .travis.yml - stage: Deploy + before_script: + - | + if ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "Dockerfile$"; then + echo "Skip deployment as none of the Dockerfiles has been changed." + exit + fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" From c1282fa88fa014486531ee49a8f952e2c801198c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 19 Jan 2019 00:38:40 +0800 Subject: [PATCH 234/818] Fix condition to set auto PR committer/author Git user name was already set to "Travis CI User" with its example email --- generate-stackbrew-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index d5e3baefa6..387dfae09c 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -104,7 +104,7 @@ if images_updated "${COMMIT_RANGE}"; then permission_check # Set Git User Info - [ -z "$(git config user.name)" ] && [ -z "$GIT_AUTHOR_NAME" ] && setup_git_author + [ -z "$GIT_AUTHOR_NAME" ] && setup_git_author info "Cloning..." git clone --depth 50 "https://github.com/${UPSTREAM_SLUG}.git" ${gitpath} 2> /dev/null From 7cad6047f9ea320d62f36f41c6ca8f17e6953212 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 20 Jan 2019 00:26:09 +0800 Subject: [PATCH 235/818] Update shfmt to v2.6.3 --- .travis.yml | 2 +- travis.yml.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index db8f05d515..e949ab5acb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ jobs: - stage: Test name: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.2 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code diff --git a/travis.yml.template b/travis.yml.template index c999829ea0..e561e6b26f 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -78,7 +78,7 @@ jobs: - stage: Test name: shfmt check script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.2 shfmt -sr -i 2 -l -w -ci . + - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . - git diff --color - git diff --stat=220 --color --exit-code From e58d38ca7659375c5c60d1963344964f270deee0 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 23 Jan 2019 09:39:32 -0500 Subject: [PATCH 236/818] Fixed the bot email for the automatic PR script --- generate-stackbrew-pr.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 387dfae09c..0b4be8298e 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -60,9 +60,9 @@ function permission_check() { function setup_git_author() { # Set Git User Info GIT_AUTHOR_NAME="Node.js GitHub Bot" - GIT_AUTHOR_EMAIL="gh_bot@nodejs.org" + GIT_AUTHOR_EMAIL="github-bot@iojs.org" GIT_COMMITTER_NAME="Node.js GitHub Bot" - GIT_COMMITTER_EMAIL="gh_bot@nodejs.org" + GIT_COMMITTER_EMAIL="github-bot@iojs.org" export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL } From f9b80051e434ecfc9e8ae992b93716272aaf3961 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 25 Jan 2019 10:24:32 +0800 Subject: [PATCH 237/818] Update node.js v11.x from v11.7.0 to v11.8.0 - https://github.com/nodejs/node/releases/tag/v11.8.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.8.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 4a2e701f05..40b74884ae 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.7.0 +ENV NODE_VERSION 11.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 38d8687535..e9bcbc4df6 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.7.0 +ENV NODE_VERSION 11.8.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index e9689e495a..ce361703ed 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.7.0 +ENV NODE_VERSION 11.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From bb506d313d6e19ab6286f6ed03b6fe67970cebf9 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 25 Jan 2019 12:31:44 +0800 Subject: [PATCH 238/818] Add ACTIVE_MAINTAINERS file --- ACTIVE_MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 ACTIVE_MAINTAINERS diff --git a/ACTIVE_MAINTAINERS b/ACTIVE_MAINTAINERS new file mode 100644 index 0000000000..55991bb225 --- /dev/null +++ b/ACTIVE_MAINTAINERS @@ -0,0 +1,6 @@ +chorrell +LaurentGoderre +pesho +PeterDaveHello +SimenB +Starefossen From de266353222a69f4e86a58ea753a8c3f02bf6873 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 25 Jan 2019 12:37:11 +0800 Subject: [PATCH 239/818] Mention our Docker team in auto PR body as notification --- generate-stackbrew-pr.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 0b4be8298e..8ff2bdd873 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -74,6 +74,7 @@ function message() { function pr_payload() { local escaped_message local body + local maintainers escaped_message="$(echo "${COMMIT_MESSAGE}" | sed -E -e "s/\"/\\\\\"/g")" @@ -83,9 +84,13 @@ function pr_payload() { body="Commit: https://github.com/${DOCKER_SLUG}/compare/${COMMIT_RANGE}" fi + for maintainer in $(xargs < ACTIVE_MAINTAINERS); do + maintainers="$maintainers @$maintainer" + done + echo "{ \"title\": \"Node: ${escaped_message}\", - \"body\" : \"${body}\", + \"body\" : \"${body}.\n cc ${maintainers}\", \"head\" : \"${GITHUB_USERNAME}:${BRANCH_NAME}\", \"base\": \"master\" }" From 738e904c6b2cebf541328da7743125368dc6d727 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 25 Jan 2019 12:40:19 +0800 Subject: [PATCH 240/818] Use printf insstead of echo in pr_payload() --- generate-stackbrew-pr.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 8ff2bdd873..5b8c51db0b 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -88,12 +88,12 @@ function pr_payload() { maintainers="$maintainers @$maintainer" done - echo "{ - \"title\": \"Node: ${escaped_message}\", - \"body\" : \"${body}.\n cc ${maintainers}\", - \"head\" : \"${GITHUB_USERNAME}:${BRANCH_NAME}\", + printf "{ + \"title\": \"Node: %s\", + \"body\" : \"%s.\n cc %s\", + \"head\" : \"%s\", \"base\": \"master\" - }" + }" "${escaped_message}" "${body}" "${maintainers}" "${GITHUB_USERNAME}:${BRANCH_NAME}" } function comment_payload() { From 90043cdde5057865b94fec447ce193fb46b69e18 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 30 Jan 2019 02:48:52 +0800 Subject: [PATCH 241/818] Update node.js v10 to v10.15.1 with Yarn v1.13.0 - https://github.com/nodejs/node/releases/tag/v10.15.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.1 --- 10/alpine/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index c2212c482f..ccfa1d4b95 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.15.0 +ENV NODE_VERSION 10.15.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 9791427017..5016656e6e 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.15.0 +ENV NODE_VERSION 10.15.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN set -ex \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index a98091deb8..840474bf0d 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.15.0 +ENV NODE_VERSION 10.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index cb0a54e63a..a80ce6d305 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.15.0 +ENV NODE_VERSION 10.15.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 6e0f38bbef..f071391907 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.15.0 +ENV NODE_VERSION 10.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.13.0 RUN set -ex \ && for key in \ From 15fde511ee0dd5cd0d353e7bc4ba0831fba1248b Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 29 Jan 2019 23:38:22 -0500 Subject: [PATCH 242/818] Fixed the automatic PR creation failing --- generate-stackbrew-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index 5b8c51db0b..b01c905603 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -90,7 +90,7 @@ function pr_payload() { printf "{ \"title\": \"Node: %s\", - \"body\" : \"%s.\n cc %s\", + \"body\" : \"%s.
cc %s\", \"head\" : \"%s\", \"base\": \"master\" }" "${escaped_message}" "${body}" "${maintainers}" "${GITHUB_USERNAME}:${BRANCH_NAME}" From 08789f4981b86a38cbd2b614a6ccefa5f4be3a4b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 31 Jan 2019 08:24:37 +0800 Subject: [PATCH 243/818] Update node.js v11.x from v11.8.0 to v11.9.0 - https://github.com/nodejs/node/releases/tag/v11.9.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.9.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 40b74884ae..6a1c9493b4 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 11.8.0 +ENV NODE_VERSION 11.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index e9bcbc4df6..2c951c5aed 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.8.0 +ENV NODE_VERSION 11.9.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index ce361703ed..400e50f4cb 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.8.0 +ENV NODE_VERSION 11.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c31ec45ea0bf36ca2de07ec76cba9dfa64aa93f9 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Thu, 31 Jan 2019 09:54:40 -0500 Subject: [PATCH 244/818] Update config for Alpine 3.9 --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 6a3cbd6ca9..aa9d80d9ee 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch -alpine_version 3.8 +alpine_version 3.9 debian_versions jessie stretch From 7b643da4aeb3d77f1c26c9f6fadd32b04f8d7bc9 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 15 Feb 2019 10:50:04 +0800 Subject: [PATCH 245/818] Update node.js v11 to v11.10.0, and Alpine to v3.9 - https://github.com/nodejs/node/releases/tag/v11.10.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.10.0 cc #988 --- 11/alpine/Dockerfile | 4 ++-- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 6a1c9493b4..be61c57cb2 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.8 +FROM alpine:3.9 -ENV NODE_VERSION 11.9.0 +ENV NODE_VERSION 11.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 2c951c5aed..a944f21473 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.9.0 +ENV NODE_VERSION 11.10.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 400e50f4cb..376839a9d9 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.9.0 +ENV NODE_VERSION 11.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 0d4156af75f42b60d37bfd1bddddd522d2c8b6a9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 19 Feb 2019 16:22:51 -0800 Subject: [PATCH 246/818] Update architectures files (generated) The contents of these files were generated by cross-referencing the available artifacts on https://nodejs.org/dist/ vs the supported architectures of the base image of each variant. --- 10/architectures | 10 +++++----- 11/architectures | 8 ++++++++ 6/architectures | 11 ++++++----- 8/architectures | 2 +- architectures | 12 ++++++------ 5 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 11/architectures diff --git a/10/architectures b/10/architectures index dff4d3459f..4cbf543b67 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants +amd64 jessie,jessie-slim,alpine,stretch,stretch-slim arm32v6 alpine -arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim -arm64v8 alpine,onbuild,stretch -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +arm32v7 jessie,jessie-slim,stretch,stretch-slim +arm64v8 alpine,stretch,stretch-slim i386 alpine -ppc64le alpine,onbuild,stretch -s390x alpine,onbuild,stretch +ppc64le alpine,stretch,stretch-slim +s390x alpine,stretch,stretch-slim diff --git a/11/architectures b/11/architectures new file mode 100644 index 0000000000..1732b90092 --- /dev/null +++ b/11/architectures @@ -0,0 +1,8 @@ +bashbrew-arch variants +amd64 alpine,stretch,stretch-slim +arm32v6 alpine +arm32v7 stretch,stretch-slim +arm64v8 alpine,stretch,stretch-slim +i386 alpine +ppc64le alpine,stretch,stretch-slim +s390x alpine,stretch,stretch-slim diff --git a/6/architectures b/6/architectures index 264b7851ed..3d0360cbf8 100644 --- a/6/architectures +++ b/6/architectures @@ -1,7 +1,8 @@ bashbrew-arch variants -arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim -arm64v8 stretch amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -i386 jessie,jessie-slim,onbuild,stretch,stretch-slim -ppc64le stretch -s390x stretch +arm32v6 alpine +arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim +arm64v8 alpine,onbuild,stretch,stretch-slim +i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +ppc64le alpine,onbuild,stretch,stretch-slim +s390x alpine,onbuild,stretch,stretch-slim diff --git a/8/architectures b/8/architectures index 62711562a4..3d0360cbf8 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants +amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim arm32v6 alpine arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim arm64v8 alpine,onbuild,stretch,stretch-slim -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim ppc64le alpine,onbuild,stretch,stretch-slim s390x alpine,onbuild,stretch,stretch-slim diff --git a/architectures b/architectures index d66692de56..cfac949b76 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -arm32v6 alpine -arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim -arm64v8 alpine,onbuild,stretch,stretch-slim amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -i386 alpine -ppc64le alpine,onbuild,stretch,stretch-slim -s390x alpine,onbuild,stretch,stretch-slim +arm32v6 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +arm64v8 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +ppc64le jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +s390x jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim From 891c2f8957898d2cffd4d118a1a499e41f9c3d66 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 22 Feb 2019 23:30:09 +0800 Subject: [PATCH 247/818] Enable Travis CI Fast Finishing Ref: https://docs.travis-ci.com/user/customizing-the-build/#fast-finishing --- .travis.yml | 1 + travis.yml.template | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ad8c279d08..b816b31ef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ stages: if: branch = master AND type IN (push) jobs: + fast_finish: true allow_failures: - env: - TEST=mardown_lint diff --git a/travis.yml.template b/travis.yml.template index 5d4bd2f5fa..cf7b414125 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -37,6 +37,7 @@ stages: if: branch = master AND type IN (push) jobs: + fast_finish: true allow_failures: - env: - TEST=mardown_lint From 1d01380b9fa115e26df9430f7c6c591a1643f798 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 28 Feb 2019 20:46:00 +0800 Subject: [PATCH 248/818] Update node.js v10 to v10.15.2 --- 10/alpine/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index ccfa1d4b95..d213ce29ab 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 10.15.1 +ENV NODE_VERSION 10.15.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 5016656e6e..833fe70a40 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.15.1 +ENV NODE_VERSION 10.15.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 840474bf0d..87dc4be808 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.15.1 +ENV NODE_VERSION 10.15.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index a80ce6d305..d9457fa4d7 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.15.1 +ENV NODE_VERSION 10.15.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index f071391907..4527d28e44 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.15.1 +ENV NODE_VERSION 10.15.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 926bddb46b98edf3e1cf75d128afc7cb3b06fb54 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 28 Feb 2019 20:46:24 +0800 Subject: [PATCH 249/818] Update node.js v11 to v11.10.1 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index be61c57cb2..450fde768a 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 11.10.0 +ENV NODE_VERSION 11.10.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index a944f21473..b6eb86af4b 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.10.0 +ENV NODE_VERSION 11.10.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 376839a9d9..f10545c79c 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.10.0 +ENV NODE_VERSION 11.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6833ee622c5a1d4c054ffaf96115f2a20714f5f3 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 28 Feb 2019 20:46:43 +0800 Subject: [PATCH 250/818] Update node.js v6 to v6.17.0 --- 6/alpine/Dockerfile | 2 +- 6/jessie-slim/Dockerfile | 2 +- 6/jessie/Dockerfile | 2 +- 6/onbuild/Dockerfile | 2 +- 6/stretch-slim/Dockerfile | 2 +- 6/stretch/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 46c3a466fa..c79ee5cdf3 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 6.16.0 +ENV NODE_VERSION 6.17.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/6/jessie-slim/Dockerfile b/6/jessie-slim/Dockerfile index 85cb3adb22..31f2f856a4 100644 --- a/6/jessie-slim/Dockerfile +++ b/6/jessie-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 -ENV NODE_VERSION 6.16.0 +ENV NODE_VERSION 6.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index d36348e50e..c79e6f0ee7 100644 --- a/6/jessie/Dockerfile +++ b/6/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 -ENV NODE_VERSION 6.16.0 +ENV NODE_VERSION 6.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index 66e5f74b91..da2e11e9b7 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.16.0-stretch +FROM node:6.17.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/stretch-slim/Dockerfile b/6/stretch-slim/Dockerfile index 4e9219feac..4dac8e3446 100644 --- a/6/stretch-slim/Dockerfile +++ b/6/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 6.16.0 +ENV NODE_VERSION 6.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 684b1a69c6..8eaffa6526 100644 --- a/6/stretch/Dockerfile +++ b/6/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 6.16.0 +ENV NODE_VERSION 6.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From de76fb48b532d6be012098dc3538bd15329a27d0 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 28 Feb 2019 20:47:05 +0800 Subject: [PATCH 251/818] Update node.js v8 to v8.15.1 --- 8/alpine/Dockerfile | 2 +- 8/jessie-slim/Dockerfile | 2 +- 8/jessie/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/stretch-slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 2e579beb95..1e9c3f9edd 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ENV NODE_VERSION 8.15.0 +ENV NODE_VERSION 8.15.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index c9493a4dc2..ea88e0c31b 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-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 -ENV NODE_VERSION 8.15.0 +ENV NODE_VERSION 8.15.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index e7ecff3066..c4f3f55144 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.15.0 +ENV NODE_VERSION 8.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index e524d35763..2d6befdefb 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.15.0-stretch +FROM node:8.15.1-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index f32967bf06..d24ba27aa3 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/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 8.15.0 +ENV NODE_VERSION 8.15.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 586261ef85..51fb588db7 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.15.0 +ENV NODE_VERSION 8.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 170ed2092d4925971f9cd3ad5dfc416e820f90fd Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 6 Mar 2019 01:18:29 +0800 Subject: [PATCH 252/818] Update node.js v10 to v10.15.3 and Alpine to v3.9 https://github.com/nodejs/node/releases/tag/v10.15.3 https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.15.3 Close #999 --- 10/alpine/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index d213ce29ab..86d0ef8da6 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.8 +FROM alpine:3.9 -ENV NODE_VERSION 10.15.2 +ENV NODE_VERSION 10.15.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 833fe70a40..5068328697 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.15.2 +ENV NODE_VERSION 10.15.3 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 87dc4be808..d8a97562a7 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.15.2 +ENV NODE_VERSION 10.15.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index d9457fa4d7..488f3f464b 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.15.2 +ENV NODE_VERSION 10.15.3 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 4527d28e44..a7f7ead531 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.15.2 +ENV NODE_VERSION 10.15.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 687152bceb3cd50fb7c044cc4ca403e5696d2554 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 7 Mar 2019 03:30:39 +0800 Subject: [PATCH 253/818] Update node.js v11 from 11.10.1 to v11.11.0 - https://github.com/nodejs/node/releases/tag/v11.11.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.11.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 450fde768a..07220561bd 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 11.10.1 +ENV NODE_VERSION 11.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index b6eb86af4b..184aae2a0a 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.10.1 +ENV NODE_VERSION 11.11.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index f10545c79c..dfcdbce40e 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.10.1 +ENV NODE_VERSION 11.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 716a6ea32b3a797884c95b838b57ace41f83e96a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 16 Mar 2019 04:45:41 +0800 Subject: [PATCH 254/818] Update node.js v11 to v11.12.0 with Yarn v1.15.2 - https://github.com/nodejs/node/releases/tag/v11.12.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.12.0 --- 11/alpine/Dockerfile | 4 ++-- 11/stretch-slim/Dockerfile | 4 ++-- 11/stretch/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 07220561bd..6793acbe5c 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 11.11.0 +ENV NODE_VERSION 11.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.15.2 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 184aae2a0a..67b1b6c6a0 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.11.0 +ENV NODE_VERSION 11.12.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index dfcdbce40e..b469c32c94 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.11.0 +ENV NODE_VERSION 11.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ From ed4cf449b40da125d4a5991fc12db20be51e6d4a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 29 Mar 2019 03:36:14 +0800 Subject: [PATCH 255/818] Update node.js v11 from 11.12.0 to v11.13.0 - https://github.com/nodejs/node/releases/tag/v11.13.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.13.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 6793acbe5c..0f9fa6c81a 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 11.12.0 +ENV NODE_VERSION 11.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 67b1b6c6a0..c51c630bf9 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.12.0 +ENV NODE_VERSION 11.13.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index b469c32c94..b8fec1a7be 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.12.0 +ENV NODE_VERSION 11.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 53fd280cdd46a4caf63b82f8c269dfbb84895546 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 4 Apr 2019 03:29:06 +0800 Subject: [PATCH 256/818] Update node v6 to 6.17.1 w/ Yarn@1.15.2 & Alpine@3.9 - https://github.com/nodejs/node/releases/tag/v6.17.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V6.md#6.17.1 --- 6/alpine/Dockerfile | 6 +++--- 6/jessie-slim/Dockerfile | 4 ++-- 6/jessie/Dockerfile | 4 ++-- 6/onbuild/Dockerfile | 2 +- 6/stretch-slim/Dockerfile | 4 ++-- 6/stretch/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index c79ee5cdf3..29be09c0f1 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.8 +FROM alpine:3.9 -ENV NODE_VERSION 6.17.0 +ENV NODE_VERSION 6.17.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/6/jessie-slim/Dockerfile b/6/jessie-slim/Dockerfile index 31f2f856a4..ddf477dbff 100644 --- a/6/jessie-slim/Dockerfile +++ b/6/jessie-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 -ENV NODE_VERSION 6.17.0 +ENV NODE_VERSION 6.17.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile index c79e6f0ee7..8a9f6e1d5f 100644 --- a/6/jessie/Dockerfile +++ b/6/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 -ENV NODE_VERSION 6.17.0 +ENV NODE_VERSION 6.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile index da2e11e9b7..2e6ff3a093 100644 --- a/6/onbuild/Dockerfile +++ b/6/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.17.0-stretch +FROM node:6.17.1-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/6/stretch-slim/Dockerfile b/6/stretch-slim/Dockerfile index 4dac8e3446..d78d1a50ba 100644 --- a/6/stretch-slim/Dockerfile +++ b/6/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 6.17.0 +ENV NODE_VERSION 6.17.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile index 8eaffa6526..831481800d 100644 --- a/6/stretch/Dockerfile +++ b/6/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 6.17.0 +ENV NODE_VERSION 6.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ From 974b70c72e027365003bc1d6e47c8cf6ec46a54d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 12 Apr 2019 00:56:10 +0800 Subject: [PATCH 257/818] Update node.js v11 from 11.13.0 to v11.14.0 - https://github.com/nodejs/node/releases/tag/v11.14.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.14.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 0f9fa6c81a..f7aca722f4 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 11.13.0 +ENV NODE_VERSION 11.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index c51c630bf9..4cb46618c3 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.13.0 +ENV NODE_VERSION 11.14.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index b8fec1a7be..8803f3fda5 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.13.0 +ENV NODE_VERSION 11.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5a6a5e91999358c5b04fddd6c22a9a4eb0bf3fbf Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 18 Apr 2019 17:14:48 +0800 Subject: [PATCH 258/818] Disable `make` verbose mode in Alpine builds --- 10/alpine/Dockerfile | 2 +- 11/alpine/Dockerfile | 2 +- 6/alpine/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 86d0ef8da6..0014944cbc 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -41,7 +41,7 @@ RUN addgroup -g 1000 node \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ && apk del .build-deps \ && cd .. \ diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index f7aca722f4..9958d6a448 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -41,7 +41,7 @@ RUN addgroup -g 1000 node \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ && apk del .build-deps \ && cd .. \ diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile index 29be09c0f1..0072f4f14f 100644 --- a/6/alpine/Dockerfile +++ b/6/alpine/Dockerfile @@ -41,7 +41,7 @@ RUN addgroup -g 1000 node \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ && apk del .build-deps \ && cd .. \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 1e9c3f9edd..dfce8db264 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -41,7 +41,7 @@ RUN addgroup -g 1000 node \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ && apk del .build-deps \ && cd .. \ From a8dbfa5c7cac9dca9145c6f429cd2c4f11176707 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 16 Apr 2019 22:31:21 +0200 Subject: [PATCH 259/818] Update node v8 to 8.16.0 w/ Yarn@1.15.2 & Alpine@3.9 --- 8/alpine/Dockerfile | 6 +++--- 8/jessie-slim/Dockerfile | 4 ++-- 8/jessie/Dockerfile | 4 ++-- 8/onbuild/Dockerfile | 2 +- 8/stretch-slim/Dockerfile | 4 ++-- 8/stretch/Dockerfile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index dfce8db264..336034477f 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.8 +FROM alpine:3.9 -ENV NODE_VERSION 8.15.1 +ENV NODE_VERSION 8.16.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index ea88e0c31b..8cb11fc99a 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-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 -ENV NODE_VERSION 8.15.1 +ENV NODE_VERSION 8.16.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index c4f3f55144..22b27e514c 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.15.1 +ENV NODE_VERSION 8.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 2d6befdefb..d1d7a8f480 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.15.1-stretch +FROM node:8.16.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index d24ba27aa3..6443cbbc21 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/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 8.15.1 +ENV NODE_VERSION 8.16.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 51fb588db7..48d0792646 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.15.1 +ENV NODE_VERSION 8.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.15.2 RUN set -ex \ && for key in \ From 29e4ef051ed7a0d55554fc6df53d1be02089e307 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 23 Apr 2019 23:55:32 +0800 Subject: [PATCH 260/818] Add node.js v12.0.0 with Yarn v1.15.2 - https://github.com/nodejs/node/releases/tag/v12.0.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.0.0 --- .travis.yml | 21 +++++++++++ 12/alpine/Dockerfile | 71 ++++++++++++++++++++++++++++++++++++++ 12/architectures | 8 +++++ 12/stretch-slim/Dockerfile | 67 +++++++++++++++++++++++++++++++++++ 12/stretch/Dockerfile | 64 ++++++++++++++++++++++++++++++++++ 5 files changed, 231 insertions(+) create mode 100644 12/alpine/Dockerfile create mode 100644 12/architectures create mode 100644 12/stretch-slim/Dockerfile create mode 100644 12/stretch/Dockerfile diff --git a/.travis.yml b/.travis.yml index b816b31ef8..0366b5e65f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,6 +163,27 @@ jobs: - NODE_VERSION="11" - VARIANT="stretch-slim" + - stage: Build + before_script: *auto_skip + name: 12 on alpine + env: + - NODE_VERSION="12" + - VARIANT="alpine" + + - stage: Build + before_script: *auto_skip + name: 12 on stretch + env: + - NODE_VERSION="12" + - VARIANT="stretch" + + - stage: Build + before_script: *auto_skip + name: 12 on stretch-slim + env: + - NODE_VERSION="12" + - VARIANT="stretch-slim" + - stage: Build before_script: *auto_skip name: 6 on jessie diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile new file mode 100644 index 0000000000..923ebff4ca --- /dev/null +++ b/12/alpine/Dockerfile @@ -0,0 +1,71 @@ +FROM alpine:3.9 + +ENV NODE_VERSION 12.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + binutils-gold \ + curl \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + +ENV YARN_VERSION 1.15.2 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +CMD [ "node" ] diff --git a/12/architectures b/12/architectures new file mode 100644 index 0000000000..1732b90092 --- /dev/null +++ b/12/architectures @@ -0,0 +1,8 @@ +bashbrew-arch variants +amd64 alpine,stretch,stretch-slim +arm32v6 alpine +arm32v7 stretch,stretch-slim +arm64v8 alpine,stretch,stretch-slim +i386 alpine +ppc64le alpine,stretch,stretch-slim +s390x alpine,stretch,stretch-slim diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile new file mode 100644 index 0000000000..f7882dd22b --- /dev/null +++ b/12/stretch-slim/Dockerfile @@ -0,0 +1,67 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 12.0.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.15.2 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile new file mode 100644 index 0000000000..c663360785 --- /dev/null +++ b/12/stretch/Dockerfile @@ -0,0 +1,64 @@ +FROM buildpack-deps:stretch + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 12.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.15.2 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +CMD [ "node" ] From 9eee8683c4de5363abd641bc8a66d31190492750 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 24 Apr 2019 01:02:27 +0800 Subject: [PATCH 261/818] Disable `make` verbose mode in Alpine Dockerflie template Missing in #1022 --- Dockerfile-alpine.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index ee54a07184..69cb25d9c0 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -31,7 +31,7 @@ RUN addgroup -g 1000 node \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ && apk del .build-deps \ && cd .. \ From 4d82413e5678c529bb665657e2e8c83e613f44d0 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 25 Apr 2019 02:20:11 -0400 Subject: [PATCH 262/818] chore: Add 12 to stackbrew generation (#1027) --- generate-stackbrew-library.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 32015cc6c5..db817e5a4e 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -13,7 +13,9 @@ array_8='8 carbon' # shellcheck disable=SC2034 array_10='10 dubnium lts' # shellcheck disable=SC2034 -array_11='11 current latest' +array_11='11' +# shellcheck disable=SC2034 +array_12='12 current latest' # shellcheck disable=SC2034 array_chakracore_8='chakracore-8' # shellcheck disable=SC2034 From 6ef8d23119e8d19d2b0da3d9d4127f64a8fa4338 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 29 Apr 2019 22:44:30 +0800 Subject: [PATCH 263/818] Update node.js v12.0.0 to v12.1.0 - https://nodejs.org/en/blog/release/v12.1.0/ - https://github.com/nodejs/node/releases/tag/v12.1.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.1.0 --- 12/alpine/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 923ebff4ca..ee4772ad75 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.0.0 +ENV NODE_VERSION 12.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index f7882dd22b..556c83aa01 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.0.0 +ENV NODE_VERSION 12.1.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index c663360785..d280f08eb5 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.0.0 +ENV NODE_VERSION 12.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From e8c9f49af6d18100ecb0093cbea4bae18f1271d9 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 1 May 2019 05:53:48 +0800 Subject: [PATCH 264/818] Update node.js v11 from v11.14.0 to v11.15.0 (#1031) - https://nodejs.org/en/blog/release/v11.15.0/ - https://github.com/nodejs/node/releases/tag/v11.15.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V11.md#11.15.0 --- 11/alpine/Dockerfile | 2 +- 11/stretch-slim/Dockerfile | 2 +- 11/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 9958d6a448..710865233b 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 11.14.0 +ENV NODE_VERSION 11.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 4cb46618c3..32200c11a3 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/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 11.14.0 +ENV NODE_VERSION 11.15.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 8803f3fda5..5c3a293b41 100644 --- a/11/stretch/Dockerfile +++ b/11/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 11.14.0 +ENV NODE_VERSION 11.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 52f158072233eebce49847ac1db6961dcd2afa69 Mon Sep 17 00:00:00 2001 From: Zadkiel Date: Wed, 1 May 2019 20:22:02 +0200 Subject: [PATCH 265/818] fix: remove use of virtual in node-gyp multistage --- docs/BestPractices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index ac2141d930..a12a4b55ef 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -173,7 +173,7 @@ And Here's a multistage build example FROM node:alpine as builder ## Install build toolchain, install node deps and compile native add-ons -RUN apk add --no-cache --virtual .gyp python make g++ +RUN apk add --no-cache python make g++ RUN npm install [ your npm dependencies here ] FROM node:alpine as app From 08875df2ddd7c961f3c57cbd45a282c66c03c9a0 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 1 May 2019 08:54:29 -0400 Subject: [PATCH 266/818] v6 EOL Signed-off-by: Laurent Goderre --- .travis.yml | 42 --------------------- 6/alpine/Dockerfile | 71 ----------------------------------- 6/architectures | 8 ---- 6/jessie-slim/Dockerfile | 67 --------------------------------- 6/jessie/Dockerfile | 64 ------------------------------- 6/onbuild/Dockerfile | 12 ------ 6/stretch-slim/Dockerfile | 67 --------------------------------- 6/stretch/Dockerfile | 64 ------------------------------- generate-stackbrew-library.sh | 2 - 9 files changed, 397 deletions(-) delete mode 100644 6/alpine/Dockerfile delete mode 100644 6/architectures delete mode 100644 6/jessie-slim/Dockerfile delete mode 100644 6/jessie/Dockerfile delete mode 100644 6/onbuild/Dockerfile delete mode 100644 6/stretch-slim/Dockerfile delete mode 100644 6/stretch/Dockerfile diff --git a/.travis.yml b/.travis.yml index 0366b5e65f..92a15208c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -184,48 +184,6 @@ jobs: - NODE_VERSION="12" - VARIANT="stretch-slim" - - stage: Build - before_script: *auto_skip - name: 6 on jessie - env: - - NODE_VERSION="6" - - VARIANT="jessie" - - - stage: Build - before_script: *auto_skip - name: 6 on jessie-slim - env: - - NODE_VERSION="6" - - VARIANT="jessie-slim" - - - stage: Build - before_script: *auto_skip - name: 6 on alpine - env: - - NODE_VERSION="6" - - VARIANT="alpine" - - - stage: Build - before_script: *auto_skip - name: 6 on onbuild - env: - - NODE_VERSION="6" - - VARIANT="onbuild" - - - stage: Build - before_script: *auto_skip - name: 6 on stretch - env: - - NODE_VERSION="6" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 6 on stretch-slim - env: - - NODE_VERSION="6" - - VARIANT="stretch-slim" - - stage: Build before_script: *auto_skip name: 8 on jessie diff --git a/6/alpine/Dockerfile b/6/alpine/Dockerfile deleted file mode 100644 index 0072f4f14f..0000000000 --- a/6/alpine/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM alpine:3.9 - -ENV NODE_VERSION 6.17.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - binutils-gold \ - curl \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt - -ENV YARN_VERSION 1.15.2 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -CMD [ "node" ] diff --git a/6/architectures b/6/architectures deleted file mode 100644 index 3d0360cbf8..0000000000 --- a/6/architectures +++ /dev/null @@ -1,8 +0,0 @@ -bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -arm32v6 alpine -arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim -arm64v8 alpine,onbuild,stretch,stretch-slim -i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -ppc64le alpine,onbuild,stretch,stretch-slim -s390x alpine,onbuild,stretch,stretch-slim diff --git a/6/jessie-slim/Dockerfile b/6/jessie-slim/Dockerfile deleted file mode 100644 index ddf477dbff..0000000000 --- a/6/jessie-slim/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM debian:jessie-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 6.17.1 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.15.2 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/6/jessie/Dockerfile b/6/jessie/Dockerfile deleted file mode 100644 index 8a9f6e1d5f..0000000000 --- a/6/jessie/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -FROM buildpack-deps:jessie - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 6.17.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.15.2 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/6/onbuild/Dockerfile b/6/onbuild/Dockerfile deleted file mode 100644 index 2e6ff3a093..0000000000 --- a/6/onbuild/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:6.17.1-stretch - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD ARG NODE_ENV -ONBUILD ENV NODE_ENV $NODE_ENV -ONBUILD COPY package.json /usr/src/app/ -ONBUILD RUN npm install && npm cache clean --force -ONBUILD COPY . /usr/src/app - -CMD [ "npm", "start" ] diff --git a/6/stretch-slim/Dockerfile b/6/stretch-slim/Dockerfile deleted file mode 100644 index d78d1a50ba..0000000000 --- a/6/stretch-slim/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 6.17.1 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.15.2 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/6/stretch/Dockerfile b/6/stretch/Dockerfile deleted file mode 100644 index 831481800d..0000000000 --- a/6/stretch/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 6.17.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.15.2 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index db817e5a4e..70e309b150 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -7,8 +7,6 @@ hash git 2> /dev/null || { echo >&2 "git not found, exiting."; } # Used dynamically: print "$array_" $1 # shellcheck disable=SC2034 -array_6='6 boron' -# shellcheck disable=SC2034 array_8='8 carbon' # shellcheck disable=SC2034 array_10='10 dubnium lts' From 8913f934470af3d775a31277e065b9853639e2b2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 8 May 2019 02:47:06 +0800 Subject: [PATCH 267/818] Update node.js v12.1.0 to v12.2.0 - https://nodejs.org/en/blog/release/v12.2.0/ - https://github.com/nodejs/node/releases/tag/v12.2.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.2.0 --- 12/alpine/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index ee4772ad75..4a1682588b 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.1.0 +ENV NODE_VERSION 12.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 556c83aa01..0ba1951b93 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.1.0 +ENV NODE_VERSION 12.2.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index d280f08eb5..db6ea27ef5 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.1.0 +ENV NODE_VERSION 12.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From abfaf5d2725c90fe2243a1c9b22761a6c40d4a39 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 22 May 2019 02:24:44 +0800 Subject: [PATCH 268/818] Update node.js v12.2.0 to v12.3.0 with Yarn v1.16.0 - https://nodejs.org/en/blog/release/v12.3.0/ - https://github.com/nodejs/node/releases/tag/v12.3.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.3.0 --- 12/alpine/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 4a1682588b..8f295cb0b1 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.2.0 +ENV NODE_VERSION 12.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.16.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 0ba1951b93..ef1bc6b37e 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.2.0 +ENV NODE_VERSION 12.3.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.16.0 RUN set -ex \ && for key in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index db6ea27ef5..16624bbf36 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.2.0 +ENV NODE_VERSION 12.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.16.0 RUN set -ex \ && for key in \ From cf8171eb00f1cb0fe36770a960e41175a862ac43 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 23 May 2019 02:00:56 +0800 Subject: [PATCH 269/818] Update node.js v12.3.0 to v12.3.1 - https://github.com/nodejs/node/releases/tag/v12.3.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.3.1 --- 12/alpine/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 8f295cb0b1..1a3ebdf9b7 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.3.0 +ENV NODE_VERSION 12.3.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index ef1bc6b37e..4cd6189798 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.3.0 +ENV NODE_VERSION 12.3.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 16624bbf36..bd6da86666 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.3.0 +ENV NODE_VERSION 12.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 7e47b378c42b03ae6afae704c5bf5b724aae2b92 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 23 May 2019 11:45:48 -0400 Subject: [PATCH 270/818] Added an entrypoint script Fixes #1039 --- 10/alpine/Dockerfile | 3 +++ 10/alpine/docker-entrypoint.sh | 8 ++++++++ 10/jessie-slim/Dockerfile | 3 +++ 10/jessie-slim/docker-entrypoint.sh | 8 ++++++++ 10/jessie/Dockerfile | 3 +++ 10/jessie/docker-entrypoint.sh | 8 ++++++++ 10/stretch-slim/Dockerfile | 3 +++ 10/stretch-slim/docker-entrypoint.sh | 8 ++++++++ 10/stretch/Dockerfile | 3 +++ 10/stretch/docker-entrypoint.sh | 8 ++++++++ 11/alpine/Dockerfile | 3 +++ 11/alpine/docker-entrypoint.sh | 8 ++++++++ 11/stretch-slim/Dockerfile | 3 +++ 11/stretch-slim/docker-entrypoint.sh | 8 ++++++++ 11/stretch/Dockerfile | 3 +++ 11/stretch/docker-entrypoint.sh | 8 ++++++++ 12/alpine/Dockerfile | 3 +++ 12/alpine/docker-entrypoint.sh | 8 ++++++++ 12/stretch-slim/Dockerfile | 3 +++ 12/stretch-slim/docker-entrypoint.sh | 8 ++++++++ 12/stretch/Dockerfile | 3 +++ 12/stretch/docker-entrypoint.sh | 8 ++++++++ 8/alpine/Dockerfile | 3 +++ 8/alpine/docker-entrypoint.sh | 8 ++++++++ 8/jessie-slim/Dockerfile | 3 +++ 8/jessie-slim/docker-entrypoint.sh | 8 ++++++++ 8/jessie/Dockerfile | 3 +++ 8/jessie/docker-entrypoint.sh | 8 ++++++++ 8/stretch-slim/Dockerfile | 3 +++ 8/stretch-slim/docker-entrypoint.sh | 8 ++++++++ 8/stretch/Dockerfile | 3 +++ 8/stretch/docker-entrypoint.sh | 8 ++++++++ Dockerfile-alpine.template | 3 +++ Dockerfile-debian.template | 3 +++ Dockerfile-slim.template | 3 +++ docker-entrypoint.sh | 8 ++++++++ update.sh | 1 + 37 files changed, 194 insertions(+) create mode 100755 10/alpine/docker-entrypoint.sh create mode 100755 10/jessie-slim/docker-entrypoint.sh create mode 100755 10/jessie/docker-entrypoint.sh create mode 100755 10/stretch-slim/docker-entrypoint.sh create mode 100755 10/stretch/docker-entrypoint.sh create mode 100755 11/alpine/docker-entrypoint.sh create mode 100755 11/stretch-slim/docker-entrypoint.sh create mode 100755 11/stretch/docker-entrypoint.sh create mode 100755 12/alpine/docker-entrypoint.sh create mode 100755 12/stretch-slim/docker-entrypoint.sh create mode 100755 12/stretch/docker-entrypoint.sh create mode 100755 8/alpine/docker-entrypoint.sh create mode 100755 8/jessie-slim/docker-entrypoint.sh create mode 100755 8/jessie/docker-entrypoint.sh create mode 100755 8/stretch-slim/docker-entrypoint.sh create mode 100755 8/stretch/docker-entrypoint.sh create mode 100755 docker-entrypoint.sh diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 0014944cbc..e94f4b8df0 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/alpine/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 5068328697..d1c4ae2725 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-slim/Dockerfile @@ -64,4 +64,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/10/jessie-slim/docker-entrypoint.sh b/10/jessie-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/jessie-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index d8a97562a7..ce6c00246d 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -61,4 +61,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/10/jessie/docker-entrypoint.sh b/10/jessie/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/jessie/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 488f3f464b..eeb1c4119f 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/stretch-slim/Dockerfile @@ -64,4 +64,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/10/stretch-slim/docker-entrypoint.sh b/10/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index a7f7ead531..8f9fdcc69f 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -61,4 +61,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/10/stretch/docker-entrypoint.sh b/10/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile index 710865233b..dff7d11781 100644 --- a/11/alpine/Dockerfile +++ b/11/alpine/Dockerfile @@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/11/alpine/docker-entrypoint.sh b/11/alpine/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/11/alpine/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile index 32200c11a3..2a390a92e6 100644 --- a/11/stretch-slim/Dockerfile +++ b/11/stretch-slim/Dockerfile @@ -64,4 +64,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/11/stretch-slim/docker-entrypoint.sh b/11/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/11/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile index 5c3a293b41..68a39b8af4 100644 --- a/11/stretch/Dockerfile +++ b/11/stretch/Dockerfile @@ -61,4 +61,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/11/stretch/docker-entrypoint.sh b/11/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/11/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 1a3ebdf9b7..6137c197f1 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/12/alpine/docker-entrypoint.sh b/12/alpine/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/alpine/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 4cd6189798..f6e1881b5c 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/stretch-slim/Dockerfile @@ -64,4 +64,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/12/stretch-slim/docker-entrypoint.sh b/12/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index bd6da86666..dd9cb2b057 100644 --- a/12/stretch/Dockerfile +++ b/12/stretch/Dockerfile @@ -61,4 +61,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/12/stretch/docker-entrypoint.sh b/12/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 336034477f..d74f387f46 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -68,4 +68,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/8/alpine/docker-entrypoint.sh b/8/alpine/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/alpine/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index 8cb11fc99a..11d3331325 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-slim/Dockerfile @@ -64,4 +64,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/8/jessie-slim/docker-entrypoint.sh b/8/jessie-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/jessie-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 22b27e514c..20ad522dcf 100644 --- a/8/jessie/Dockerfile +++ b/8/jessie/Dockerfile @@ -61,4 +61,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/8/jessie/docker-entrypoint.sh b/8/jessie/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/jessie/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index 6443cbbc21..6518417c86 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/stretch-slim/Dockerfile @@ -64,4 +64,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/8/stretch-slim/docker-entrypoint.sh b/8/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 48d0792646..993bc50800 100644 --- a/8/stretch/Dockerfile +++ b/8/stretch/Dockerfile @@ -61,4 +61,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/8/stretch/docker-entrypoint.sh b/8/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 69cb25d9c0..36d281b2be 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -58,4 +58,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 425b982f27..13ec6404b3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -51,4 +51,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index bed6237ca9..89de397259 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -54,4 +54,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + CMD [ "node" ] diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/update.sh b/update.sh index 5565383ebd..c10f685e0a 100755 --- a/update.sh +++ b/update.sh @@ -245,6 +245,7 @@ for version in "${versions[@]}"; do template_file="${parentpath}/Dockerfile-slim.template" fi + [ "$variant" != "onbuild" ] && cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh" if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${template_file}" "${version}/${variant}/Dockerfile" "${variant}" & fi From 2e3e6afe0a07aa6cf50317961efc0d513cd69ad6 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 29 May 2019 14:03:27 +0800 Subject: [PATCH 271/818] Update node.js v10 to v10.16.0 with Yarn v1.16.0 - https://nodejs.org/en/blog/release/v10.16.0/ - https://github.com/nodejs/node/releases/tag/v10.16.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.16.0 --- 10/alpine/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 0014944cbc..352de002f2 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.15.3 +ENV NODE_VERSION 10.16.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.16.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 5068328697..1fd778ef31 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.15.3 +ENV NODE_VERSION 10.16.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.16.0 RUN set -ex \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index d8a97562a7..fc29c27052 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.15.3 +ENV NODE_VERSION 10.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.16.0 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 488f3f464b..a1979edb65 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.15.3 +ENV NODE_VERSION 10.16.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.16.0 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index a7f7ead531..5e96d9902c 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.15.3 +ENV NODE_VERSION 10.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.13.0 +ENV YARN_VERSION 1.16.0 RUN set -ex \ && for key in \ From 1bacb0376ce73255f65f6ed452447737c79bbf26 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 4 Jun 2019 22:05:58 +0800 Subject: [PATCH 272/818] Update node.js v12 from v12.3.1 to v12.4.0 - https://nodejs.org/en/blog/release/v12.4.0/ - https://github.com/nodejs/node/releases/tag/v12.4.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.4.0 --- 12/alpine/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 1a3ebdf9b7..2a7059f627 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.3.1 +ENV NODE_VERSION 12.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 4cd6189798..66b3728b4d 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.3.1 +ENV NODE_VERSION 12.4.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index bd6da86666..07887a915b 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.3.1 +ENV NODE_VERSION 12.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c66340cdc61e1e9a9d172469fe7b60c17539c037 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 27 Jun 2019 22:00:38 +0800 Subject: [PATCH 273/818] Update node.js v12 from v12.4.0 to v12.5.0 - https://nodejs.org/en/blog/release/v12.5.0/ - https://github.com/nodejs/node/releases/tag/v12.5.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.5.0 --- 12/alpine/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 59736b5871..f2502a9b69 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.4.0 +ENV NODE_VERSION 12.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 375bddbb98..8179398e00 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.4.0 +ENV NODE_VERSION 12.5.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 5361492c78..56829c619a 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.4.0 +ENV NODE_VERSION 12.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From be0fbedc36a8746a7cbe3b3b1972175177fcdadd Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 3 Jul 2019 22:04:03 +0800 Subject: [PATCH 274/818] Update node.js v12 from v12.5.0 to v12.6.0 - https://nodejs.org/en/blog/release/v12.6.0/ - https://github.com/nodejs/node/releases/tag/v12.6.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.6.0 --- 12/alpine/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index f2502a9b69..370f14021e 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.5.0 +ENV NODE_VERSION 12.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 8179398e00..a016f8f2be 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.5.0 +ENV NODE_VERSION 12.6.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 56829c619a..c2bbbfe6ae 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.5.0 +ENV NODE_VERSION 12.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 3ccbae331d9114a41bc94d2079a81e40ac03c0f0 Mon Sep 17 00:00:00 2001 From: Tommi Vainikainen Date: Sat, 13 Jul 2019 17:55:12 +0300 Subject: [PATCH 275/818] Remove node.js v11 no longer maintained Maintenance of Node.js v11 ended 2019-06-01 https://github.com/nodejs/Release/blob/f4ae92f443f57f4b8f0716859a9a64ba055caac4/schedule.json#L56 --- .travis.yml | 21 -------- 11/alpine/Dockerfile | 74 ---------------------------- 11/alpine/docker-entrypoint.sh | 8 --- 11/architectures | 8 --- 11/stretch-slim/Dockerfile | 70 -------------------------- 11/stretch-slim/docker-entrypoint.sh | 8 --- 11/stretch/Dockerfile | 67 ------------------------- 11/stretch/docker-entrypoint.sh | 8 --- generate-stackbrew-library.sh | 2 - 9 files changed, 266 deletions(-) delete mode 100644 11/alpine/Dockerfile delete mode 100755 11/alpine/docker-entrypoint.sh delete mode 100644 11/architectures delete mode 100644 11/stretch-slim/Dockerfile delete mode 100755 11/stretch-slim/docker-entrypoint.sh delete mode 100644 11/stretch/Dockerfile delete mode 100755 11/stretch/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 92a15208c0..46e2a39223 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,27 +142,6 @@ jobs: - NODE_VERSION="10" - VARIANT="stretch-slim" - - stage: Build - before_script: *auto_skip - name: 11 on alpine - env: - - NODE_VERSION="11" - - VARIANT="alpine" - - - stage: Build - before_script: *auto_skip - name: 11 on stretch - env: - - NODE_VERSION="11" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 11 on stretch-slim - env: - - NODE_VERSION="11" - - VARIANT="stretch-slim" - - stage: Build before_script: *auto_skip name: 12 on alpine diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile deleted file mode 100644 index dff7d11781..0000000000 --- a/11/alpine/Dockerfile +++ /dev/null @@ -1,74 +0,0 @@ -FROM alpine:3.9 - -ENV NODE_VERSION 11.15.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - binutils-gold \ - curl \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt - -ENV YARN_VERSION 1.15.2 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/11/alpine/docker-entrypoint.sh b/11/alpine/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/11/alpine/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/11/architectures b/11/architectures deleted file mode 100644 index 1732b90092..0000000000 --- a/11/architectures +++ /dev/null @@ -1,8 +0,0 @@ -bashbrew-arch variants -amd64 alpine,stretch,stretch-slim -arm32v6 alpine -arm32v7 stretch,stretch-slim -arm64v8 alpine,stretch,stretch-slim -i386 alpine -ppc64le alpine,stretch,stretch-slim -s390x alpine,stretch,stretch-slim diff --git a/11/stretch-slim/Dockerfile b/11/stretch-slim/Dockerfile deleted file mode 100644 index 2a390a92e6..0000000000 --- a/11/stretch-slim/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 11.15.0 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.15.2 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/11/stretch-slim/docker-entrypoint.sh b/11/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/11/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/11/stretch/Dockerfile b/11/stretch/Dockerfile deleted file mode 100644 index 68a39b8af4..0000000000 --- a/11/stretch/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 11.15.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.15.2 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/11/stretch/docker-entrypoint.sh b/11/stretch/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/11/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 70e309b150..92f80fa5e0 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,8 +11,6 @@ array_8='8 carbon' # shellcheck disable=SC2034 array_10='10 dubnium lts' # shellcheck disable=SC2034 -array_11='11' -# shellcheck disable=SC2034 array_12='12 current latest' # shellcheck disable=SC2034 array_chakracore_8='chakracore-8' From 2a856dabc31fab501ab85a911b93559079684a3a Mon Sep 17 00:00:00 2001 From: Tommi Vainikainen Date: Wed, 17 Jul 2019 17:40:49 +0300 Subject: [PATCH 276/818] Add Debian 10 buster images New stable release Debian 10 "buster" was released 2019-07-06. Add new "buster" and "buster-slim" image variants for all currently supported Node.js versions (v8, v10, v12). --- .travis.yml | 42 +++++++++++++++++ 10/architectures | 10 ++--- 10/buster-slim/Dockerfile | 70 +++++++++++++++++++++++++++++ 10/buster-slim/docker-entrypoint.sh | 8 ++++ 10/buster/Dockerfile | 67 +++++++++++++++++++++++++++ 10/buster/docker-entrypoint.sh | 8 ++++ 12/architectures | 10 ++--- 12/buster-slim/Dockerfile | 70 +++++++++++++++++++++++++++++ 12/buster-slim/docker-entrypoint.sh | 8 ++++ 12/buster/Dockerfile | 67 +++++++++++++++++++++++++++ 12/buster/docker-entrypoint.sh | 8 ++++ 8/architectures | 12 ++--- 8/buster-slim/Dockerfile | 70 +++++++++++++++++++++++++++++ 8/buster-slim/docker-entrypoint.sh | 8 ++++ 8/buster/Dockerfile | 67 +++++++++++++++++++++++++++ 8/buster/docker-entrypoint.sh | 8 ++++ architectures | 14 +++--- config | 2 +- 18 files changed, 525 insertions(+), 24 deletions(-) create mode 100644 10/buster-slim/Dockerfile create mode 100755 10/buster-slim/docker-entrypoint.sh create mode 100644 10/buster/Dockerfile create mode 100755 10/buster/docker-entrypoint.sh create mode 100644 12/buster-slim/Dockerfile create mode 100755 12/buster-slim/docker-entrypoint.sh create mode 100644 12/buster/Dockerfile create mode 100755 12/buster/docker-entrypoint.sh create mode 100644 8/buster-slim/Dockerfile create mode 100755 8/buster-slim/docker-entrypoint.sh create mode 100644 8/buster/Dockerfile create mode 100755 8/buster/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 46e2a39223..cb332283bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -142,6 +142,20 @@ jobs: - NODE_VERSION="10" - VARIANT="stretch-slim" + - stage: Build + before_script: *auto_skip + name: 10 on buster + env: + - NODE_VERSION="10" + - VARIANT="buster" + + - stage: Build + before_script: *auto_skip + name: 10 on buster-slim + env: + - NODE_VERSION="10" + - VARIANT="buster-slim" + - stage: Build before_script: *auto_skip name: 12 on alpine @@ -163,6 +177,20 @@ jobs: - NODE_VERSION="12" - VARIANT="stretch-slim" + - stage: Build + before_script: *auto_skip + name: 12 on buster + env: + - NODE_VERSION="12" + - VARIANT="buster" + + - stage: Build + before_script: *auto_skip + name: 12 on buster-slim + env: + - NODE_VERSION="12" + - VARIANT="buster-slim" + - stage: Build before_script: *auto_skip name: 8 on jessie @@ -205,6 +233,20 @@ jobs: - NODE_VERSION="8" - VARIANT="stretch-slim" + - stage: Build + before_script: *auto_skip + name: 8 on buster + env: + - NODE_VERSION="8" + - VARIANT="buster" + + - stage: Build + before_script: *auto_skip + name: 8 on buster-slim + env: + - NODE_VERSION="8" + - VARIANT="buster-slim" + - stage: Build before_script: *auto_skip name: chakracore/10 on default diff --git a/10/architectures b/10/architectures index 4cbf543b67..963c2a0e8f 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,stretch,stretch-slim +amd64 jessie,jessie-slim,alpine,stretch,stretch-slim,buster,buster-slim arm32v6 alpine -arm32v7 jessie,jessie-slim,stretch,stretch-slim -arm64v8 alpine,stretch,stretch-slim +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim +arm64v8 alpine,stretch,stretch-slim,buster,buster-slim i386 alpine -ppc64le alpine,stretch,stretch-slim -s390x alpine,stretch,stretch-slim +ppc64le alpine,stretch,stretch-slim,buster,buster-slim +s390x alpine,stretch,stretch-slim,buster,buster-slim diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile new file mode 100644 index 0000000000..6cbaf57609 --- /dev/null +++ b/10/buster-slim/Dockerfile @@ -0,0 +1,70 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 10.16.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.16.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/10/buster-slim/docker-entrypoint.sh b/10/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile new file mode 100644 index 0000000000..2cc92e0d29 --- /dev/null +++ b/10/buster/Dockerfile @@ -0,0 +1,67 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 10.16.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.16.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/10/buster/docker-entrypoint.sh b/10/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/architectures b/12/architectures index 1732b90092..ca26b55393 100644 --- a/12/architectures +++ b/12/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine,stretch,stretch-slim +amd64 alpine,stretch,stretch-slim,buster,buster-slim arm32v6 alpine -arm32v7 stretch,stretch-slim -arm64v8 alpine,stretch,stretch-slim +arm32v7 stretch,stretch-slim,buster,buster-slim +arm64v8 alpine,stretch,stretch-slim,buster,buster-slim i386 alpine -ppc64le alpine,stretch,stretch-slim -s390x alpine,stretch,stretch-slim +ppc64le alpine,stretch,stretch-slim,buster,buster-slim +s390x alpine,stretch,stretch-slim,buster,buster-slim diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile new file mode 100644 index 0000000000..89aa32e473 --- /dev/null +++ b/12/buster-slim/Dockerfile @@ -0,0 +1,70 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 12.6.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.16.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/buster-slim/docker-entrypoint.sh b/12/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile new file mode 100644 index 0000000000..a1d55dacd1 --- /dev/null +++ b/12/buster/Dockerfile @@ -0,0 +1,67 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 12.6.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.16.0 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/buster/docker-entrypoint.sh b/12/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/architectures b/8/architectures index 3d0360cbf8..f7a46ff0b3 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim arm32v6 alpine -arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim -arm64v8 alpine,onbuild,stretch,stretch-slim -i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -ppc64le alpine,onbuild,stretch,stretch-slim -s390x alpine,onbuild,stretch,stretch-slim +arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim,buster,buster-slim +arm64v8 alpine,onbuild,stretch,stretch-slim,buster,buster-slim +i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +ppc64le alpine,onbuild,stretch,stretch-slim,buster,buster-slim +s390x alpine,onbuild,stretch,stretch-slim,buster,buster-slim diff --git a/8/buster-slim/Dockerfile b/8/buster-slim/Dockerfile new file mode 100644 index 0000000000..8ce9012387 --- /dev/null +++ b/8/buster-slim/Dockerfile @@ -0,0 +1,70 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 8.16.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.15.2 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/8/buster-slim/docker-entrypoint.sh b/8/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/buster/Dockerfile b/8/buster/Dockerfile new file mode 100644 index 0000000000..f223666e55 --- /dev/null +++ b/8/buster/Dockerfile @@ -0,0 +1,67 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 8.16.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.15.2 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/8/buster/docker-entrypoint.sh b/8/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/architectures b/architectures index cfac949b76..64b416475d 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -arm32v6 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -arm64v8 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -ppc64le jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim -s390x jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim +amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +arm32v6 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +arm64v8 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +ppc64le jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +s390x jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim diff --git a/config b/config index aa9d80d9ee..db40669a5f 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch alpine_version 3.9 -debian_versions jessie stretch +debian_versions jessie stretch buster From c80a296e96d33fecd43f9e8c89ff1ef093ee242d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 24 Jul 2019 13:33:46 +0800 Subject: [PATCH 277/818] Update node.js v12.6.0 to v12.7.0 with Yarn v1.17.3 - https://nodejs.org/en/blog/release/v12.7.0/ - https://github.com/nodejs/node/releases/tag/v12.7.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.7.0 --- 12/alpine/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 370f14021e..0583674822 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.6.0 +ENV NODE_VERSION 12.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index a016f8f2be..0c66d6f8a3 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.6.0 +ENV NODE_VERSION 12.7.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index c2bbbfe6ae..26483f41b6 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.6.0 +ENV NODE_VERSION 12.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ From 6bae0eb339bc5be880f01b652f48fdf939f76590 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 25 Jul 2019 03:05:31 -0400 Subject: [PATCH 278/818] fix: Update Buster to 12.7.0 --- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 89aa32e473..7b074dff50 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.6.0 +ENV NODE_VERSION 12.7.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index a1d55dacd1..2ff5597034 100644 --- a/12/buster/Dockerfile +++ b/12/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.6.0 +ENV NODE_VERSION 12.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ From f5b60750fedd5df9a17cf9645a8f6dc04608e721 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 1 Aug 2019 03:03:02 +0800 Subject: [PATCH 279/818] Update node.js v10 to v10.16.1 with Yarn v1.17.3 - https://nodejs.org/en/blog/release/v10.16.1/ - https://github.com/nodejs/node/releases/tag/v10.16.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.16.1 --- 10/alpine/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 4 ++-- 10/buster/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 791f987371..c165a6c457 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.16.0 +ENV NODE_VERSION 10.16.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 6cbaf57609..c9ddedc0a4 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.16.0 +ENV NODE_VERSION 10.16.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 2cc92e0d29..b93b84faa8 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.16.0 +ENV NODE_VERSION 10.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 8ba8992ade..36c81471ce 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.16.0 +ENV NODE_VERSION 10.16.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 66307fee80..d58e50359b 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.16.0 +ENV NODE_VERSION 10.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 66c4e765d5..773858153c 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.16.0 +ENV NODE_VERSION 10.16.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 73b9a92b34..9a62903d3e 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.16.0 +ENV NODE_VERSION 10.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.16.0 +ENV YARN_VERSION 1.17.3 RUN set -ex \ && for key in \ From 20db41235190f020d8c1e3fd323b21443b348251 Mon Sep 17 00:00:00 2001 From: William Entriken Date: Thu, 1 Aug 2019 17:35:23 -0400 Subject: [PATCH 280/818] Cross-reference Node.js release schedule to set project scope, fixes #1071 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 4ee8c07a8c..7bbd94f2cf 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ The official Node.js docker image, made with love by the node community. - [`node:slim`](#nodeslim) - [License](#license) - [Supported Docker versions](#supported-docker-versions) +- [Supported Node.js versions](#supported-nodejs-versions) - [Governance and Current Members](#governance-and-current-members) - [Docker Working Group Members](#docker-working-group-members) - [Docker Working Group Collaborators](#docker-working-group-collaborators) @@ -256,6 +257,10 @@ Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon. +## Supported Node.js versions + +This project will support Node.js versions as still under active support as per the [Node.js release schedule](https://github.com/nodejs/Release). + ## Governance and Current Members The Node.js Docker Image is governed by the Docker Working Group. See From b5580a2cfcfb058fd0e81faadf4eb797f4635428 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 2 Aug 2019 17:51:31 +0800 Subject: [PATCH 281/818] Update Alpine Linux version to v3.10 in config cc #1061 #1075 --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index db40669a5f..ac07135eb7 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch -alpine_version 3.9 +alpine_version 3.10 debian_versions jessie stretch buster From 6a4436029a0d021e99379804d594ea2a41a0c147 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 5 Aug 2019 16:25:48 -0700 Subject: [PATCH 282/818] Add arm32v7 to Alpine variants --- 10/architectures | 2 +- 12/architectures | 2 +- 8/architectures | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/10/architectures b/10/architectures index 963c2a0e8f..5f77c7cf17 100644 --- a/10/architectures +++ b/10/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants amd64 jessie,jessie-slim,alpine,stretch,stretch-slim,buster,buster-slim arm32v6 alpine -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim +arm32v7 jessie,jessie-slim,alpine,stretch,stretch-slim,buster,buster-slim arm64v8 alpine,stretch,stretch-slim,buster,buster-slim i386 alpine ppc64le alpine,stretch,stretch-slim,buster,buster-slim diff --git a/12/architectures b/12/architectures index ca26b55393..7adab03f0a 100644 --- a/12/architectures +++ b/12/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants amd64 alpine,stretch,stretch-slim,buster,buster-slim arm32v6 alpine -arm32v7 stretch,stretch-slim,buster,buster-slim +arm32v7 alpine,stretch,stretch-slim,buster,buster-slim arm64v8 alpine,stretch,stretch-slim,buster,buster-slim i386 alpine ppc64le alpine,stretch,stretch-slim,buster,buster-slim diff --git a/8/architectures b/8/architectures index f7a46ff0b3..11c069bf71 100644 --- a/8/architectures +++ b/8/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim arm32v6 alpine -arm32v7 jessie,jessie-slim,onbuild,stretch,stretch-slim,buster,buster-slim +arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim arm64v8 alpine,onbuild,stretch,stretch-slim,buster,buster-slim i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim ppc64le alpine,onbuild,stretch,stretch-slim,buster,buster-slim From 2524f98f3bcedcfc943a52feb519adf0ee0e3629 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 7 Aug 2019 13:51:22 +0800 Subject: [PATCH 283/818] Update node.js v10 from v10.16.1 to v10.16.2 - https://nodejs.org/en/blog/release/v10.16.2/ - https://github.com/nodejs/node/releases/tag/v10.16.2 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.16.2 --- 10/alpine/Dockerfile | 2 +- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index c165a6c457..b66259e24e 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.16.1 +ENV NODE_VERSION 10.16.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index c9ddedc0a4..b00a45fa29 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.16.1 +ENV NODE_VERSION 10.16.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index b93b84faa8..97d0e4ca27 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.16.1 +ENV NODE_VERSION 10.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 36c81471ce..f4a7dd1b36 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.16.1 +ENV NODE_VERSION 10.16.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index d58e50359b..9b5bd3691a 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.16.1 +ENV NODE_VERSION 10.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 773858153c..c20336ecd1 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.16.1 +ENV NODE_VERSION 10.16.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 9a62903d3e..c72de15f3e 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.16.1 +ENV NODE_VERSION 10.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 04daea3cdd2a34571d06fbbe74bcee305dd1d7bc Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 7 Aug 2019 13:52:27 +0800 Subject: [PATCH 284/818] Update node.js v12 from v12.6.0 to v12.7.0 - https://nodejs.org/en/blog/release/v12.7.0/ - https://github.com/nodejs/node/releases/tag/v12.7.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.7.0 --- 12/alpine/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 0583674822..5414b622f8 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.7.0 +ENV NODE_VERSION 12.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 7b074dff50..171063e858 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.7.0 +ENV NODE_VERSION 12.8.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 2ff5597034..9d96a160c6 100644 --- a/12/buster/Dockerfile +++ b/12/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.7.0 +ENV NODE_VERSION 12.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 0c66d6f8a3..d36fc4deb5 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.7.0 +ENV NODE_VERSION 12.8.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 26483f41b6..b2f62b5948 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.7.0 +ENV NODE_VERSION 12.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c8dbaa63d6e002f74e26954a9445c7b4b1419336 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Tue, 6 Aug 2019 13:01:01 -0400 Subject: [PATCH 285/818] meta: move chorrell to Docker Working Group Emeriti list --- ACTIVE_MAINTAINERS | 1 - README.md | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ACTIVE_MAINTAINERS b/ACTIVE_MAINTAINERS index 55991bb225..6425f28e38 100644 --- a/ACTIVE_MAINTAINERS +++ b/ACTIVE_MAINTAINERS @@ -1,4 +1,3 @@ -chorrell LaurentGoderre pesho PeterDaveHello diff --git a/README.md b/README.md index 4ee8c07a8c..d93d02279a 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ The official Node.js docker image, made with love by the node community. - [Governance and Current Members](#governance-and-current-members) - [Docker Working Group Members](#docker-working-group-members) - [Docker Working Group Collaborators](#docker-working-group-collaborators) + - [Emeritus](#emeritus) + - [Docker Working Group Members](#docker-working-group-members-1) @@ -265,7 +267,6 @@ about the expectations for all contributors to this project. ### Docker Working Group Members -- Christopher Horrell ([chorrell](https://github.com/chorrell)) - Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) - Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) - John Mitchell ([jlmitch5](https://github.com/jlmitch5)) @@ -277,3 +278,9 @@ about the expectations for all contributors to this project. - Laurent Goderre ([LaurentGoderre](https://github.com/LaurentGoderre)) - Simen Bekkhus ([SimenB](https://github.com/SimenB)) - Peter Dave Hello ([PeterDaveHello](https://github.com/PeterDaveHello)) + +### Emeritus + +#### Docker Working Group Members + +- Christopher Horrell ([chorrell](https://github.com/chorrell)) From a9c583095d4cf08bbd68f570a1f9a99780820351 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Thu, 15 Aug 2019 10:47:25 -0700 Subject: [PATCH 286/818] Update Node.js 8, 10, 12 for security releases --- 10/alpine/Dockerfile | 2 +- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 12/alpine/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 8/alpine/Dockerfile | 2 +- 8/buster-slim/Dockerfile | 2 +- 8/buster/Dockerfile | 2 +- 8/jessie-slim/Dockerfile | 2 +- 8/jessie/Dockerfile | 2 +- 8/onbuild/Dockerfile | 2 +- 8/stretch-slim/Dockerfile | 2 +- 8/stretch/Dockerfile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index b66259e24e..20f108c249 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.16.2 +ENV NODE_VERSION 10.16.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index b00a45fa29..4ca7db5d53 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.16.2 +ENV NODE_VERSION 10.16.3 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 97d0e4ca27..e528a0110f 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.16.2 +ENV NODE_VERSION 10.16.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index f4a7dd1b36..a14f35ad54 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.16.2 +ENV NODE_VERSION 10.16.3 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 9b5bd3691a..5261688c1c 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.16.2 +ENV NODE_VERSION 10.16.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index c20336ecd1..0d3946cf9a 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.16.2 +ENV NODE_VERSION 10.16.3 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index c72de15f3e..40377e20d1 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.16.2 +ENV NODE_VERSION 10.16.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 5414b622f8..29f1f4ce14 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.8.0 +ENV NODE_VERSION 12.8.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 171063e858..019a76139a 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.8.0 +ENV NODE_VERSION 12.8.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 9d96a160c6..6f7ab460b3 100644 --- a/12/buster/Dockerfile +++ b/12/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.8.0 +ENV NODE_VERSION 12.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index d36fc4deb5..a4e8b15dad 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.8.0 +ENV NODE_VERSION 12.8.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index b2f62b5948..d5979e85f4 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.8.0 +ENV NODE_VERSION 12.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index d74f387f46..c8ee589d6a 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 8.16.0 +ENV NODE_VERSION 8.16.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/8/buster-slim/Dockerfile b/8/buster-slim/Dockerfile index 8ce9012387..77a4cb3133 100644 --- a/8/buster-slim/Dockerfile +++ b/8/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 8.16.0 +ENV NODE_VERSION 8.16.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/buster/Dockerfile b/8/buster/Dockerfile index f223666e55..7308577bcd 100644 --- a/8/buster/Dockerfile +++ b/8/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 8.16.0 +ENV NODE_VERSION 8.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index 11d3331325..6b921608fb 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-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 -ENV NODE_VERSION 8.16.0 +ENV NODE_VERSION 8.16.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 20ad522dcf..0512c9193f 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.16.0 +ENV NODE_VERSION 8.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index d1d7a8f480..4b04856a3b 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.16.0-stretch +FROM node:8.16.1-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index 6518417c86..f8e2ade32c 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/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 8.16.0 +ENV NODE_VERSION 8.16.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 993bc50800..3145ff1f15 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.16.0 +ENV NODE_VERSION 8.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 32ceb312ecc0fcf72e0b0ee06006ae1619e48f7e Mon Sep 17 00:00:00 2001 From: William Entriken Date: Fri, 16 Aug 2019 23:33:12 -0400 Subject: [PATCH 287/818] Switch to recommend node version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d93d02279a..514a2ef436 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ See: http://nodejs.org ```dockerfile # specify the node base image with your desired version node: -FROM node:6 +FROM node:10 # replace this with your application's default port EXPOSE 8888 ``` From 8d27ed99d96923967171052947a07662e7bf7b7b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 21 Aug 2019 03:46:11 +0800 Subject: [PATCH 288/818] Update node.js v12 from v12.8.1 to v12.9.0 - https://nodejs.org/en/blog/release/v12.9.0/ - https://github.com/nodejs/node/releases/tag/v12.9.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.9.0 --- 12/alpine/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 29f1f4ce14..f239c7bde3 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.8.1 +ENV NODE_VERSION 12.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 019a76139a..16a69f36fb 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.8.1 +ENV NODE_VERSION 12.9.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 6f7ab460b3..20f636932b 100644 --- a/12/buster/Dockerfile +++ b/12/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.8.1 +ENV NODE_VERSION 12.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index a4e8b15dad..60bdb7792c 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.8.1 +ENV NODE_VERSION 12.9.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index d5979e85f4..51d83320b0 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.8.1 +ENV NODE_VERSION 12.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 3c8db579b7cc363280a96a6b66d6ff6f4e4b0826 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 27 Aug 2019 02:45:07 +0800 Subject: [PATCH 289/818] Update node.js v12 from v12.9.0 to v12.9.1 - https://nodejs.org/en/blog/release/v12.9.1/ - https://github.com/nodejs/node/releases/tag/v12.9.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.9.1 --- 12/alpine/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index f239c7bde3..c0282cbbe6 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.9.0 +ENV NODE_VERSION 12.9.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 16a69f36fb..712015c9ee 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.9.0 +ENV NODE_VERSION 12.9.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 20f636932b..97b95412bc 100644 --- a/12/buster/Dockerfile +++ b/12/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.9.0 +ENV NODE_VERSION 12.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 60bdb7792c..f9973fa532 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.9.0 +ENV NODE_VERSION 12.9.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 51d83320b0..d6e3f5bc69 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.9.0 +ENV NODE_VERSION 12.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5510c50a0b2e51a200538afca4898248f64dcf86 Mon Sep 17 00:00:00 2001 From: Xiao Liang Date: Thu, 29 Aug 2019 01:06:07 +0800 Subject: [PATCH 290/818] docs(BestPractices.md/Handling Kernel Signals): fix `CTRL-C` sends `SIGINT` signal, not `SIGTERM`. --- docs/BestPractices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index a12a4b55ef..eb75f8c6a5 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -64,7 +64,7 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl \ ## Handling Kernel Signals -Node.js was not designed to run as PID 1 which leads to unexpected behaviour when running inside of Docker. For example, a Node.js process running as PID 1 will not respond to `SIGTERM` (`CTRL-C`) and similar signals. As of Docker 1.13, you can use the `--init` flag to wrap your Node.js process with a [lightweight init system](https://github.com/krallin/tini) that properly handles running as PID 1. +Node.js was not designed to run as PID 1 which leads to unexpected behaviour when running inside of Docker. For example, a Node.js process running as PID 1 will not respond to `SIGINT` (`CTRL-C`) and similar signals. As of Docker 1.13, you can use the `--init` flag to wrap your Node.js process with a [lightweight init system](https://github.com/krallin/tini) that properly handles running as PID 1. ``` docker run -it --init node From 4a29572654fc378a7ebf0c962959f90a0d79b028 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 5 Sep 2019 13:41:18 +0800 Subject: [PATCH 291/818] Update node.js v12 from v12.9.1 to v12.10.0 - https://nodejs.org/en/blog/release/v12.10.0/ - https://github.com/nodejs/node/releases/tag/v12.10.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.10.0 --- 12/alpine/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index c0282cbbe6..46a67dfdf0 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.9.1 +ENV NODE_VERSION 12.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 712015c9ee..866ae65b11 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.9.1 +ENV NODE_VERSION 12.10.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 97b95412bc..86b254f41e 100644 --- a/12/buster/Dockerfile +++ b/12/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.9.1 +ENV NODE_VERSION 12.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index f9973fa532..7065c01cb3 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.9.1 +ENV NODE_VERSION 12.10.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index d6e3f5bc69..820fcde54d 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.9.1 +ENV NODE_VERSION 12.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From d7c86c0ae0d1129f2ddb226bf42cfebffa17d9c8 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 26 Sep 2019 12:38:41 +0800 Subject: [PATCH 292/818] Update node.js v12 from v12.10.0 to v12.11.0 - https://nodejs.org/en/blog/release/v12.11.0/ - https://github.com/nodejs/node/releases/tag/v12.11.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.11.0 --- 12/alpine/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 46a67dfdf0..368f7ea2d7 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.10.0 +ENV NODE_VERSION 12.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 866ae65b11..1343ad5128 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.10.0 +ENV NODE_VERSION 12.11.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 86b254f41e..c7dbe342ff 100644 --- a/12/buster/Dockerfile +++ b/12/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.10.0 +ENV NODE_VERSION 12.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 7065c01cb3..ef3d381dd5 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.10.0 +ENV NODE_VERSION 12.11.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 820fcde54d..ececd866e2 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.10.0 +ENV NODE_VERSION 12.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 82f9946e28d575abf26933db47832ae2f561131a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 2 Oct 2019 00:54:28 +0800 Subject: [PATCH 293/818] Patch node.js v12.11.0 Alpine build, cc nodejs/node#29709 Ref: - https://github.com/mhart/alpine-node/blob/12.11.0/Dockerfile#L35 --- 12/alpine/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 368f7ea2d7..f373430aaf 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -40,6 +40,7 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ + && curl -sfSL https://github.com/nodejs/node/archive/v${NODE_VERSION}.tar.gz | tar -xz --strip-components=1 -- node-12.11.0/deps/v8/test/torque/test-torque.tq \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ From 963d24a9198f048b8f40623b3499dd6875ed368a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 4 Oct 2019 21:51:16 +0800 Subject: [PATCH 294/818] Update node.js v12 to v12.11.1 with Yarn v1.19.0 - https://nodejs.org/en/blog/release/v12.11.1/ - https://github.com/nodejs/node/releases/tag/v12.11.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.11.1 --- 12/alpine/Dockerfile | 5 ++--- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index f373430aaf..642c474b21 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.11.0 +ENV NODE_VERSION 12.11.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -40,7 +40,6 @@ RUN addgroup -g 1000 node \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ - && curl -sfSL https://github.com/nodejs/node/archive/v${NODE_VERSION}.tar.gz | tar -xz --strip-components=1 -- node-12.11.0/deps/v8/test/torque/test-torque.tq \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ @@ -49,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 1343ad5128..3cae1d4f10 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.11.0 +ENV NODE_VERSION 12.11.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.0 RUN set -ex \ && for key in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index c7dbe342ff..056f9c41ba 100644 --- a/12/buster/Dockerfile +++ b/12/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.11.0 +ENV NODE_VERSION 12.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.0 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index ef3d381dd5..d54d035bf6 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.11.0 +ENV NODE_VERSION 12.11.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.0 RUN set -ex \ && for key in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index ececd866e2..2e9e05c13b 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.11.0 +ENV NODE_VERSION 12.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.0 RUN set -ex \ && for key in \ From e18668a03fdacf567b3cb79ff04478409b00163f Mon Sep 17 00:00:00 2001 From: Khaled Bentoumi Date: Thu, 23 May 2019 16:49:28 +0200 Subject: [PATCH 295/818] Update Upgrading/downgrading Yarn best practice --- docs/BestPractices.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index eb75f8c6a5..5c7c720001 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -32,12 +32,28 @@ ENV PATH=$PATH:/home/node/.npm-global/bin # optionally if you want to run npm gl ## Upgrading/downgrading Yarn -If you need to upgrade/downgrade `yarn`, you can do so by issuing the following commands in your `Dockerfile`: +### Local + +If you need to upgrade/downgrade `yarn` for a local install, you can do so by issuing the following commands in your `Dockerfile`: + +> Note that if you create some other directory which is not a descendant one from where you ran the command, you will end up using the global (dated) version. If you wish to upgrade `yarn` globally follow the instructions in the next section. + +> When following the local install instructions, due to duplicated yarn the image will end up being bigger. ```Dockerfile FROM node:6 -ENV YARN_VERSION 1.5.1 +ENV YARN_VERSION 1.16.0 + +RUN yarn policies set-version $YARN_VERSION +``` + +### Global + +```Dockerfile +FROM node:6 + +ENV YARN_VERSION 1.16.0 RUN curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ From fa27514a3fd775e1cb6bddac326f6f97dad05fb2 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 9 Oct 2019 16:43:41 -0400 Subject: [PATCH 296/818] feat: update for Node 8.16.2 --- 8/alpine/Dockerfile | 4 ++-- 8/buster-slim/Dockerfile | 4 ++-- 8/buster/Dockerfile | 4 ++-- 8/jessie-slim/Dockerfile | 4 ++-- 8/jessie/Dockerfile | 4 ++-- 8/onbuild/Dockerfile | 2 +- 8/stretch-slim/Dockerfile | 4 ++-- 8/stretch/Dockerfile | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index c8ee589d6a..23cab3b7d7 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 8.16.1 +ENV NODE_VERSION 8.16.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.19.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/buster-slim/Dockerfile b/8/buster-slim/Dockerfile index 77a4cb3133..a5b235a857 100644 --- a/8/buster-slim/Dockerfile +++ b/8/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 8.16.1 +ENV NODE_VERSION 8.16.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/8/buster/Dockerfile b/8/buster/Dockerfile index 7308577bcd..4515d7c6aa 100644 --- a/8/buster/Dockerfile +++ b/8/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 8.16.1 +ENV NODE_VERSION 8.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index 6b921608fb..d69644ec10 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-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 -ENV NODE_VERSION 8.16.1 +ENV NODE_VERSION 8.16.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index 0512c9193f..b937ad84b4 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.16.1 +ENV NODE_VERSION 8.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index 4b04856a3b..b7bbbcc68d 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.16.1-stretch +FROM node:8.16.2-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index f8e2ade32c..62e90ae157 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/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 8.16.1 +ENV NODE_VERSION 8.16.2 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index 3145ff1f15..f1d34d71d9 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.16.1 +ENV NODE_VERSION 8.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.15.2 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ From b1b3f173886f4f4c39952257bab67846ee378836 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 11 Oct 2019 18:31:23 -0400 Subject: [PATCH 297/818] feat: Update to Node 12.12.0 and Yarn 1.19.1 --- 12/alpine/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 642c474b21..36a7c38990 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.11.1 +ENV NODE_VERSION 12.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.19.0 +ENV YARN_VERSION 1.19.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 3cae1d4f10..cc35f565a8 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.11.1 +ENV NODE_VERSION 12.12.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.0 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 056f9c41ba..30702fe2ba 100644 --- a/12/buster/Dockerfile +++ b/12/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.11.1 +ENV NODE_VERSION 12.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.0 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index d54d035bf6..6fdd3796c5 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.11.1 +ENV NODE_VERSION 12.12.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.0 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 2e9e05c13b..e1d56bd3a6 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.11.1 +ENV NODE_VERSION 12.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.0 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ From 1705b4a658363621b28a32ac12fe9e8ec49a0711 Mon Sep 17 00:00:00 2001 From: Ted Stoychev Date: Mon, 14 Oct 2019 17:17:56 +0300 Subject: [PATCH 298/818] Added 'Upgrading/downgrading Yarn' to ToC --- docs/BestPractices.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 5c7c720001..c883b2a0a4 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -4,6 +4,7 @@ - [Environment Variables](#environment-variables) - [Global npm dependencies](#global-npm-dependencies) +- [Upgrading/downgrading Yarn](#upgradingdowngrading-yarn) - [Handling Kernel Signals](#handling-kernel-signals) - [Non-root User](#non-root-user) - [Memory](#memory) From c31a071c73c5cc40dc662b75a4ee9f9fc23d6a39 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 21 Oct 2019 17:54:18 +0800 Subject: [PATCH 299/818] Update node.js v12 from v12.12.0 to v12.13.0 - https://nodejs.org/en/blog/release/v12.13.0/ - https://github.com/nodejs/node/releases/tag/v12.13.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.13.0 --- 12/alpine/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 36a7c38990..947128711d 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.12.0 +ENV NODE_VERSION 12.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index cc35f565a8..94cf6551af 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.12.0 +ENV NODE_VERSION 12.13.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 30702fe2ba..47730761a3 100644 --- a/12/buster/Dockerfile +++ b/12/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.12.0 +ENV NODE_VERSION 12.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 6fdd3796c5..f116a98729 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.12.0 +ENV NODE_VERSION 12.13.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index e1d56bd3a6..bbe171ab61 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.12.0 +ENV NODE_VERSION 12.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b73ba388d11474b09c0fd274150aa48d5bb94ac8 Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Mon, 21 Oct 2019 11:59:19 -0500 Subject: [PATCH 300/818] feat: add Erbium tag to 12.x, reassign lts tag from 10.x to 12.x - https://nodejs.org/en/blog/release/v12.13.0/ --- generate-stackbrew-library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 92f80fa5e0..506c02900a 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,9 +9,9 @@ hash git 2> /dev/null || { echo >&2 "git not found, exiting."; } # shellcheck disable=SC2034 array_8='8 carbon' # shellcheck disable=SC2034 -array_10='10 dubnium lts' +array_10='10 dubnium' # shellcheck disable=SC2034 -array_12='12 current latest' +array_12='12 erbium lts current latest' # shellcheck disable=SC2034 array_chakracore_8='chakracore-8' # shellcheck disable=SC2034 From f6f070194865a528595dca68003eaeda349a652b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 23 Oct 2019 03:14:43 +0800 Subject: [PATCH 301/818] Add node.js v13.0.0 with Yarn v1.19.1 - https://github.com/nodejs/node/releases/tag/v13.0.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.0.0 --- .travis.yml | 35 +++++++++++++ 13/alpine/Dockerfile | 74 ++++++++++++++++++++++++++++ 13/alpine/docker-entrypoint.sh | 8 +++ 13/architectures | 8 +++ 13/buster-slim/Dockerfile | 70 ++++++++++++++++++++++++++ 13/buster-slim/docker-entrypoint.sh | 8 +++ 13/buster/Dockerfile | 67 +++++++++++++++++++++++++ 13/buster/docker-entrypoint.sh | 8 +++ 13/stretch-slim/Dockerfile | 70 ++++++++++++++++++++++++++ 13/stretch-slim/docker-entrypoint.sh | 8 +++ 13/stretch/Dockerfile | 67 +++++++++++++++++++++++++ 13/stretch/docker-entrypoint.sh | 8 +++ generate-stackbrew-library.sh | 4 +- 13 files changed, 434 insertions(+), 1 deletion(-) create mode 100644 13/alpine/Dockerfile create mode 100755 13/alpine/docker-entrypoint.sh create mode 100644 13/architectures create mode 100644 13/buster-slim/Dockerfile create mode 100755 13/buster-slim/docker-entrypoint.sh create mode 100644 13/buster/Dockerfile create mode 100755 13/buster/docker-entrypoint.sh create mode 100644 13/stretch-slim/Dockerfile create mode 100755 13/stretch-slim/docker-entrypoint.sh create mode 100644 13/stretch/Dockerfile create mode 100755 13/stretch/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index cb332283bd..17e4d1e890 100644 --- a/.travis.yml +++ b/.travis.yml @@ -191,6 +191,41 @@ jobs: - NODE_VERSION="12" - VARIANT="buster-slim" + - stage: Build + before_script: *auto_skip + name: 13 on alpine + env: + - NODE_VERSION="13" + - VARIANT="alpine" + + - stage: Build + before_script: *auto_skip + name: 13 on stretch + env: + - NODE_VERSION="13" + - VARIANT="stretch" + + - stage: Build + before_script: *auto_skip + name: 13 on stretch-slim + env: + - NODE_VERSION="13" + - VARIANT="stretch-slim" + + - stage: Build + before_script: *auto_skip + name: 13 on buster + env: + - NODE_VERSION="13" + - VARIANT="buster" + + - stage: Build + before_script: *auto_skip + name: 13 on buster-slim + env: + - NODE_VERSION="13" + - VARIANT="buster-slim" + - stage: Build before_script: *auto_skip name: 8 on jessie diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile new file mode 100644 index 0000000000..51a243fe5b --- /dev/null +++ b/13/alpine/Dockerfile @@ -0,0 +1,74 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 13.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + binutils-gold \ + curl \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + +ENV YARN_VERSION 1.19.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/alpine/docker-entrypoint.sh b/13/alpine/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/13/alpine/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/13/architectures b/13/architectures new file mode 100644 index 0000000000..7adab03f0a --- /dev/null +++ b/13/architectures @@ -0,0 +1,8 @@ +bashbrew-arch variants +amd64 alpine,stretch,stretch-slim,buster,buster-slim +arm32v6 alpine +arm32v7 alpine,stretch,stretch-slim,buster,buster-slim +arm64v8 alpine,stretch,stretch-slim,buster,buster-slim +i386 alpine +ppc64le alpine,stretch,stretch-slim,buster,buster-slim +s390x alpine,stretch,stretch-slim,buster,buster-slim diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile new file mode 100644 index 0000000000..0ce4d38d6c --- /dev/null +++ b/13/buster-slim/Dockerfile @@ -0,0 +1,70 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 13.0.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.19.1 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/buster-slim/docker-entrypoint.sh b/13/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/13/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile new file mode 100644 index 0000000000..9d4ca87d70 --- /dev/null +++ b/13/buster/Dockerfile @@ -0,0 +1,67 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 13.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.19.1 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/buster/docker-entrypoint.sh b/13/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/13/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile new file mode 100644 index 0000000000..ee2c3a0416 --- /dev/null +++ b/13/stretch-slim/Dockerfile @@ -0,0 +1,70 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 13.0.0 + +RUN buildDeps='xz-utils' \ + && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs + +ENV YARN_VERSION 1.19.1 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/stretch-slim/docker-entrypoint.sh b/13/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/13/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile new file mode 100644 index 0000000000..d7928e9190 --- /dev/null +++ b/13/stretch/Dockerfile @@ -0,0 +1,67 @@ +FROM buildpack-deps:stretch + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 13.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && 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.19.1 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/stretch/docker-entrypoint.sh b/13/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/13/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 506c02900a..5dbe1f1235 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,7 +11,9 @@ array_8='8 carbon' # shellcheck disable=SC2034 array_10='10 dubnium' # shellcheck disable=SC2034 -array_12='12 erbium lts current latest' +array_12='12 erbium lts current' +# shellcheck disable=SC2034 +array_13='13 latest' # shellcheck disable=SC2034 array_chakracore_8='chakracore-8' # shellcheck disable=SC2034 From f5875531604b4b3b9fbc36437182781c3655c8ae Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 23 Oct 2019 03:56:15 +0800 Subject: [PATCH 302/818] Update node.js v10 to v10.17.0 with Yarn v1.19.1 - https://nodejs.org/en/blog/release/v10.17.0/ - https://github.com/nodejs/node/releases/tag/v10.17.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.17.0 --- 10/alpine/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 4 ++-- 10/buster/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 20f108c249..1d53cbb2bb 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.16.3 +ENV NODE_VERSION 10.17.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -48,7 +48,7 @@ RUN addgroup -g 1000 node \ && rm -Rf "node-v$NODE_VERSION" \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 4ca7db5d53..941ae09e5f 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.16.3 +ENV NODE_VERSION 10.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index e528a0110f..e6394f5c07 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.16.3 +ENV NODE_VERSION 10.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index a14f35ad54..9a5f591349 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.16.3 +ENV NODE_VERSION 10.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 5261688c1c..85b82632b0 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.16.3 +ENV NODE_VERSION 10.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 0d3946cf9a..abe4b9a5b4 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.16.3 +ENV NODE_VERSION 10.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 40377e20d1..d3d984d9c4 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.16.3 +ENV NODE_VERSION 10.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.17.3 +ENV YARN_VERSION 1.19.1 RUN set -ex \ && for key in \ From 32db77882bb239753b554f35a232289fb0d30b56 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 23 Oct 2019 18:42:48 +0800 Subject: [PATCH 303/818] Update node.js v13 from 13.0.0 to 13.0.1 - https://github.com/nodejs/node/releases/tag/v13.0.1 --- 13/alpine/Dockerfile | 2 +- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index 51a243fe5b..e66bbfd18d 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.0.0 +ENV NODE_VERSION 13.0.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 0ce4d38d6c..f0a6eb782d 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.0.0 +ENV NODE_VERSION 13.0.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 9d4ca87d70..1e3dc74277 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.0.0 +ENV NODE_VERSION 13.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index ee2c3a0416..25db4ddbd6 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.0.0 +ENV NODE_VERSION 13.0.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index d7928e9190..8b0dc47d35 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.0.0 +ENV NODE_VERSION 13.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c728d6a2c0ab51ad9f731a4d9db7c26cb22d698c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 24 Oct 2019 02:47:52 +0800 Subject: [PATCH 304/818] Improve Travis CI deploy/send PR condition Originally it supports only Dockerfile changes, with this adjustment, it'll now send pull request to the downstream for the version and tag array in generate-stackbrew-library.sh file. --- .travis.yml | 11 +++++++++-- travis.yml.template | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17e4d1e890..9c78b6ddd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,8 +99,15 @@ jobs: before_script: - | if ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "Dockerfile$"; then - echo "Skip deployment as none of the Dockerfiles has been changed." - exit + if git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^generate-stackbrew-library.sh$"; then + if ! git diff "$TRAVIS_COMMIT_RANGE" -- generate-stackbrew-library.sh | grep -Eq '^[-+]array_[0-9]'; then + echo "Skip deployment as none of the Dockerfiles and version tag array in generate-stackbrew-library.sh has been changed." + exit + fi + else + echo "Skip deployment as none of the Dockerfiles and generate-stackbrew-library.sh has been changed." + exit + fi fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" diff --git a/travis.yml.template b/travis.yml.template index cf7b414125..d28f814ab1 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -97,8 +97,15 @@ jobs: before_script: - | if ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "Dockerfile$"; then - echo "Skip deployment as none of the Dockerfiles has been changed." - exit + if git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^generate-stackbrew-library.sh$"; then + if ! git diff "$TRAVIS_COMMIT_RANGE" -- generate-stackbrew-library.sh | grep -Eq '^[-+]array_[0-9]'; then + echo "Skip deployment as none of the Dockerfiles and version tag array in generate-stackbrew-library.sh has been changed." + exit + fi + else + echo "Skip deployment as none of the Dockerfiles and generate-stackbrew-library.sh has been changed." + exit + fi fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" From c219332723cbc57ee417541121c7551dfec10f3f Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 24 Apr 2019 12:00:29 -0400 Subject: [PATCH 305/818] Try to download pre-built alpine binary before building --- 10/alpine/Dockerfile | 63 +++++++++++++++++++++++++------------- 12/alpine/Dockerfile | 63 +++++++++++++++++++++++++------------- 13/alpine/Dockerfile | 63 +++++++++++++++++++++++++------------- 8/alpine/Dockerfile | 63 +++++++++++++++++++++++++------------- Dockerfile-alpine.template | 43 +++++++++++++++++++------- 5 files changed, 200 insertions(+), 95 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 1d53cbb2bb..41cd5cc316 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.9 +ARG CHECKSUM= + ENV NODE_VERSION 10.17.0 RUN addgroup -g 1000 node \ @@ -7,8 +9,24 @@ RUN addgroup -g 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ - binutils-gold \ curl \ + && ARCH= && alpineArch="$(arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64';; \ + i386) ARCH='x86';; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ g++ \ gcc \ gnupg \ @@ -16,24 +34,24 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -43,10 +61,13 @@ RUN addgroup -g 1000 node \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ - && apk del .build-deps \ + && apk del .build-deps-full \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps ENV YARN_VERSION 1.19.1 diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 947128711d..9a6856b642 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.9 +ARG CHECKSUM= + ENV NODE_VERSION 12.13.0 RUN addgroup -g 1000 node \ @@ -7,8 +9,24 @@ RUN addgroup -g 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ - binutils-gold \ curl \ + && ARCH= && alpineArch="$(arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64';; \ + i386) ARCH='x86';; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ g++ \ gcc \ gnupg \ @@ -16,24 +34,24 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -43,10 +61,13 @@ RUN addgroup -g 1000 node \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ - && apk del .build-deps \ + && apk del .build-deps-full \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps ENV YARN_VERSION 1.19.1 diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index e66bbfd18d..492f3d3f8b 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.10 +ARG CHECKSUM= + ENV NODE_VERSION 13.0.1 RUN addgroup -g 1000 node \ @@ -7,8 +9,24 @@ RUN addgroup -g 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ - binutils-gold \ curl \ + && ARCH= && alpineArch="$(arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64';; \ + i386) ARCH='x86';; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ g++ \ gcc \ gnupg \ @@ -16,24 +34,24 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -43,10 +61,13 @@ RUN addgroup -g 1000 node \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ - && apk del .build-deps \ + && apk del .build-deps-full \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps ENV YARN_VERSION 1.19.1 diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 23cab3b7d7..340dc359b1 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.9 +ARG CHECKSUM= + ENV NODE_VERSION 8.16.2 RUN addgroup -g 1000 node \ @@ -7,8 +9,24 @@ RUN addgroup -g 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ - binutils-gold \ curl \ + && ARCH= && alpineArch="$(arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64';; \ + i386) ARCH='x86';; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ g++ \ gcc \ gnupg \ @@ -16,24 +34,24 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -43,10 +61,13 @@ RUN addgroup -g 1000 node \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ - && apk del .build-deps \ + && apk del .build-deps-full \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps ENV YARN_VERSION 1.19.1 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 36d281b2be..bd9d994e4e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,5 +1,7 @@ FROM alpine:0.0 +ARG CHECKSUM= + ENV NODE_VERSION 0.0.0 RUN addgroup -g 1000 node \ @@ -7,8 +9,24 @@ RUN addgroup -g 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ - binutils-gold \ curl \ + && ARCH= && alpineArch="$(arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64';; \ + i386) ARCH='x86';; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ g++ \ gcc \ gnupg \ @@ -16,14 +34,14 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - "${NODE_KEYS[@]}" - ; 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 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + "${NODE_KEYS[@]}" + ; 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.tar.xz" \ && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ @@ -33,10 +51,13 @@ RUN addgroup -g 1000 node \ && ./configure \ && make -j$(getconf _NPROCESSORS_ONLN) V= \ && make install \ - && apk del .build-deps \ + && apk del .build-deps-full \ && cd .. \ && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps ENV YARN_VERSION 0.0.0 From 93c5e098567620200e5a374622a86b4aff153506 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 1 Aug 2019 12:10:21 -0400 Subject: [PATCH 306/818] Fetch the checksum for the pre-built alpine binary at image update time. --- 10/alpine/Dockerfile | 8 ++++---- 12/alpine/Dockerfile | 8 ++++---- 13/alpine/Dockerfile | 8 ++++---- 8/alpine/Dockerfile | 8 ++++---- Dockerfile-alpine.template | 8 ++++---- update.sh | 6 ++++++ 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile index 41cd5cc316..123238eada 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine/Dockerfile @@ -1,7 +1,5 @@ FROM alpine:3.9 -ARG CHECKSUM= - ENV NODE_VERSION 10.17.0 RUN addgroup -g 1000 node \ @@ -12,8 +10,10 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= && alpineArch="$(arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64';; \ - i386) ARCH='x86';; \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="f893a03c5b51e0c540e32cd52773221a2f9b6d575e7fe79ffe9e878483c703ff" \ + ;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile index 9a6856b642..ae0bce7e7e 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine/Dockerfile @@ -1,7 +1,5 @@ FROM alpine:3.9 -ARG CHECKSUM= - ENV NODE_VERSION 12.13.0 RUN addgroup -g 1000 node \ @@ -12,8 +10,10 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= && alpineArch="$(arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64';; \ - i386) ARCH='x86';; \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="f1c73636c4d345c4aefd65cc959f793d7bb795200d43e19e418d7811670b03dd" \ + ;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index 492f3d3f8b..a264b07f40 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -1,7 +1,5 @@ FROM alpine:3.10 -ARG CHECKSUM= - ENV NODE_VERSION 13.0.1 RUN addgroup -g 1000 node \ @@ -12,8 +10,10 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= && alpineArch="$(arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64';; \ - i386) ARCH='x86';; \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="5f40392e14e81a566c06f4abcbe735575f2d7045709211eb7245ef8f67896bee" \ + ;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ diff --git a/8/alpine/Dockerfile b/8/alpine/Dockerfile index 340dc359b1..1822ac3765 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine/Dockerfile @@ -1,7 +1,5 @@ FROM alpine:3.9 -ARG CHECKSUM= - ENV NODE_VERSION 8.16.2 RUN addgroup -g 1000 node \ @@ -12,8 +10,10 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= && alpineArch="$(arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64';; \ - i386) ARCH='x86';; \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="39276723f03e4adaa9f2eeded8653ca6b74d3df23ac70a3455a28c51f0cf0001" \ + ;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index bd9d994e4e..b7ea58a675 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,7 +1,5 @@ FROM alpine:0.0 -ARG CHECKSUM= - ENV NODE_VERSION 0.0.0 RUN addgroup -g 1000 node \ @@ -12,8 +10,10 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= && alpineArch="$(arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64';; \ - i386) ARCH='x86';; \ + x86_64) \ + ARCH='x64' \ + CHECKSUM=CHECKSUM_x64 \ + ;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ diff --git a/update.sh b/update.sh index c10f685e0a..6805b96cac 100755 --- a/update.sh +++ b/update.sh @@ -166,8 +166,14 @@ function update_node_version() { if [ "${SKIP}" = true ]; then # Get the currently used Alpine version alpine_version=$(grep "FROM" "${dockerfile}" | cut -d':' -f2) + checksum=$(grep -o "CHECKSUM=\".*\"" "${dockerfile}" | cut -d'=' -f2) + else + checksum="\"$( + curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 + )\"" fi sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" + sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=${checksum}/" "${dockerfile}-tmp" elif is_debian "${variant}"; then sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp" elif is_debian_slim "${variant}"; then From cb7bada56a7f0f11dad558601c65e30dfcf14b1a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 29 Oct 2019 21:14:53 +0800 Subject: [PATCH 307/818] Replace`arch` with `apk --print-arch` in Dockerfile-alpine.template As suggested by @tianon in docker-library/official-images#6871 --- Dockerfile-alpine.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index b7ea58a675..0544c43d46 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -8,7 +8,7 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ From bf40ad9d1c903c9d0d7ad71f0c1d7aea92f2051a Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 6 Nov 2019 09:07:44 +0100 Subject: [PATCH 308/818] Update node.js v13 from 13.0.1 to 13.1.0 --- 13/alpine/Dockerfile | 6 +++--- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/13/alpine/Dockerfile b/13/alpine/Dockerfile index a264b07f40..4c18322f69 100644 --- a/13/alpine/Dockerfile +++ b/13/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.0.1 +ENV NODE_VERSION 13.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -8,11 +8,11 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="5f40392e14e81a566c06f4abcbe735575f2d7045709211eb7245ef8f67896bee" \ + CHECKSUM="57cc9f7282e67c69b2ee986c71a490bc8750d426f04d458d20debde554a19505" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index f0a6eb782d..c0072d1533 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.0.1 +ENV NODE_VERSION 13.1.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 1e3dc74277..51996df86d 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.0.1 +ENV NODE_VERSION 13.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 25db4ddbd6..dedccca95b 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.0.1 +ENV NODE_VERSION 13.1.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 8b0dc47d35..077292d1e1 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.0.1 +ENV NODE_VERSION 13.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c6bc44e84afcdb81d9749b7b034c60e916a519ad Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 9 Oct 2019 11:48:10 -0400 Subject: [PATCH 309/818] Added multiple versions of alpine --- .travis.yml | 64 ++++++++----- 10/alpine3.10/Dockerfile | 95 +++++++++++++++++++ .../docker-entrypoint.sh | 0 10/{alpine => alpine3.9}/Dockerfile | 2 +- .../alpine3.9}/docker-entrypoint.sh | 0 10/architectures | 14 +-- 12/alpine3.10/Dockerfile | 95 +++++++++++++++++++ .../alpine3.10}/docker-entrypoint.sh | 0 12/{alpine => alpine3.9}/Dockerfile | 2 +- .../alpine3.9}/docker-entrypoint.sh | 0 12/architectures | 14 +-- 13/{alpine => alpine3.10}/Dockerfile | 0 13/alpine3.10/docker-entrypoint.sh | 8 ++ 8/alpine3.10/Dockerfile | 95 +++++++++++++++++++ 8/alpine3.10/docker-entrypoint.sh | 8 ++ 8/{alpine => alpine3.9}/Dockerfile | 2 +- 8/alpine3.9/docker-entrypoint.sh | 8 ++ 8/architectures | 14 +-- architectures | 14 +-- functions.sh | 10 ++ generate-stackbrew-library.sh | 9 +- update.sh | 17 ++-- 22 files changed, 402 insertions(+), 69 deletions(-) create mode 100644 10/alpine3.10/Dockerfile rename 10/{alpine => alpine3.10}/docker-entrypoint.sh (100%) rename 10/{alpine => alpine3.9}/Dockerfile (98%) rename {12/alpine => 10/alpine3.9}/docker-entrypoint.sh (100%) create mode 100644 12/alpine3.10/Dockerfile rename {13/alpine => 12/alpine3.10}/docker-entrypoint.sh (100%) rename 12/{alpine => alpine3.9}/Dockerfile (98%) rename {8/alpine => 12/alpine3.9}/docker-entrypoint.sh (100%) rename 13/{alpine => alpine3.10}/Dockerfile (100%) create mode 100755 13/alpine3.10/docker-entrypoint.sh create mode 100644 8/alpine3.10/Dockerfile create mode 100755 8/alpine3.10/docker-entrypoint.sh rename 8/{alpine => alpine3.9}/Dockerfile (98%) create mode 100755 8/alpine3.9/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 9c78b6ddd0..0055174f25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,13 +128,6 @@ jobs: - NODE_VERSION="10" - VARIANT="jessie-slim" - - stage: Build - before_script: *auto_skip - name: 10 on alpine - env: - - NODE_VERSION="10" - - VARIANT="alpine" - - stage: Build before_script: *auto_skip name: 10 on stretch @@ -165,10 +158,17 @@ jobs: - stage: Build before_script: *auto_skip - name: 12 on alpine + name: 10 on alpine3.9 env: - - NODE_VERSION="12" - - VARIANT="alpine" + - NODE_VERSION="10" + - VARIANT="alpine3.9" + + - stage: Build + before_script: *auto_skip + name: 10 on alpine3.10 + env: + - NODE_VERSION="10" + - VARIANT="alpine3.10" - stage: Build before_script: *auto_skip @@ -200,10 +200,17 @@ jobs: - stage: Build before_script: *auto_skip - name: 13 on alpine + name: 12 on alpine3.9 env: - - NODE_VERSION="13" - - VARIANT="alpine" + - NODE_VERSION="12" + - VARIANT="alpine3.9" + + - stage: Build + before_script: *auto_skip + name: 12 on alpine3.10 + env: + - NODE_VERSION="12" + - VARIANT="alpine3.10" - stage: Build before_script: *auto_skip @@ -233,6 +240,13 @@ jobs: - NODE_VERSION="13" - VARIANT="buster-slim" + - stage: Build + before_script: *auto_skip + name: 13 on alpine3.10 + env: + - NODE_VERSION="13" + - VARIANT="alpine3.10" + - stage: Build before_script: *auto_skip name: 8 on jessie @@ -249,45 +263,45 @@ jobs: - stage: Build before_script: *auto_skip - name: 8 on alpine + name: 8 on stretch env: - NODE_VERSION="8" - - VARIANT="alpine" + - VARIANT="stretch" - stage: Build before_script: *auto_skip - name: 8 on onbuild + name: 8 on stretch-slim env: - NODE_VERSION="8" - - VARIANT="onbuild" + - VARIANT="stretch-slim" - stage: Build before_script: *auto_skip - name: 8 on stretch + name: 8 on buster env: - NODE_VERSION="8" - - VARIANT="stretch" + - VARIANT="buster" - stage: Build before_script: *auto_skip - name: 8 on stretch-slim + name: 8 on buster-slim env: - NODE_VERSION="8" - - VARIANT="stretch-slim" + - VARIANT="buster-slim" - stage: Build before_script: *auto_skip - name: 8 on buster + name: 8 on alpine3.9 env: - NODE_VERSION="8" - - VARIANT="buster" + - VARIANT="alpine3.9" - stage: Build before_script: *auto_skip - name: 8 on buster-slim + name: 8 on alpine3.10 env: - NODE_VERSION="8" - - VARIANT="buster-slim" + - VARIANT="alpine3.10" - stage: Build before_script: *auto_skip diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile new file mode 100644 index 0000000000..4e088fcd0a --- /dev/null +++ b/10/alpine3.10/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 10.17.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="f893a03c5b51e0c540e32cd52773221a2f9b6d575e7fe79ffe9e878483c703ff" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.19.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/10/alpine/docker-entrypoint.sh b/10/alpine3.10/docker-entrypoint.sh similarity index 100% rename from 10/alpine/docker-entrypoint.sh rename to 10/alpine3.10/docker-entrypoint.sh diff --git a/10/alpine/Dockerfile b/10/alpine3.9/Dockerfile similarity index 98% rename from 10/alpine/Dockerfile rename to 10/alpine3.9/Dockerfile index 123238eada..7bfe8d211d 100644 --- a/10/alpine/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -8,7 +8,7 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ diff --git a/12/alpine/docker-entrypoint.sh b/10/alpine3.9/docker-entrypoint.sh similarity index 100% rename from 12/alpine/docker-entrypoint.sh rename to 10/alpine3.9/docker-entrypoint.sh diff --git a/10/architectures b/10/architectures index 5f77c7cf17..162fbcbf1d 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,stretch,stretch-slim,buster,buster-slim -arm32v6 alpine -arm32v7 jessie,jessie-slim,alpine,stretch,stretch-slim,buster,buster-slim -arm64v8 alpine,stretch,stretch-slim,buster,buster-slim -i386 alpine -ppc64le alpine,stretch,stretch-slim,buster,buster-slim -s390x alpine,stretch,stretch-slim,buster,buster-slim +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v6 alpine3.9,alpine3.10 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +i386 alpine3.9,alpine3.10 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile new file mode 100644 index 0000000000..a23bb5b9fd --- /dev/null +++ b/12/alpine3.10/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 12.13.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="f1c73636c4d345c4aefd65cc959f793d7bb795200d43e19e418d7811670b03dd" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.19.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/alpine/docker-entrypoint.sh b/12/alpine3.10/docker-entrypoint.sh similarity index 100% rename from 13/alpine/docker-entrypoint.sh rename to 12/alpine3.10/docker-entrypoint.sh diff --git a/12/alpine/Dockerfile b/12/alpine3.9/Dockerfile similarity index 98% rename from 12/alpine/Dockerfile rename to 12/alpine3.9/Dockerfile index ae0bce7e7e..90d90b65ce 100644 --- a/12/alpine/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -8,7 +8,7 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ diff --git a/8/alpine/docker-entrypoint.sh b/12/alpine3.9/docker-entrypoint.sh similarity index 100% rename from 8/alpine/docker-entrypoint.sh rename to 12/alpine3.9/docker-entrypoint.sh diff --git a/12/architectures b/12/architectures index 7adab03f0a..0185a0fd8a 100644 --- a/12/architectures +++ b/12/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine,stretch,stretch-slim,buster,buster-slim -arm32v6 alpine -arm32v7 alpine,stretch,stretch-slim,buster,buster-slim -arm64v8 alpine,stretch,stretch-slim,buster,buster-slim -i386 alpine -ppc64le alpine,stretch,stretch-slim,buster,buster-slim -s390x alpine,stretch,stretch-slim,buster,buster-slim +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v6 alpine3.9,alpine3.10 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +i386 alpine3.9,alpine3.10 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 diff --git a/13/alpine/Dockerfile b/13/alpine3.10/Dockerfile similarity index 100% rename from 13/alpine/Dockerfile rename to 13/alpine3.10/Dockerfile diff --git a/13/alpine3.10/docker-entrypoint.sh b/13/alpine3.10/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/13/alpine3.10/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/alpine3.10/Dockerfile b/8/alpine3.10/Dockerfile new file mode 100644 index 0000000000..b0b7637f17 --- /dev/null +++ b/8/alpine3.10/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 8.16.2 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="39276723f03e4adaa9f2eeded8653ca6b74d3df23ac70a3455a28c51f0cf0001" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.19.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/8/alpine3.10/docker-entrypoint.sh b/8/alpine3.10/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/alpine3.10/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/alpine/Dockerfile b/8/alpine3.9/Dockerfile similarity index 98% rename from 8/alpine/Dockerfile rename to 8/alpine3.9/Dockerfile index 1822ac3765..f9ecccddab 100644 --- a/8/alpine/Dockerfile +++ b/8/alpine3.9/Dockerfile @@ -8,7 +8,7 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(arch)" \ + && ARCH= && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ diff --git a/8/alpine3.9/docker-entrypoint.sh b/8/alpine3.9/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/alpine3.9/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/architectures b/8/architectures index 11c069bf71..39a08d86e8 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm32v6 alpine -arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm64v8 alpine,onbuild,stretch,stretch-slim,buster,buster-slim -i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -ppc64le alpine,onbuild,stretch,stretch-slim,buster,buster-slim -s390x alpine,onbuild,stretch,stretch-slim,buster,buster-slim +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +arm32v6 alpine3.9,alpine3.10 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +i386 jessie,jessie-slim,alpine,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild diff --git a/architectures b/architectures index 64b416475d..565bbb7c25 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm32v6 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm32v7 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -arm64v8 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -i386 jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -ppc64le jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim -s390x jessie,jessie-slim,alpine,onbuild,stretch,stretch-slim,buster,buster-slim +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 diff --git a/functions.sh b/functions.sh index 203b08a0e8..5f37f3522c 100755 --- a/functions.sh +++ b/functions.sh @@ -169,6 +169,16 @@ function get_versions() { fi } +function is_alpine() { + local variant + variant=${1} + shift + + if [ "${variant}" = "${variant#alpine}" ]; then + return 1 + fi +} + function is_debian() { local variant variant=$1 diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5dbe1f1235..a29e6e8030 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -21,6 +21,8 @@ array_chakracore_10='chakracore-10 chakracore' default_variant=$(get_config "./" "default_variant") +default_alpine=$(get_config "./" "alpine_version") + cd "$(cd "${0%/*}" && pwd -P)" self="$(basename "${BASH_SOURCE[0]}")" @@ -93,11 +95,12 @@ for version in "${versions[@]}"; do variantAliases=("${versionAliases[@]/%/-${variant//${slash}/-}}") if [ "${variant}" = "${default_variant}-slim" ]; then variantAliases+=("${versionAliases[@]/%/-slim}") - fi - variantAliases=("${variantAliases[@]//latest-/}") - if [ "${variant}" = "${default_variant}" ]; then + elif [ "${variant}" = "alpine${default_alpine}" ]; then + variantAliases+=("${versionAliases[@]/%/-alpine}") + elif [ "${variant}" = "${default_variant}" ]; then variantAliases+=("${versionAliases[@]}") fi + variantAliases=("${variantAliases[@]//latest-/}") # Get supported architectures for a specific version and variant. # See details in function.sh diff --git a/update.sh b/update.sh index 6805b96cac..8fd0b863af 100755 --- a/update.sh +++ b/update.sh @@ -162,16 +162,11 @@ function update_node_version() { sed -Ei -e "/${pattern}/d" "${dockerfile}-tmp" done - if [ "${variant}" = "alpine" ]; then - if [ "${SKIP}" = true ]; then - # Get the currently used Alpine version - alpine_version=$(grep "FROM" "${dockerfile}" | cut -d':' -f2) - checksum=$(grep -o "CHECKSUM=\".*\"" "${dockerfile}" | cut -d'=' -f2) - else - checksum="\"$( - curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 - )\"" - fi + if is_alpine "${variant}"; then + alpine_version="${variant#*alpine}" + checksum="\"$( + curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 + )\"" sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=${checksum}/" "${dockerfile}-tmp" elif is_debian "${variant}"; then @@ -249,6 +244,8 @@ for version in "${versions[@]}"; do template_file="${parentpath}/Dockerfile-debian.template" elif is_debian_slim "${variant}"; then template_file="${parentpath}/Dockerfile-slim.template" + elif is_alpine "${variant}"; then + template_file="${parentpath}/Dockerfile-alpine.template" fi [ "$variant" != "onbuild" ] && cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh" From eef257fe98a8be075138451883f4d54e13ad8600 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 14 Nov 2019 13:21:25 -0800 Subject: [PATCH 310/818] Fix architectures lists for consistency and correctness --- .travis.yml | 7 +++++++ 13/architectures | 14 +++++++------- 8/architectures | 2 +- architectures | 14 +++++++------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0055174f25..23ffcb0a57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -303,6 +303,13 @@ jobs: - NODE_VERSION="8" - VARIANT="alpine3.10" + - stage: Build + before_script: *auto_skip + name: 8 on onbuild + env: + - NODE_VERSION="8" + - VARIANT="onbuild" + - stage: Build before_script: *auto_skip name: chakracore/10 on default diff --git a/13/architectures b/13/architectures index 7adab03f0a..651a374f44 100644 --- a/13/architectures +++ b/13/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine,stretch,stretch-slim,buster,buster-slim -arm32v6 alpine -arm32v7 alpine,stretch,stretch-slim,buster,buster-slim -arm64v8 alpine,stretch,stretch-slim,buster,buster-slim -i386 alpine -ppc64le alpine,stretch,stretch-slim,buster,buster-slim -s390x alpine,stretch,stretch-slim,buster,buster-slim +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10 +arm32v6 alpine3.10 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10 +i386 alpine3.10 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.10 diff --git a/8/architectures b/8/architectures index 39a08d86e8..70ea076612 100644 --- a/8/architectures +++ b/8/architectures @@ -3,6 +3,6 @@ amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,al arm32v6 alpine3.9,alpine3.10 arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -i386 jessie,jessie-slim,alpine,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild diff --git a/architectures b/architectures index 565bbb7c25..a7204e0c21 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild From 4f0801abe90e1a0c608d5c7c899e5b531f8131f0 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 14 Nov 2019 22:15:09 -0500 Subject: [PATCH 311/818] chore: pointer to official images process docs --- generate-stackbrew-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index b01c905603..c393b8d680 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -100,7 +100,7 @@ function comment_payload() { local pr_url pr_url="${1}" echo "{ - \"body\": \"Created PR to the ${REPO_NAME} repo (${pr_url})\" + \"body\": \"Created PR to the ${REPO_NAME} repo (${pr_url}). See https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what if you are wondering when it will be available on the Docker Hub.\" }" } From 7d4ac184980c573730de124b34ef2e4d3eaf2835 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 30 Oct 2019 18:07:31 -0400 Subject: [PATCH 312/818] chore: Add initial SECURITY.md --- SECURITY.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000000..f6cb6240c3 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,12 @@ +# Security Policy + +## Reporting a Vulnerability + +Security issues relating to Node.js project should follow the process documented on . + +CVEs for the base image packages should be reported to those repositories. Nothing to address those CVEs is in the hands of this repos. + +- [Alpine](https://github.com/alpinelinux/docker-alpine) +- [Debian (buster, jessie, stretch)](https://github.com/debuerreotype/docker-debian-artifacts) + +When base images are patched, the images are rebuilt and rolled out to the Docker hub without intervention by this repo. This process is explained in . From 4f49f67ebd8d577dd7c97dabf5df69e6d947406c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 20 Nov 2019 01:32:07 +0800 Subject: [PATCH 313/818] Update node.js v12 from v12.13.0 to v12.13.1 - https://nodejs.org/en/blog/release/v12.13.1/ - https://github.com/nodejs/node/releases/tag/v12.13.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.13.1 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index a23bb5b9fd..75e83d9b8b 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.13.0 +ENV NODE_VERSION 12.13.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="f1c73636c4d345c4aefd65cc959f793d7bb795200d43e19e418d7811670b03dd" \ + CHECKSUM="cf493d306a6367fb7bcff5608731e1dd44b9ad8d64e7df7706916d8be0f497a1" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 90d90b65ce..c7bc59a902 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.13.0 +ENV NODE_VERSION 12.13.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="f1c73636c4d345c4aefd65cc959f793d7bb795200d43e19e418d7811670b03dd" \ + CHECKSUM="cf493d306a6367fb7bcff5608731e1dd44b9ad8d64e7df7706916d8be0f497a1" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 94cf6551af..e56a766696 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.13.0 +ENV NODE_VERSION 12.13.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 47730761a3..dde1b321fb 100644 --- a/12/buster/Dockerfile +++ b/12/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.13.0 +ENV NODE_VERSION 12.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index f116a98729..bc01c2fa23 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.13.0 +ENV NODE_VERSION 12.13.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index bbe171ab61..ef795eb2b5 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.13.0 +ENV NODE_VERSION 12.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From caad438f17000bdfe543a4466390a6e79d1dee93 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 22 Nov 2019 21:11:37 +0800 Subject: [PATCH 314/818] Update node.js v13 from v13.1.0 to v13.2.0 - https://nodejs.org/en/blog/release/v13.2.0/ - https://github.com/nodejs/node/releases/tag/v13.2.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.2.0 --- 13/alpine3.10/Dockerfile | 4 ++-- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 4c18322f69..0ccc443bc0 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.1.0 +ENV NODE_VERSION 13.2.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="57cc9f7282e67c69b2ee986c71a490bc8750d426f04d458d20debde554a19505" \ + CHECKSUM="38e6af00cb12b6fa55f204aab597ae7029b1d60a182e01b28836494caa662b8e" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index c0072d1533..246f1d3d73 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.1.0 +ENV NODE_VERSION 13.2.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 51996df86d..49c795e05f 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.1.0 +ENV NODE_VERSION 13.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index dedccca95b..de2fcc8320 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.1.0 +ENV NODE_VERSION 13.2.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 077292d1e1..183c2ba53d 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.1.0 +ENV NODE_VERSION 13.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b93f9ebdcf9047a114fec6c837306a788abdffd8 Mon Sep 17 00:00:00 2001 From: Tommi Vainikainen Date: Wed, 17 Jul 2019 21:59:56 +0300 Subject: [PATCH 315/818] Fix update.sh example with slim Invoking update.sh with `slim` variant did not work, because slim variants are always tied to Debian version (e.g. stretch, buster). --- update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/update.sh b/update.sh index 8fd0b863af..50208628b3 100755 --- a/update.sh +++ b/update.sh @@ -10,14 +10,14 @@ function usage() { $0 [-s] [MAJOR_VERSION(S)] [VARIANT(S)] Examples: - - update.sh # Update all images - - update.sh -s # Update all images, skip updating Alpine and Yarn - - update.sh 8,10 # Update version 8 and 10 and variants (default, slim, alpine etc.) - - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn - - update.sh 8 slim,stretch # Update only slim and stretch variants for version 8 - - update.sh -s 8 slim,stretch # Update only slim and stretch variants for version 8, skip updating Alpine and Yarn - - update.sh . alpine # Update the alpine variant for all versions - - update.sh -t # Update .travis.yml only + - update.sh # Update all images + - update.sh -s # Update all images, skip updating Alpine and Yarn + - update.sh 8,10 # Update all variants of version 8 and 10 + - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn + - update.sh 8 buster-slim,buster # Update only buster's slim and buster variants for version 8 + - update.sh -s 8 stretch # Update only stretch variant for version 8, skip updating Alpine and Yarn + - update.sh . alpine # Update the alpine variant for all versions + - update.sh -t # Update .travis.yml only OPTIONS: -s Security update; skip updating the yarn and alpine versions. From 6c3fa2f322cbff89885a849a7dfe69972ce97a30 Mon Sep 17 00:00:00 2001 From: Tommi Vainikainen Date: Wed, 17 Jul 2019 18:18:29 +0300 Subject: [PATCH 316/818] Fix update.sh invocation with unknown variant If update.sh was invoked with non-existing variant, it updated all variants. Change in_variants_to_update to return true always if second variant argument was not given, but not when given variant argument does not match to available variants. --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 8fd0b863af..c040d03ccd 100755 --- a/update.sh +++ b/update.sh @@ -97,7 +97,7 @@ function in_variants_to_update() { local variant=$1 if [ "${#update_variants[@]}" -eq 0 ]; then - echo 0 + echo 1 return fi From cbdde22f468f5032a59d52330894544a0756f0fb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 6 Dec 2019 00:01:04 +0800 Subject: [PATCH 317/818] Update node.js v13 to v13.3.0 with Yarn v1.19.2 - https://nodejs.org/en/blog/release/v13.3.0/ - https://github.com/nodejs/node/releases/tag/v13.3.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.3.0 --- 13/alpine3.10/Dockerfile | 6 +++--- 13/buster-slim/Dockerfile | 4 ++-- 13/buster/Dockerfile | 4 ++-- 13/stretch-slim/Dockerfile | 4 ++-- 13/stretch/Dockerfile | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 0ccc443bc0..2cba750ab9 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.2.0 +ENV NODE_VERSION 13.3.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="38e6af00cb12b6fa55f204aab597ae7029b1d60a182e01b28836494caa662b8e" \ + CHECKSUM="489fd8ab8dd72780475fbee80ae7f3053081c75d6d36bf71ba61b97f5befcf3c" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.19.2 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 246f1d3d73..d851bb8d0e 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.2.0 +ENV NODE_VERSION 13.3.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.19.2 RUN set -ex \ && for key in \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 49c795e05f..61822f8618 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.2.0 +ENV NODE_VERSION 13.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.19.2 RUN set -ex \ && for key in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index de2fcc8320..b00804cbd2 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.2.0 +ENV NODE_VERSION 13.3.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.19.2 RUN set -ex \ && for key in \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 183c2ba53d..ebff9d62f8 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.2.0 +ENV NODE_VERSION 13.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.19.2 RUN set -ex \ && for key in \ From 3c10e908934690b6af4f8f83b7e5e1da49926b34 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Tue, 17 Dec 2019 15:52:32 -0800 Subject: [PATCH 318/818] Update Node.js 8, 10, 12, 13 for 2019-12 security For < 13, npm and yarn is being updated to address vulnerabilities. For 13, its the normal release contents, including the npm and yarn update. --- 10/alpine3.10/Dockerfile | 6 +++--- 10/alpine3.9/Dockerfile | 6 +++--- 10/buster-slim/Dockerfile | 4 ++-- 10/buster/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 12/alpine3.10/Dockerfile | 6 +++--- 12/alpine3.9/Dockerfile | 6 +++--- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 13/alpine3.10/Dockerfile | 6 +++--- 13/buster-slim/Dockerfile | 4 ++-- 13/buster/Dockerfile | 4 ++-- 13/stretch-slim/Dockerfile | 4 ++-- 13/stretch/Dockerfile | 4 ++-- 8/alpine3.10/Dockerfile | 6 +++--- 8/alpine3.9/Dockerfile | 6 +++--- 8/buster-slim/Dockerfile | 4 ++-- 8/buster/Dockerfile | 4 ++-- 8/jessie-slim/Dockerfile | 4 ++-- 8/jessie/Dockerfile | 4 ++-- 8/onbuild/Dockerfile | 2 +- 8/stretch-slim/Dockerfile | 4 ++-- 8/stretch/Dockerfile | 4 ++-- chakracore/10/Dockerfile | 2 +- chakracore/8/Dockerfile | 2 +- 30 files changed, 64 insertions(+), 64 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 4e088fcd0a..97f476cb62 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.17.0 +ENV NODE_VERSION 10.18.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="f893a03c5b51e0c540e32cd52773221a2f9b6d575e7fe79ffe9e878483c703ff" \ + CHECKSUM="043f9e1c412a391f42a9667373b851590a9a77c08cf6fde6828a3cdb3fb8f316" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index 7bfe8d211d..f63d4b200b 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.17.0 +ENV NODE_VERSION 10.18.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="f893a03c5b51e0c540e32cd52773221a2f9b6d575e7fe79ffe9e878483c703ff" \ + CHECKSUM="043f9e1c412a391f42a9667373b851590a9a77c08cf6fde6828a3cdb3fb8f316" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 941ae09e5f..7554d1de28 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.17.0 +ENV NODE_VERSION 10.18.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index e6394f5c07..6d1720f1c4 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.17.0 +ENV NODE_VERSION 10.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 9a5f591349..0bc914b97e 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.17.0 +ENV NODE_VERSION 10.18.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 85b82632b0..37b00f157e 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.17.0 +ENV NODE_VERSION 10.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index abe4b9a5b4..92c6a75669 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.17.0 +ENV NODE_VERSION 10.18.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index d3d984d9c4..c170ae14fd 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.17.0 +ENV NODE_VERSION 10.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 75e83d9b8b..21d8dc64b0 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.13.1 +ENV NODE_VERSION 12.14.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="cf493d306a6367fb7bcff5608731e1dd44b9ad8d64e7df7706916d8be0f497a1" \ + CHECKSUM="51960d8e0b80228611a8cb411c09ca07148d299039de9c9dd32481d9ff977c55" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index c7bc59a902..89becaebc2 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.13.1 +ENV NODE_VERSION 12.14.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="cf493d306a6367fb7bcff5608731e1dd44b9ad8d64e7df7706916d8be0f497a1" \ + CHECKSUM="51960d8e0b80228611a8cb411c09ca07148d299039de9c9dd32481d9ff977c55" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index e56a766696..823c4eca91 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.13.1 +ENV NODE_VERSION 12.14.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index dde1b321fb..a971549dc0 100644 --- a/12/buster/Dockerfile +++ b/12/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.13.1 +ENV NODE_VERSION 12.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index bc01c2fa23..19c1d2878f 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.13.1 +ENV NODE_VERSION 12.14.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index ef795eb2b5..90a15d213f 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.13.1 +ENV NODE_VERSION 12.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 2cba750ab9..7adbfd6606 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.3.0 +ENV NODE_VERSION 13.4.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="489fd8ab8dd72780475fbee80ae7f3053081c75d6d36bf71ba61b97f5befcf3c" \ + CHECKSUM="6c4fe31113f92e2c26664f31fbbb3b800b2f6c4548137b5c92988c68ee5328c3" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.2 +ENV YARN_VERSION 1.21.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index d851bb8d0e..0aec07a043 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.3.0 +ENV NODE_VERSION 13.4.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.2 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 61822f8618..8aa3bffa6c 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.3.0 +ENV NODE_VERSION 13.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.2 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index b00804cbd2..c782a643ba 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.3.0 +ENV NODE_VERSION 13.4.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.2 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index ebff9d62f8..69fa238178 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.3.0 +ENV NODE_VERSION 13.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.2 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/8/alpine3.10/Dockerfile b/8/alpine3.10/Dockerfile index b0b7637f17..76641ea136 100644 --- a/8/alpine3.10/Dockerfile +++ b/8/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 8.16.2 +ENV NODE_VERSION 8.17.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="39276723f03e4adaa9f2eeded8653ca6b74d3df23ac70a3455a28c51f0cf0001" \ + CHECKSUM="bd085bf3bf9d442500f78943e7f04631c7eaa888a3bf42c1f40bea74c3d1d6f8" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/alpine3.9/Dockerfile b/8/alpine3.9/Dockerfile index f9ecccddab..3f9f47969b 100644 --- a/8/alpine3.9/Dockerfile +++ b/8/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 8.16.2 +ENV NODE_VERSION 8.17.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="39276723f03e4adaa9f2eeded8653ca6b74d3df23ac70a3455a28c51f0cf0001" \ + CHECKSUM="bd085bf3bf9d442500f78943e7f04631c7eaa888a3bf42c1f40bea74c3d1d6f8" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/8/buster-slim/Dockerfile b/8/buster-slim/Dockerfile index a5b235a857..0dfb7cab63 100644 --- a/8/buster-slim/Dockerfile +++ b/8/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 8.16.2 +ENV NODE_VERSION 8.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/8/buster/Dockerfile b/8/buster/Dockerfile index 4515d7c6aa..a791b99a48 100644 --- a/8/buster/Dockerfile +++ b/8/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 8.16.2 +ENV NODE_VERSION 8.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile index d69644ec10..709b0890e6 100644 --- a/8/jessie-slim/Dockerfile +++ b/8/jessie-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 -ENV NODE_VERSION 8.16.2 +ENV NODE_VERSION 8.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile index b937ad84b4..aea498cca6 100644 --- a/8/jessie/Dockerfile +++ b/8/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 -ENV NODE_VERSION 8.16.2 +ENV NODE_VERSION 8.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile index b7bbbcc68d..bc724cdf51 100644 --- a/8/onbuild/Dockerfile +++ b/8/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8.16.2-stretch +FROM node:8.17.0-stretch RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile index 62e90ae157..31a5561af3 100644 --- a/8/stretch-slim/Dockerfile +++ b/8/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 8.16.2 +ENV NODE_VERSION 8.17.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ @@ -45,7 +45,7 @@ RUN buildDeps='xz-utils' \ && apt-get purge -y --auto-remove $buildDeps \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile index f1d34d71d9..e3b63f0faf 100644 --- a/8/stretch/Dockerfile +++ b/8/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 8.16.2 +ENV NODE_VERSION 8.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.19.1 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index 52a24d4d5d..28134c1950 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/Dockerfile @@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.12.3 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile index b268beee2f..67ed260507 100644 --- a/chakracore/8/Dockerfile +++ b/chakracore/8/Dockerfile @@ -17,7 +17,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.6.0 +ENV YARN_VERSION 1.21.1 RUN set -ex \ && for key in \ From 31bd89bbd77709b5dae93c31dbd74bf32b7c4867 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 18 Dec 2019 21:57:22 +0100 Subject: [PATCH 319/818] Update node.js v13 to v13.5.0 --- 13/alpine3.10/Dockerfile | 4 ++-- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 7adbfd6606..4516687350 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.4.0 +ENV NODE_VERSION 13.5.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="6c4fe31113f92e2c26664f31fbbb3b800b2f6c4548137b5c92988c68ee5328c3" \ + CHECKSUM="1d476cfc39cd7ebb1bcb40ab5bf9934ef27f6780ff2b47e31db67b15471c560f" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 0aec07a043..d0c4149365 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.4.0 +ENV NODE_VERSION 13.5.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 8aa3bffa6c..472a1e7aa8 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.4.0 +ENV NODE_VERSION 13.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index c782a643ba..07b3195739 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.4.0 +ENV NODE_VERSION 13.5.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 69fa238178..800f5dbd29 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.4.0 +ENV NODE_VERSION 13.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6f32733d774510ee96ffacbdb84d2967419d2b32 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 18 Dec 2019 21:59:19 +0100 Subject: [PATCH 320/818] docs: update contributing to mentions security yarn releases --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0d81fd960e..a98969cad5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ New **Node.js** releases are released as soon as possible. New **NPM** releases are not tracked. We simply use the NPM version bundled in the corresponding Node.js release. -**Yarn** is updated to the latest version only when there is a new Node.js SemVer PATCH release, and it's updated only in the branch with the new release, preferably in the same PR. The `update.sh` script does this automatically when invoked with a specific branch, e.g. `./update.sh 6.10`. +**Yarn** is updated to the latest version only when there is a new Node.js SemVer PATCH release (unless Yarn has received a security update), and it's updated only in the branch with the new release, preferably in the same PR. The `update.sh` script does this automatically when invoked with a specific branch, e.g. `./update.sh 6.10`. ## Adding dependencies to the base images From ab3d54cef9f236ed9792aa4b786215db9ee7c1b6 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 20 Dec 2019 01:50:19 +0800 Subject: [PATCH 321/818] Add image for Alpine Linux v3.11 --- .travis.yml | 28 +++++++++ 10/alpine3.11/Dockerfile | 95 ++++++++++++++++++++++++++++++ 10/alpine3.11/docker-entrypoint.sh | 8 +++ 10/architectures | 14 ++--- 12/alpine3.11/Dockerfile | 95 ++++++++++++++++++++++++++++++ 12/alpine3.11/docker-entrypoint.sh | 8 +++ 12/architectures | 14 ++--- 13/alpine3.11/Dockerfile | 95 ++++++++++++++++++++++++++++++ 13/alpine3.11/docker-entrypoint.sh | 8 +++ 13/architectures | 14 ++--- 8/alpine3.11/Dockerfile | 95 ++++++++++++++++++++++++++++++ 8/alpine3.11/docker-entrypoint.sh | 8 +++ 8/architectures | 14 ++--- architectures | 14 ++--- config | 2 +- 15 files changed, 476 insertions(+), 36 deletions(-) create mode 100644 10/alpine3.11/Dockerfile create mode 100755 10/alpine3.11/docker-entrypoint.sh create mode 100644 12/alpine3.11/Dockerfile create mode 100755 12/alpine3.11/docker-entrypoint.sh create mode 100644 13/alpine3.11/Dockerfile create mode 100755 13/alpine3.11/docker-entrypoint.sh create mode 100644 8/alpine3.11/Dockerfile create mode 100755 8/alpine3.11/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 23ffcb0a57..61972836bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -170,6 +170,13 @@ jobs: - NODE_VERSION="10" - VARIANT="alpine3.10" + - stage: Build + before_script: *auto_skip + name: 10 on alpine3.11 + env: + - NODE_VERSION="10" + - VARIANT="alpine3.11" + - stage: Build before_script: *auto_skip name: 12 on stretch @@ -212,6 +219,13 @@ jobs: - NODE_VERSION="12" - VARIANT="alpine3.10" + - stage: Build + before_script: *auto_skip + name: 12 on alpine3.11 + env: + - NODE_VERSION="12" + - VARIANT="alpine3.11" + - stage: Build before_script: *auto_skip name: 13 on stretch @@ -247,6 +261,13 @@ jobs: - NODE_VERSION="13" - VARIANT="alpine3.10" + - stage: Build + before_script: *auto_skip + name: 13 on alpine3.11 + env: + - NODE_VERSION="13" + - VARIANT="alpine3.11" + - stage: Build before_script: *auto_skip name: 8 on jessie @@ -303,6 +324,13 @@ jobs: - NODE_VERSION="8" - VARIANT="alpine3.10" + - stage: Build + before_script: *auto_skip + name: 8 on alpine3.11 + env: + - NODE_VERSION="8" + - VARIANT="alpine3.11" + - stage: Build before_script: *auto_skip name: 8 on onbuild diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile new file mode 100644 index 0000000000..16a2d8d7de --- /dev/null +++ b/10/alpine3.11/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.11 + +ENV NODE_VERSION 10.18.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="043f9e1c412a391f42a9667373b851590a9a77c08cf6fde6828a3cdb3fb8f316" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.21.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/10/alpine3.11/docker-entrypoint.sh b/10/alpine3.11/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/10/alpine3.11/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/10/architectures b/10/architectures index 162fbcbf1d..4af7322479 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -arm32v6 alpine3.9,alpine3.10 -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -i386 alpine3.9,alpine3.10 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm32v6 alpine3.9,alpine3.10,alpine3.11 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +i386 alpine3.9,alpine3.10,alpine3.11 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile new file mode 100644 index 0000000000..ad03ea8d2f --- /dev/null +++ b/12/alpine3.11/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.11 + +ENV NODE_VERSION 12.14.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="51960d8e0b80228611a8cb411c09ca07148d299039de9c9dd32481d9ff977c55" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.21.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/alpine3.11/docker-entrypoint.sh b/12/alpine3.11/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/alpine3.11/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/architectures b/12/architectures index 0185a0fd8a..5dfbc16e32 100644 --- a/12/architectures +++ b/12/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -arm32v6 alpine3.9,alpine3.10 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -i386 alpine3.9,alpine3.10 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10 +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm32v6 alpine3.9,alpine3.10,alpine3.11 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +i386 alpine3.9,alpine3.10,alpine3.11 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile new file mode 100644 index 0000000000..eb1acc3192 --- /dev/null +++ b/13/alpine3.11/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.11 + +ENV NODE_VERSION 13.5.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="1d476cfc39cd7ebb1bcb40ab5bf9934ef27f6780ff2b47e31db67b15471c560f" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.21.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/13/alpine3.11/docker-entrypoint.sh b/13/alpine3.11/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/13/alpine3.11/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/13/architectures b/13/architectures index 651a374f44..e7d6c981d1 100644 --- a/13/architectures +++ b/13/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10 -arm32v6 alpine3.10 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10 -i386 alpine3.10 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.10 +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +arm32v6 alpine3.10,alpine3.11 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +i386 alpine3.10,alpine3.11 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 diff --git a/8/alpine3.11/Dockerfile b/8/alpine3.11/Dockerfile new file mode 100644 index 0000000000..3133b73336 --- /dev/null +++ b/8/alpine3.11/Dockerfile @@ -0,0 +1,95 @@ +FROM alpine:3.11 + +ENV NODE_VERSION 8.17.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="bd085bf3bf9d442500f78943e7f04631c7eaa888a3bf42c1f40bea74c3d1d6f8" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps + +ENV YARN_VERSION 1.21.1 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/8/alpine3.11/docker-entrypoint.sh b/8/alpine3.11/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/8/alpine3.11/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/8/architectures b/8/architectures index 70ea076612..807dfc6fd6 100644 --- a/8/architectures +++ b/8/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -arm32v6 alpine3.9,alpine3.10 -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +arm32v6 alpine3.9,alpine3.10,alpine3.11 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild diff --git a/architectures b/architectures index a7204e0c21..974cd70263 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild -s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,onbuild +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild diff --git a/config b/config index ac07135eb7..bd652eee00 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch -alpine_version 3.10 +alpine_version 3.11 debian_versions jessie stretch buster From c06bc079b0676060ace0538e6e10aa38fdc77917 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 31 Dec 2019 19:01:09 -0500 Subject: [PATCH 322/818] chore: Remove Node 8 --- .travis.yml | 70 --------------------- 8/alpine3.10/Dockerfile | 95 ----------------------------- 8/alpine3.10/docker-entrypoint.sh | 8 --- 8/alpine3.11/Dockerfile | 95 ----------------------------- 8/alpine3.11/docker-entrypoint.sh | 8 --- 8/alpine3.9/Dockerfile | 95 ----------------------------- 8/alpine3.9/docker-entrypoint.sh | 8 --- 8/architectures | 8 --- 8/buster-slim/Dockerfile | 70 --------------------- 8/buster-slim/docker-entrypoint.sh | 8 --- 8/buster/Dockerfile | 67 -------------------- 8/buster/docker-entrypoint.sh | 8 --- 8/jessie-slim/Dockerfile | 70 --------------------- 8/jessie-slim/docker-entrypoint.sh | 8 --- 8/jessie/Dockerfile | 67 -------------------- 8/jessie/docker-entrypoint.sh | 8 --- 8/onbuild/Dockerfile | 12 ---- 8/stretch-slim/Dockerfile | 70 --------------------- 8/stretch-slim/docker-entrypoint.sh | 8 --- 8/stretch/Dockerfile | 67 -------------------- 8/stretch/docker-entrypoint.sh | 8 --- generate-stackbrew-library.sh | 2 - 22 files changed, 860 deletions(-) delete mode 100644 8/alpine3.10/Dockerfile delete mode 100755 8/alpine3.10/docker-entrypoint.sh delete mode 100644 8/alpine3.11/Dockerfile delete mode 100755 8/alpine3.11/docker-entrypoint.sh delete mode 100644 8/alpine3.9/Dockerfile delete mode 100755 8/alpine3.9/docker-entrypoint.sh delete mode 100644 8/architectures delete mode 100644 8/buster-slim/Dockerfile delete mode 100755 8/buster-slim/docker-entrypoint.sh delete mode 100644 8/buster/Dockerfile delete mode 100755 8/buster/docker-entrypoint.sh delete mode 100644 8/jessie-slim/Dockerfile delete mode 100755 8/jessie-slim/docker-entrypoint.sh delete mode 100644 8/jessie/Dockerfile delete mode 100755 8/jessie/docker-entrypoint.sh delete mode 100644 8/onbuild/Dockerfile delete mode 100644 8/stretch-slim/Dockerfile delete mode 100755 8/stretch-slim/docker-entrypoint.sh delete mode 100644 8/stretch/Dockerfile delete mode 100755 8/stretch/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 61972836bc..d80ba7b65a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -268,76 +268,6 @@ jobs: - NODE_VERSION="13" - VARIANT="alpine3.11" - - stage: Build - before_script: *auto_skip - name: 8 on jessie - env: - - NODE_VERSION="8" - - VARIANT="jessie" - - - stage: Build - before_script: *auto_skip - name: 8 on jessie-slim - env: - - NODE_VERSION="8" - - VARIANT="jessie-slim" - - - stage: Build - before_script: *auto_skip - name: 8 on stretch - env: - - NODE_VERSION="8" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 8 on stretch-slim - env: - - NODE_VERSION="8" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 8 on buster - env: - - NODE_VERSION="8" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 8 on buster-slim - env: - - NODE_VERSION="8" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 8 on alpine3.9 - env: - - NODE_VERSION="8" - - VARIANT="alpine3.9" - - - stage: Build - before_script: *auto_skip - name: 8 on alpine3.10 - env: - - NODE_VERSION="8" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 8 on alpine3.11 - env: - - NODE_VERSION="8" - - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: 8 on onbuild - env: - - NODE_VERSION="8" - - VARIANT="onbuild" - - stage: Build before_script: *auto_skip name: chakracore/10 on default diff --git a/8/alpine3.10/Dockerfile b/8/alpine3.10/Dockerfile deleted file mode 100644 index 76641ea136..0000000000 --- a/8/alpine3.10/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -FROM alpine:3.10 - -ENV NODE_VERSION 8.17.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="bd085bf3bf9d442500f78943e7f04631c7eaa888a3bf42c1f40bea74c3d1d6f8" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps - -ENV YARN_VERSION 1.21.1 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/alpine3.10/docker-entrypoint.sh b/8/alpine3.10/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/alpine3.10/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/alpine3.11/Dockerfile b/8/alpine3.11/Dockerfile deleted file mode 100644 index 3133b73336..0000000000 --- a/8/alpine3.11/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -FROM alpine:3.11 - -ENV NODE_VERSION 8.17.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="bd085bf3bf9d442500f78943e7f04631c7eaa888a3bf42c1f40bea74c3d1d6f8" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps - -ENV YARN_VERSION 1.21.1 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/alpine3.11/docker-entrypoint.sh b/8/alpine3.11/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/alpine3.11/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/alpine3.9/Dockerfile b/8/alpine3.9/Dockerfile deleted file mode 100644 index 3f9f47969b..0000000000 --- a/8/alpine3.9/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -FROM alpine:3.9 - -ENV NODE_VERSION 8.17.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="bd085bf3bf9d442500f78943e7f04631c7eaa888a3bf42c1f40bea74c3d1d6f8" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps - -ENV YARN_VERSION 1.21.1 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/alpine3.9/docker-entrypoint.sh b/8/alpine3.9/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/alpine3.9/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/architectures b/8/architectures deleted file mode 100644 index 807dfc6fd6..0000000000 --- a/8/architectures +++ /dev/null @@ -1,8 +0,0 @@ -bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -arm32v6 alpine3.9,alpine3.10,alpine3.11 -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild diff --git a/8/buster-slim/Dockerfile b/8/buster-slim/Dockerfile deleted file mode 100644 index 0dfb7cab63..0000000000 --- a/8/buster-slim/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 8.17.0 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/buster-slim/docker-entrypoint.sh b/8/buster-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/buster/Dockerfile b/8/buster/Dockerfile deleted file mode 100644 index a791b99a48..0000000000 --- a/8/buster/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 8.17.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/buster/docker-entrypoint.sh b/8/buster/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/buster/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/jessie-slim/Dockerfile b/8/jessie-slim/Dockerfile deleted file mode 100644 index 709b0890e6..0000000000 --- a/8/jessie-slim/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -FROM debian:jessie-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 8.17.0 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/jessie-slim/docker-entrypoint.sh b/8/jessie-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/jessie-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/jessie/Dockerfile b/8/jessie/Dockerfile deleted file mode 100644 index aea498cca6..0000000000 --- a/8/jessie/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM buildpack-deps:jessie - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 8.17.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/jessie/docker-entrypoint.sh b/8/jessie/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/jessie/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/onbuild/Dockerfile b/8/onbuild/Dockerfile deleted file mode 100644 index bc724cdf51..0000000000 --- a/8/onbuild/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:8.17.0-stretch - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD ARG NODE_ENV -ONBUILD ENV NODE_ENV $NODE_ENV -ONBUILD COPY package.json /usr/src/app/ -ONBUILD RUN npm install && npm cache clean --force -ONBUILD COPY . /usr/src/app - -CMD [ "npm", "start" ] diff --git a/8/stretch-slim/Dockerfile b/8/stretch-slim/Dockerfile deleted file mode 100644 index 31a5561af3..0000000000 --- a/8/stretch-slim/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 8.17.0 - -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/stretch-slim/docker-entrypoint.sh b/8/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/8/stretch/Dockerfile b/8/stretch/Dockerfile deleted file mode 100644 index e3b63f0faf..0000000000 --- a/8/stretch/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 8.17.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && 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.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/8/stretch/docker-entrypoint.sh b/8/stretch/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/8/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a29e6e8030..336ecc9352 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -7,8 +7,6 @@ hash git 2> /dev/null || { echo >&2 "git not found, exiting."; } # Used dynamically: print "$array_" $1 # shellcheck disable=SC2034 -array_8='8 carbon' -# shellcheck disable=SC2034 array_10='10 dubnium' # shellcheck disable=SC2034 array_12='12 erbium lts current' From 6b3ebcd02674c98dff18d4e55bfad3ab4eab9777 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 31 Dec 2019 19:01:26 -0500 Subject: [PATCH 323/818] chore: Remove Node 8 ChakraCore --- .travis.yml | 7 ------- chakracore/8/Dockerfile | 39 ----------------------------------- generate-stackbrew-library.sh | 2 -- 3 files changed, 48 deletions(-) delete mode 100644 chakracore/8/Dockerfile diff --git a/.travis.yml b/.travis.yml index d80ba7b65a..e6207445f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -274,10 +274,3 @@ jobs: env: - NODE_VERSION="chakracore/10" - VARIANT="default" - - - stage: Build - before_script: *auto_skip - name: chakracore/8 on default - env: - - NODE_VERSION="chakracore/8" - - VARIANT="default" diff --git a/chakracore/8/Dockerfile b/chakracore/8/Dockerfile deleted file mode 100644 index 67ed260507..0000000000 --- a/chakracore/8/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM buildpack-deps:jessie - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 8.11.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs - -ENV YARN_VERSION 1.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz - -CMD [ "node" ] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 336ecc9352..b375424615 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -13,8 +13,6 @@ array_12='12 erbium lts current' # shellcheck disable=SC2034 array_13='13 latest' # shellcheck disable=SC2034 -array_chakracore_8='chakracore-8' -# shellcheck disable=SC2034 array_chakracore_10='chakracore-10 chakracore' default_variant=$(get_config "./" "default_variant") From b7a069e8334efb0522171c0b191b5515fe50cac1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 31 Dec 2019 19:05:19 -0500 Subject: [PATCH 324/818] chore: Remove OnBuild variant --- Dockerfile-onbuild.template | 12 ---------- README.md | 44 ------------------------------------- architectures | 14 ++++++------ test-build.sh | 9 ++------ update.sh | 7 ++---- 5 files changed, 11 insertions(+), 75 deletions(-) delete mode 100644 Dockerfile-onbuild.template diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template deleted file mode 100644 index 5b0cbc8846..0000000000 --- a/Dockerfile-onbuild.template +++ /dev/null @@ -1,12 +0,0 @@ -FROM node:0.0.0-stretch - -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app - -ONBUILD ARG NODE_ENV -ONBUILD ENV NODE_ENV $NODE_ENV -ONBUILD COPY package.json /usr/src/app/ -ONBUILD RUN npm install && npm cache clean --force -ONBUILD COPY . /usr/src/app - -CMD [ "npm", "start" ] diff --git a/README.md b/README.md index 36c40479e5..072637a460 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ The official Node.js docker image, made with love by the node community. - [Image Variants](#image-variants) - [`node:`](#nodeversion) - [`node:alpine`](#nodealpine) - - [`node:onbuild`](#nodeonbuild) - [`node:slim`](#nodeslim) - [License](#license) - [Supported Docker versions](#supported-docker-versions) @@ -191,49 +190,6 @@ image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). -### `node:onbuild` - -The `ONBUILD` image variants are deprecated, and their usage is discouraged. For more details, see [docker-library/official-images#2076](https://github.com/docker-library/official-images/issues/2076). - -This image makes building derivative images easier. For most use cases, creating -a `Dockerfile` in the base of your project directory with the line `FROM -node:onbuild` will be enough to create a stand-alone image for your project. - -While the `onbuild` variant is really useful for "getting off the ground -running" (zero to Dockerized in a short period of time), it's not recommended -for long-term usage within a project due to the lack of control over *when* the -`ONBUILD` triggers fire (see also -[`docker/docker#5714`](https://github.com/docker/docker/issues/5714), -[`docker/docker#8240`](https://github.com/docker/docker/issues/8240), -[`docker/docker#11917`](https://github.com/docker/docker/issues/11917)). - -Once you've got a handle on how your project functions within Docker, you'll -probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` -variant and copy the commands from the `onbuild` variant `Dockerfile` (moving -the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your -own file so that you have tighter control over them and more transparency for -yourself and others looking at your `Dockerfile` as to what it does. This also -makes it easier to add additional requirements as time goes on (such as -installing more packages before performing the previously-`ONBUILD` steps). - -This `onbuild` variant will only install npm packages according to the -`package.json` and *does not* adhere to the `npm-shrinkwrap.json` (see full -discussion in -[`nodejs/docker-node#65`](https://github.com/nodejs/docker-node/issues/65). - -Note that npm installs devDependencies by default, which is undesirable if -you're building a production image. To avoid this pass NODE_ENV as a build -argument i.e. `docker build --build-arg NODE_ENV=production …`. - -The image assumes that your application has a file named -[`package.json`](https://docs.npmjs.com/files/package.json) listing its -dependencies and defining its [start -script](https://docs.npmjs.com/misc/scripts#default-values). - -It also assumes that you have a file named [`.dockerignore`](https://docs.docker.com/engine/reference/builder/#/dockerignore-file) otherwise it will copy your local npm modules: - -`node_modules` - ### `node:slim` This image does not contain the common packages contained in the default tag and diff --git a/architectures b/architectures index 974cd70263..0d29de6a87 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild -s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,onbuild +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 diff --git a/test-build.sh b/test-build.sh index 7b30e7509e..65d7e301c9 100755 --- a/test-build.sh +++ b/test-build.sh @@ -7,8 +7,8 @@ set -euo pipefail . functions.sh # Convert comma delimited cli arguments to arrays -# E.g. ./test-build.sh 8,10 slim,onbuild -# "8,10" becomes "8 10" and "slim,onbuild" becomes "slim onbuild" +# E.g. ./test-build.sh 10,12 slim,alpine +# "10,12" becomes "10 12" and "slim,alpine" becomes "slim alpine" IFS=',' read -ra versions_arg <<< "${1:-}" IFS=',' read -ra variant_arg <<< "${2:-}" @@ -88,11 +88,6 @@ for version in "${versions[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue - if [ "${variant}" = "onbuild" ]; then - build "${version}" "${default_variant}" "$tag" - test_image "${full_version}" "${default_variant}" "$tag" - fi - build "${version}" "${variant}" "${tag}" test_image "${full_version}" "${variant}" "${tag}" done diff --git a/update.sh b/update.sh index 50208628b3..87f1c863a6 100755 --- a/update.sh +++ b/update.sh @@ -131,7 +131,7 @@ function update_node_version() { ( cp "${template}" "${dockerfile}-tmp" local fromprefix="" - if [ "${arch}" != "amd64" ] && [ "${variant}" != "onbuild" ]; then + if [ "${arch}" != "amd64" ]; then fromprefix="${arch}\\/" fi @@ -146,9 +146,6 @@ function update_node_version() { fi sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}-tmp" - # Only for onbuild variant - sed -Ei -e 's/^(FROM .*node:)[^-]*(-.*)/\1'"${nodeVersion}"'\2/' "${dockerfile}-tmp" - # shellcheck disable=SC1004 new_line=' \\\ ' @@ -248,7 +245,7 @@ for version in "${versions[@]}"; do template_file="${parentpath}/Dockerfile-alpine.template" fi - [ "$variant" != "onbuild" ] && cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh" + cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh" if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${template_file}" "${version}/${variant}/Dockerfile" "${variant}" & fi From be6e86a7f669c5378aff7b80b89430db2133e3fd Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 31 Dec 2019 23:55:51 -0500 Subject: [PATCH 325/818] chore: Switch ECLint build to GitHub Actions --- .github/workflows/eclint.yml | 14 ++++++++++++++ .travis.yml | 10 ---------- travis.yml.template | 10 ---------- 3 files changed, 14 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/eclint.yml diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml new file mode 100644 index 0000000000..87ad6bdc79 --- /dev/null +++ b/.github/workflows/eclint.yml @@ -0,0 +1,14 @@ +name: Test Whitespace and line endings + +on: [pull_request] + +jobs: + eclint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '12.x' + - run: npm i -g eclint + - run: eclint check diff --git a/.travis.yml b/.travis.yml index e6207445f0..86029eacd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,16 +57,6 @@ jobs: script: - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test - name: Editor Config check - language: node_js - node_js: - - lts/* - install: - - npm i -g eclint - script: - - eclint check - - stage: Test name: Doc Toc Check language: node_js diff --git a/travis.yml.template b/travis.yml.template index d28f814ab1..229a34d35b 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -55,16 +55,6 @@ jobs: script: - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test - name: Editor Config check - language: node_js - node_js: - - lts/* - install: - - npm i -g eclint - script: - - eclint check - - stage: Test name: Doc Toc Check language: node_js From 24fcebb1955cfe93e202c66eeecf6986f4f90132 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 1 Jan 2020 00:20:27 -0500 Subject: [PATCH 326/818] chore: Switch DocTOC build to GitHub Actions Only executes when the TOC files have changed. Now also checks BestPractices.md --- .github/workflows/doctoc.yml | 27 +++++++++++++++++++++++++++ .travis.yml | 11 ----------- travis.yml.template | 11 ----------- 3 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/doctoc.yml diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml new file mode 100644 index 0000000000..bd90a4d205 --- /dev/null +++ b/.github/workflows/doctoc.yml @@ -0,0 +1,27 @@ +name: Check generated TOCs + +on: + pull_request: + paths: + - "README.md" + - "docs/BestPractices.md" + +jobs: + doctoc: + name: Doc TOC Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '12.x' + - name: Install doctoc + run: npm i -g doctoc + - name: Create README copy and diff with doctoc + run: cp README.md README.md.tmp && + doctoc --title='## Table of Contents' --github README.md && + diff -q README.md README.md.tmp + - name: Create "docs/BestPractices.md" copy and diff with doctoc + run: cp docs/BestPractices.md docs/BestPractices.md.tmp && + doctoc --title='## Table of Contents' --github docs/BestPractices.md && + diff -q docs/BestPractices.md docs/BestPractices.md.tmp diff --git a/.travis.yml b/.travis.yml index 86029eacd4..b24fcc6e8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,17 +57,6 @@ jobs: script: - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test - name: Doc Toc Check - language: node_js - node_js: - - lts/* - install: npm i -g doctoc - script: - - cp README.md README.md.tmp && - doctoc --title='## Table of Contents' --github README.md && - diff -q README.md README.md.tmp - - stage: Test name: shfmt check script: diff --git a/travis.yml.template b/travis.yml.template index 229a34d35b..edff560950 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -55,17 +55,6 @@ jobs: script: - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test - name: Doc Toc Check - language: node_js - node_js: - - lts/* - install: npm i -g doctoc - script: - - cp README.md README.md.tmp && - doctoc --title='## Table of Contents' --github README.md && - diff -q README.md README.md.tmp - - stage: Test name: shfmt check script: From cfc1388bb787200fc0e07326fb67103f29f29123 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 1 Jan 2020 00:27:36 -0500 Subject: [PATCH 327/818] chore: Switch shfmt and shellcheck builds to GitHub Actions --- .github/workflows/shfmt.yml | 20 ++++++++++++++++++++ .travis.yml | 11 ----------- travis.yml.template | 11 ----------- 3 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/shfmt.yml diff --git a/.github/workflows/shfmt.yml b/.github/workflows/shfmt.yml new file mode 100644 index 0000000000..1427dd1cb8 --- /dev/null +++ b/.github/workflows/shfmt.yml @@ -0,0 +1,20 @@ +name: Check Shell scripts + +on: + pull_request: + paths: + - "**/*.sh" + +jobs: + shfmt: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: docker run -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . + - run: git diff --color --exit-code + + shellcheck: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: shellcheck *.sh diff --git a/.travis.yml b/.travis.yml index b24fcc6e8a..03f1caa9ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,17 +57,6 @@ jobs: script: - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test - name: shfmt check - script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . - - git diff --color - - git diff --stat=220 --color --exit-code - - - stage: Test - name: Shell Check - script: shellcheck *.sh - - stage: Test name: .travis.yml and travis.yml.template consistency script: diff --git a/travis.yml.template b/travis.yml.template index edff560950..f13b60087c 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -55,17 +55,6 @@ jobs: script: - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test - name: shfmt check - script: - - docker run -it --rm -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . - - git diff --color - - git diff --stat=220 --color --exit-code - - - stage: Test - name: Shell Check - script: shellcheck *.sh - - stage: Test name: .travis.yml and travis.yml.template consistency script: From 34382c85bd6d4335d524748701c3ba1161ccea4a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 1 Jan 2020 01:18:56 -0500 Subject: [PATCH 328/818] chore: Switch markdown-link-check build to GitHub Actions --- .github/workflows/markdown-link-check.yml | 19 +++++++++++++++++++ .travis.yml | 15 --------------- travis.yml.template | 15 --------------- 3 files changed, 19 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/markdown-link-check.yml diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml new file mode 100644 index 0000000000..4339197825 --- /dev/null +++ b/.github/workflows/markdown-link-check.yml @@ -0,0 +1,19 @@ +name: Check Markdown links + +on: + pull_request: + paths: + - "**/*.md" + +jobs: + markdown-link-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '12.x' + - name: Install markdown-link-check + run: npm i -g markdown-link-check + - name: Run markdown-link-check on MD files + run: find . -name "*.md" | xargs -n 1 markdown-link-check -q diff --git a/.travis.yml b/.travis.yml index 03f1caa9ec..2150d70c5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,23 +40,8 @@ stages: jobs: fast_finish: true - allow_failures: - - env: - - TEST=mardown_lint include: - - stage: Test - name: Markdown link check - env: - - TEST=mardown_lint - language: node_js - node_js: - - lts/* - install: - - npm i -g markdown-link-check - script: - - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test name: .travis.yml and travis.yml.template consistency script: diff --git a/travis.yml.template b/travis.yml.template index f13b60087c..0aa5a08dc2 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -38,23 +38,8 @@ stages: jobs: fast_finish: true - allow_failures: - - env: - - TEST=mardown_lint include: - - stage: Test - name: Markdown link check - env: - - TEST=mardown_lint - language: node_js - node_js: - - lts/* - install: - - npm i -g markdown-link-check - script: - - find . -name "*.md" | xargs -n 1 markdown-link-check - - stage: Test name: .travis.yml and travis.yml.template consistency script: From f99660df7b05bc739cb63d51d5ddc290d54c196f Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 4 Jan 2020 13:27:27 +0100 Subject: [PATCH 329/818] fix: uninstall download helpers from slim image --- 10/buster-slim/Dockerfile | 14 +++++++++----- 10/jessie-slim/Dockerfile | 14 +++++++++----- 10/stretch-slim/Dockerfile | 14 +++++++++----- 12/buster-slim/Dockerfile | 14 +++++++++----- 12/stretch-slim/Dockerfile | 14 +++++++++----- 13/buster-slim/Dockerfile | 14 +++++++++----- 13/stretch-slim/Dockerfile | 14 +++++++++----- Dockerfile-slim.template | 14 +++++++++----- 8 files changed, 72 insertions(+), 40 deletions(-) diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 7554d1de28..5ef0f137d7 100644 --- a/10/buster-slim/Dockerfile +++ b/10/buster-slim/Dockerfile @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 10.18.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -42,12 +41,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 1.21.1 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -62,7 +64,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 0bc914b97e..4011d03683 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-slim/Dockerfile @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 10.18.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -42,12 +41,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 1.21.1 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -62,7 +64,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 92c6a75669..0a93c07da8 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/stretch-slim/Dockerfile @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 10.18.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -42,12 +41,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 1.21.1 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -62,7 +64,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 823c4eca91..0af28751ee 100644 --- a/12/buster-slim/Dockerfile +++ b/12/buster-slim/Dockerfile @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 12.14.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -42,12 +41,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 1.21.1 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -62,7 +64,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 19c1d2878f..fbd2b7e7c4 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/stretch-slim/Dockerfile @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 12.14.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -42,12 +41,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 1.21.1 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -62,7 +64,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index d0c4149365..a06d7a4830 100644 --- a/13/buster-slim/Dockerfile +++ b/13/buster-slim/Dockerfile @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 13.5.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -42,12 +41,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 1.21.1 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -62,7 +64,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 07b3195739..519d4824d3 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/stretch-slim/Dockerfile @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 13.5.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -42,12 +41,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 1.21.1 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -62,7 +64,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 89de397259..ce47fa506f 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -5,8 +5,7 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 0.0.0 -RUN buildDeps='xz-utils' \ - && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ ppc64el) ARCH='ppc64le';; \ @@ -17,7 +16,7 @@ RUN buildDeps='xz-utils' \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr $buildDeps --no-install-recommends \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ "${NODE_KEYS[@]}" @@ -32,12 +31,15 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs ENV YARN_VERSION 0.0.0 RUN set -ex \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ && for key in \ "${YARN_KEYS[@]}" ; do \ @@ -52,7 +54,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] From 8b8eebe2667b04d50f85535e2504fcbfd4675930 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 8 Jan 2020 00:32:35 +0100 Subject: [PATCH 330/818] Update node.js v12 to v12.14.1 and v13 to 13.6.0 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 13/alpine3.10/Dockerfile | 4 ++-- 13/alpine3.11/Dockerfile | 4 ++-- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 21d8dc64b0..1dc54fad94 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.14.0 +ENV NODE_VERSION 12.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="51960d8e0b80228611a8cb411c09ca07148d299039de9c9dd32481d9ff977c55" \ + CHECKSUM="6906577d7b15cc940f47fc88436ac45f73e5abecd15f09d8f2a9ea337fc2fe5e" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index ad03ea8d2f..878f92ec3b 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.14.0 +ENV NODE_VERSION 12.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="51960d8e0b80228611a8cb411c09ca07148d299039de9c9dd32481d9ff977c55" \ + CHECKSUM="6906577d7b15cc940f47fc88436ac45f73e5abecd15f09d8f2a9ea337fc2fe5e" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 89becaebc2..94a9ac0237 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.14.0 +ENV NODE_VERSION 12.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="51960d8e0b80228611a8cb411c09ca07148d299039de9c9dd32481d9ff977c55" \ + CHECKSUM="6906577d7b15cc940f47fc88436ac45f73e5abecd15f09d8f2a9ea337fc2fe5e" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 823c4eca91..b6a6fc0807 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.14.0 +ENV NODE_VERSION 12.14.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index a971549dc0..5c417dd3eb 100644 --- a/12/buster/Dockerfile +++ b/12/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.14.0 +ENV NODE_VERSION 12.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 19c1d2878f..346930d329 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.14.0 +ENV NODE_VERSION 12.14.1 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 90a15d213f..affd89e976 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.14.0 +ENV NODE_VERSION 12.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 4516687350..b89a5a324c 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.5.0 +ENV NODE_VERSION 13.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="1d476cfc39cd7ebb1bcb40ab5bf9934ef27f6780ff2b47e31db67b15471c560f" \ + CHECKSUM="6dec2b26f072ce2dd2cf5c72e4cccf76095afa71d4ac4803752f3a5bab8c01df" \ ;; \ *) ;; \ esac \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index eb1acc3192..230041144a 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.5.0 +ENV NODE_VERSION 13.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="1d476cfc39cd7ebb1bcb40ab5bf9934ef27f6780ff2b47e31db67b15471c560f" \ + CHECKSUM="6dec2b26f072ce2dd2cf5c72e4cccf76095afa71d4ac4803752f3a5bab8c01df" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index d0c4149365..4c85881fd6 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.5.0 +ENV NODE_VERSION 13.6.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 472a1e7aa8..c95980280f 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.5.0 +ENV NODE_VERSION 13.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 07b3195739..1d8d12e196 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.5.0 +ENV NODE_VERSION 13.6.0 RUN buildDeps='xz-utils' \ && ARCH= && dpkgArch="$(dpkg --print-architecture)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 800f5dbd29..80fbf269d7 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.5.0 +ENV NODE_VERSION 13.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From e756350f8b873cec2faa2cf2bad92ba8c7884ed4 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 9 Jan 2020 20:28:42 -0500 Subject: [PATCH 331/818] feat: Update to 10.18.1 Ref https://nodejs.org/en/blog/release/v10.18.1/ --- 10/alpine3.10/Dockerfile | 4 ++-- 10/alpine3.11/Dockerfile | 4 ++-- 10/alpine3.9/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 97f476cb62..adf3f109f9 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.18.0 +ENV NODE_VERSION 10.18.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="043f9e1c412a391f42a9667373b851590a9a77c08cf6fde6828a3cdb3fb8f316" \ + CHECKSUM="72de2f5e7826c2c13374c1d2e2a283556336c03b03507e8a6216b376a3c7693e" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 16a2d8d7de..927b96ed67 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.18.0 +ENV NODE_VERSION 10.18.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="043f9e1c412a391f42a9667373b851590a9a77c08cf6fde6828a3cdb3fb8f316" \ + CHECKSUM="72de2f5e7826c2c13374c1d2e2a283556336c03b03507e8a6216b376a3c7693e" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index f63d4b200b..eeee7a3cf8 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.18.0 +ENV NODE_VERSION 10.18.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="043f9e1c412a391f42a9667373b851590a9a77c08cf6fde6828a3cdb3fb8f316" \ + CHECKSUM="72de2f5e7826c2c13374c1d2e2a283556336c03b03507e8a6216b376a3c7693e" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 5ef0f137d7..d379a32da0 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.18.0 +ENV NODE_VERSION 10.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 6d1720f1c4..e037eba863 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.18.0 +ENV NODE_VERSION 10.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 4011d03683..755d3e0dcf 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.18.0 +ENV NODE_VERSION 10.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 37b00f157e..46998993d1 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.18.0 +ENV NODE_VERSION 10.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 0a93c07da8..b1b255a80e 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.18.0 +ENV NODE_VERSION 10.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index c170ae14fd..20defe8cf5 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.18.0 +ENV NODE_VERSION 10.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 60915d2eb94e19a0d8500eb6f31c7ab1a4807fd7 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Wed, 8 Jan 2020 11:25:37 -0500 Subject: [PATCH 332/818] Auto PR: Only keep the first line of the commit message Fixes issue highlited in #1183 --- generate-stackbrew-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh index c393b8d680..ce13aa4c2e 100755 --- a/generate-stackbrew-pr.sh +++ b/generate-stackbrew-pr.sh @@ -76,7 +76,7 @@ function pr_payload() { local body local maintainers - escaped_message="$(echo "${COMMIT_MESSAGE}" | sed -E -e "s/\"/\\\\\"/g")" + escaped_message="$(echo "${COMMIT_MESSAGE}" | head -n 1 | sed -E -e "s/\"/\\\\\"/g")" if [ -n "${PR_NUMBER}" ]; then body="Pull Request: ${DOCKER_SLUG}#${PR_NUMBER}" From 3dbeefaa1b231aeddb7af7ef24bb83dd229d3e39 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Fri, 10 Jan 2020 09:41:24 -0500 Subject: [PATCH 333/818] Revert "Fix update.sh invocation with unknown variant" --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 25d61dca16..87f1c863a6 100755 --- a/update.sh +++ b/update.sh @@ -97,7 +97,7 @@ function in_variants_to_update() { local variant=$1 if [ "${#update_variants[@]}" -eq 0 ]; then - echo 1 + echo 0 return fi From 494bbc0785fb2c105ad206a42d6b16f46477e18d Mon Sep 17 00:00:00 2001 From: Clay Walker Date: Fri, 10 Jan 2020 14:20:55 -1000 Subject: [PATCH 334/818] Added instructions for submitting a version update PR (#1190) --- CONTRIBUTING.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a98969cad5..ff4153391f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,6 +10,17 @@ New **NPM** releases are not tracked. We simply use the NPM version bundled in t **Yarn** is updated to the latest version only when there is a new Node.js SemVer PATCH release (unless Yarn has received a security update), and it's updated only in the branch with the new release, preferably in the same PR. The `update.sh` script does this automatically when invoked with a specific branch, e.g. `./update.sh 6.10`. +### Submitting a PR for a version update + +If you'd like to help us by submitting a PR for a version update, please do the following: + +1. [Fork this project.](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) +1. [Clone the forked repository.](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) +1. Create a branch for the update PR. For example, `git checkout master; git checkout -b version-update`. +1. Run `./update.sh`. You can see additional options by using accessing the built-in help documentation with `./update.sh -h`. This script will automatically update the appropriate files with the latest versions and checksums. +1. Commit the modified files to the `version-update` branch and push the branch to your fork. +1. [Create a PR to merge the branch from your fork into this project's master branch.](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork). + ## Adding dependencies to the base images NodeJS is a big ecosystem with a variety of different use cases. The docker images for node are designed to provide the minimum for running core node. Additional dependencies (including dependencies for npm or yarn such as git) will not be included in these base images and will need to be included in descendent image. From 6005d05f580f75d17f56615053f076778969d94c Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 14 Jan 2020 10:14:44 +0100 Subject: [PATCH 335/818] chore: add smoke tests to the images --- 10/alpine3.10/Dockerfile | 9 +++++++-- 10/alpine3.11/Dockerfile | 9 +++++++-- 10/alpine3.9/Dockerfile | 9 +++++++-- 10/buster-slim/Dockerfile | 9 +++++++-- 10/buster/Dockerfile | 9 +++++++-- 10/jessie-slim/Dockerfile | 9 +++++++-- 10/jessie/Dockerfile | 9 +++++++-- 10/stretch-slim/Dockerfile | 9 +++++++-- 10/stretch/Dockerfile | 9 +++++++-- 12/alpine3.10/Dockerfile | 9 +++++++-- 12/alpine3.11/Dockerfile | 9 +++++++-- 12/alpine3.9/Dockerfile | 9 +++++++-- 12/buster-slim/Dockerfile | 9 +++++++-- 12/buster/Dockerfile | 9 +++++++-- 12/stretch-slim/Dockerfile | 9 +++++++-- 12/stretch/Dockerfile | 9 +++++++-- 13/alpine3.10/Dockerfile | 9 +++++++-- 13/alpine3.11/Dockerfile | 9 +++++++-- 13/buster-slim/Dockerfile | 9 +++++++-- 13/buster/Dockerfile | 9 +++++++-- 13/stretch-slim/Dockerfile | 9 +++++++-- 13/stretch/Dockerfile | 9 +++++++-- Dockerfile-alpine.template | 9 +++++++-- Dockerfile-debian.template | 9 +++++++-- Dockerfile-slim.template | 9 +++++++-- chakracore/10/Dockerfile | 9 +++++++-- chakracore/Dockerfile.template | 9 +++++++-- 27 files changed, 189 insertions(+), 54 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index adf3f109f9..5ce622fafe 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 927b96ed67..4196ad871c 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index eeee7a3cf8..bfdb7a34b6 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index d379a32da0..9c96bcf3cf 100644 --- a/10/buster-slim/Dockerfile +++ b/10/buster-slim/Dockerfile @@ -43,7 +43,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -66,7 +69,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index e037eba863..6319d4105d 100644 --- a/10/buster/Dockerfile +++ b/10/buster/Dockerfile @@ -40,7 +40,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -59,7 +62,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 755d3e0dcf..4a53ab863c 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-slim/Dockerfile @@ -43,7 +43,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -66,7 +69,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 46998993d1..ea9cba8c30 100644 --- a/10/jessie/Dockerfile +++ b/10/jessie/Dockerfile @@ -40,7 +40,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -59,7 +62,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index b1b255a80e..41d912731d 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/stretch-slim/Dockerfile @@ -43,7 +43,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -66,7 +69,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 20defe8cf5..fad7ea7bc0 100644 --- a/10/stretch/Dockerfile +++ b/10/stretch/Dockerfile @@ -40,7 +40,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -59,7 +62,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 1dc54fad94..ebc6be3e8b 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 878f92ec3b..3fadbe0d36 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 94a9ac0237..a2af35e66a 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 9dd14d6d23..2267544d03 100644 --- a/12/buster-slim/Dockerfile +++ b/12/buster-slim/Dockerfile @@ -43,7 +43,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -66,7 +69,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 5c417dd3eb..273e540e55 100644 --- a/12/buster/Dockerfile +++ b/12/buster/Dockerfile @@ -40,7 +40,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -59,7 +62,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index b37d8383d0..7b2da6190d 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/stretch-slim/Dockerfile @@ -43,7 +43,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -66,7 +69,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index affd89e976..1992da1155 100644 --- a/12/stretch/Dockerfile +++ b/12/stretch/Dockerfile @@ -40,7 +40,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -59,7 +62,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index b89a5a324c..e37d9947ab 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index 230041144a..dd6e704a46 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -67,7 +67,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -87,7 +90,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 33827596ec..ea5deb8105 100644 --- a/13/buster-slim/Dockerfile +++ b/13/buster-slim/Dockerfile @@ -43,7 +43,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -66,7 +69,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index c95980280f..2f963af0e0 100644 --- a/13/buster/Dockerfile +++ b/13/buster/Dockerfile @@ -40,7 +40,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -59,7 +62,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 2e16acc335..a14f5af129 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/stretch-slim/Dockerfile @@ -43,7 +43,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -66,7 +69,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 80fbf269d7..490c11b13f 100644 --- a/13/stretch/Dockerfile +++ b/13/stretch/Dockerfile @@ -40,7 +40,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -59,7 +62,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0544c43d46..34700211fd 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -57,7 +57,10 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 0.0.0 @@ -77,7 +80,9 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn + && apk del .build-deps-yarn \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 13ec6404b3..1c3dcf4acf 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -30,7 +30,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 0.0.0 @@ -49,7 +52,9 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index ce47fa506f..bfddc0529d 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -33,7 +33,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 0.0.0 @@ -56,7 +59,9 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile index 28134c1950..ebbf175b22 100644 --- a/chakracore/10/Dockerfile +++ b/chakracore/10/Dockerfile @@ -15,7 +15,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 1.21.1 @@ -34,6 +37,8 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version CMD [ "node" ] diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template index 401f7d58e0..a413affc29 100644 --- a/chakracore/Dockerfile.template +++ b/chakracore/Dockerfile.template @@ -15,7 +15,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version ENV YARN_VERSION 0.0.0 @@ -34,6 +37,8 @@ RUN set -ex \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version CMD [ "node" ] From 975ad7f092d362ade47f4cff6e2897de17be4cc5 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 22 Jan 2020 11:52:21 +0800 Subject: [PATCH 336/818] Update node.js v13.x from 13.6.0 to 13.7.0 - https://nodejs.org/en/blog/release/v13.7.0/ - https://github.com/nodejs/node/releases/tag/v13.7.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.7.0 --- 13/alpine3.10/Dockerfile | 4 ++-- 13/alpine3.11/Dockerfile | 4 ++-- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index b89a5a324c..8ef807bf25 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.6.0 +ENV NODE_VERSION 13.7.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="6dec2b26f072ce2dd2cf5c72e4cccf76095afa71d4ac4803752f3a5bab8c01df" \ + CHECKSUM="4c153345a08d2eeb40dfbb62f1ef6ade7ec369630f9cf9f061bf9d52b10acafc" \ ;; \ *) ;; \ esac \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index 230041144a..515cc235e4 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.6.0 +ENV NODE_VERSION 13.7.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="6dec2b26f072ce2dd2cf5c72e4cccf76095afa71d4ac4803752f3a5bab8c01df" \ + CHECKSUM="4c153345a08d2eeb40dfbb62f1ef6ade7ec369630f9cf9f061bf9d52b10acafc" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 33827596ec..548667bc6e 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.6.0 +ENV NODE_VERSION 13.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index c95980280f..d04e081ced 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.6.0 +ENV NODE_VERSION 13.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 2e16acc335..6ecedb68ac 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.6.0 +ENV NODE_VERSION 13.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 80fbf269d7..5bd7fc97b9 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.6.0 +ENV NODE_VERSION 13.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 46f5203674c748b0701135c8eeea4b250b3ecb6d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 6 Feb 2020 23:03:18 +0800 Subject: [PATCH 337/818] Update Node.js 10, 12, 13 for 2020-01 security updates v10.18.1 -> v10.19.0, v12.14.1 -> v12.15.0, v13.7.0 -> v13.8.0 See: - https://nodejs.org/en/blog/release/v10.19.0 - https://nodejs.org/en/blog/release/v12.15.0 - https://nodejs.org/en/blog/release/v13.8.0 --- 10/alpine3.10/Dockerfile | 4 ++-- 10/alpine3.11/Dockerfile | 4 ++-- 10/alpine3.9/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index adf3f109f9..f50de031d0 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.18.1 +ENV NODE_VERSION 10.19.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="72de2f5e7826c2c13374c1d2e2a283556336c03b03507e8a6216b376a3c7693e" \ + CHECKSUM="7d607297a0dd0b78861b4807733424ae288968d8653be644bedde123ddb0d96f" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 927b96ed67..d49ef3525c 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.18.1 +ENV NODE_VERSION 10.19.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="72de2f5e7826c2c13374c1d2e2a283556336c03b03507e8a6216b376a3c7693e" \ + CHECKSUM="7d607297a0dd0b78861b4807733424ae288968d8653be644bedde123ddb0d96f" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index eeee7a3cf8..fb441bece7 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.18.1 +ENV NODE_VERSION 10.19.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="72de2f5e7826c2c13374c1d2e2a283556336c03b03507e8a6216b376a3c7693e" \ + CHECKSUM="7d607297a0dd0b78861b4807733424ae288968d8653be644bedde123ddb0d96f" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index d379a32da0..8c710c0dd9 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.18.1 +ENV NODE_VERSION 10.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index e037eba863..97e9909941 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.18.1 +ENV NODE_VERSION 10.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 755d3e0dcf..048910c130 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.18.1 +ENV NODE_VERSION 10.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index 46998993d1..09958e69b5 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.18.1 +ENV NODE_VERSION 10.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index b1b255a80e..7dbfe1dac1 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.18.1 +ENV NODE_VERSION 10.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 20defe8cf5..e3a0357a62 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.18.1 +ENV NODE_VERSION 10.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 1dc54fad94..3dd4104475 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.14.1 +ENV NODE_VERSION 12.15.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="6906577d7b15cc940f47fc88436ac45f73e5abecd15f09d8f2a9ea337fc2fe5e" \ + CHECKSUM="150c5f3283cf07953cd2a55490c5e6eadefe40f80e38fd4f19dd516896bc5cf9" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 878f92ec3b..f9889ce1e3 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.14.1 +ENV NODE_VERSION 12.15.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="6906577d7b15cc940f47fc88436ac45f73e5abecd15f09d8f2a9ea337fc2fe5e" \ + CHECKSUM="150c5f3283cf07953cd2a55490c5e6eadefe40f80e38fd4f19dd516896bc5cf9" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 94a9ac0237..b4aeeee5e8 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.14.1 +ENV NODE_VERSION 12.15.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="6906577d7b15cc940f47fc88436ac45f73e5abecd15f09d8f2a9ea337fc2fe5e" \ + CHECKSUM="150c5f3283cf07953cd2a55490c5e6eadefe40f80e38fd4f19dd516896bc5cf9" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 9dd14d6d23..352b85c3d1 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.14.1 +ENV NODE_VERSION 12.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 5c417dd3eb..51c2504438 100644 --- a/12/buster/Dockerfile +++ b/12/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.14.1 +ENV NODE_VERSION 12.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index b37d8383d0..87dbcdaba6 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.14.1 +ENV NODE_VERSION 12.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index affd89e976..3fa43ea9d6 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.14.1 +ENV NODE_VERSION 12.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 548667bc6e..07c46578e8 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.7.0 +ENV NODE_VERSION 13.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index d04e081ced..01a46b8fd4 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.7.0 +ENV NODE_VERSION 13.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 6ecedb68ac..9433d270d9 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.7.0 +ENV NODE_VERSION 13.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 5bd7fc97b9..41e87d444b 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.7.0 +ENV NODE_VERSION 13.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5a27a54ba67e344859ecd17a90e266fbeb4e828f Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 7 Feb 2020 11:52:20 +0800 Subject: [PATCH 338/818] Update Node.js v13 for Alpine to v13.8.0, cc #1209 v13 update for Alpine Linux was missing due to the delay of unofficial build for Alpine. --- 13/alpine3.10/Dockerfile | 4 ++-- 13/alpine3.11/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 8ef807bf25..1f84f99fdb 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.7.0 +ENV NODE_VERSION 13.8.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="4c153345a08d2eeb40dfbb62f1ef6ade7ec369630f9cf9f061bf9d52b10acafc" \ + CHECKSUM="3325ec0bff602d30222e0c6c6af81aefa04d7d20946bac65d55dbb09d7d7e1e0" \ ;; \ *) ;; \ esac \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index 515cc235e4..1c52693383 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.7.0 +ENV NODE_VERSION 13.8.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="4c153345a08d2eeb40dfbb62f1ef6ade7ec369630f9cf9f061bf9d52b10acafc" \ + CHECKSUM="3325ec0bff602d30222e0c6c6af81aefa04d7d20946bac65d55dbb09d7d7e1e0" \ ;; \ *) ;; \ esac \ From a24f83a3d2646bc0a45511aba312cc4a63f2d965 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 11 Feb 2020 19:45:27 +0100 Subject: [PATCH 339/818] chore: update to node 12.16 and yarn 1.22 --- 12/alpine3.10/Dockerfile | 6 +++--- 12/alpine3.11/Dockerfile | 6 +++--- 12/alpine3.9/Dockerfile | 6 +++--- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 3dd4104475..b77c1d9729 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.15.0 +ENV NODE_VERSION 12.16.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="150c5f3283cf07953cd2a55490c5e6eadefe40f80e38fd4f19dd516896bc5cf9" \ + CHECKSUM="c7c38c170c38a491ecffbd5324415818f88abc2a6a79076493c1028a19bf64df" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index f9889ce1e3..e79b706fe0 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.15.0 +ENV NODE_VERSION 12.16.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="150c5f3283cf07953cd2a55490c5e6eadefe40f80e38fd4f19dd516896bc5cf9" \ + CHECKSUM="c7c38c170c38a491ecffbd5324415818f88abc2a6a79076493c1028a19bf64df" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index b4aeeee5e8..31c973767a 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.15.0 +ENV NODE_VERSION 12.16.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="150c5f3283cf07953cd2a55490c5e6eadefe40f80e38fd4f19dd516896bc5cf9" \ + CHECKSUM="c7c38c170c38a491ecffbd5324415818f88abc2a6a79076493c1028a19bf64df" \ ;; \ *) ;; \ esac \ @@ -69,7 +69,7 @@ RUN addgroup -g 1000 node \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ && apk del .build-deps -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 352b85c3d1..fd46ed62c8 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.15.0 +ENV NODE_VERSION 12.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 51c2504438..8e06c451c6 100644 --- a/12/buster/Dockerfile +++ b/12/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.15.0 +ENV NODE_VERSION 12.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 87dbcdaba6..75e866f44d 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.15.0 +ENV NODE_VERSION 12.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 3fa43ea9d6..08ea438282 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.15.0 +ENV NODE_VERSION 12.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && for key in \ From 71849fa34800c2acb7da9c3a283520b2f4d84376 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 14 Jan 2020 10:23:20 +0100 Subject: [PATCH 340/818] chore: try to keep dynamically linked files --- 10/buster-slim/Dockerfile | 14 ++++++++++++++ 10/jessie-slim/Dockerfile | 14 ++++++++++++++ 10/stretch-slim/Dockerfile | 14 ++++++++++++++ 12/buster-slim/Dockerfile | 14 ++++++++++++++ 12/stretch-slim/Dockerfile | 14 ++++++++++++++ 13/buster-slim/Dockerfile | 14 ++++++++++++++ 13/stretch-slim/Dockerfile | 14 ++++++++++++++ Dockerfile-slim.template | 14 ++++++++++++++ 8 files changed, 112 insertions(+) diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 139e63e65a..520207115b 100644 --- a/10/buster-slim/Dockerfile +++ b/10/buster-slim/Dockerfile @@ -42,6 +42,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -69,6 +76,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 332de9e7a9..1d7d53cc56 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-slim/Dockerfile @@ -42,6 +42,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -69,6 +76,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 6374cc4a70..648794f097 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/stretch-slim/Dockerfile @@ -42,6 +42,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -69,6 +76,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index a2ea3c7d2a..28fd145960 100644 --- a/12/buster-slim/Dockerfile +++ b/12/buster-slim/Dockerfile @@ -42,6 +42,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -69,6 +76,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index fa661b7cd3..132b797d40 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/stretch-slim/Dockerfile @@ -42,6 +42,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -69,6 +76,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 1b7f5bb9e9..6b1f2f3351 100644 --- a/13/buster-slim/Dockerfile +++ b/13/buster-slim/Dockerfile @@ -42,6 +42,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -69,6 +76,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index bfcbe1a6e6..8b35e3d757 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/stretch-slim/Dockerfile @@ -42,6 +42,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -69,6 +76,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index bfddc0529d..dffb23ad2d 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -32,6 +32,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests @@ -59,6 +66,13 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test && yarn --version From 2caaf1a42cdf44e0e50ab30c82415c71bf2f3a21 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 13 Feb 2020 22:50:04 +0100 Subject: [PATCH 341/818] maybe fix arm? --- 10/buster-slim/Dockerfile | 5 ++++- 10/jessie-slim/Dockerfile | 5 ++++- 10/stretch-slim/Dockerfile | 5 ++++- 12/buster-slim/Dockerfile | 5 ++++- 12/stretch-slim/Dockerfile | 5 ++++- 13/buster-slim/Dockerfile | 5 ++++- 13/stretch-slim/Dockerfile | 5 ++++- Dockerfile-slim.template | 5 ++++- 8 files changed, 32 insertions(+), 8 deletions(-) diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 520207115b..2154051810 100644 --- a/10/buster-slim/Dockerfile +++ b/10/buster-slim/Dockerfile @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.21.1 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -76,6 +78,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 1d7d53cc56..cbccbae83c 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-slim/Dockerfile @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.21.1 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -76,6 +78,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 648794f097..b07de85c2a 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/stretch-slim/Dockerfile @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.21.1 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -76,6 +78,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 28fd145960..07bdc0ae29 100644 --- a/12/buster-slim/Dockerfile +++ b/12/buster-slim/Dockerfile @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.0 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -76,6 +78,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 132b797d40..f4069f013b 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/stretch-slim/Dockerfile @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.0 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -76,6 +78,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 6b1f2f3351..49ed187dc5 100644 --- a/13/buster-slim/Dockerfile +++ b/13/buster-slim/Dockerfile @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.21.1 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -76,6 +78,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 8b35e3d757..72ab32e013 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/stretch-slim/Dockerfile @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ @@ -58,6 +59,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.21.1 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -76,6 +78,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index dffb23ad2d..0056b4a97e 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -16,7 +16,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils --no-install-recommends \ + # libatomic1 for arm + && 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 \ "${NODE_KEYS[@]}" @@ -48,6 +49,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 0.0.0 RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && for key in \ @@ -66,6 +68,7 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { print $(NF-1) }' \ | sort -u \ From 5351774b970cd32b80fc0c47a8abff5ba155fccc Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 18 Feb 2020 22:08:12 +0100 Subject: [PATCH 342/818] chore: upgrade to node 12.16.1 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 6d290b90d5..de0550a1df 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.16.0 +ENV NODE_VERSION 12.16.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="c7c38c170c38a491ecffbd5324415818f88abc2a6a79076493c1028a19bf64df" \ + CHECKSUM="7606d86e842b710e4321fe1c7f7a32a8e145f5e0659de406399cda5a37411d92" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index f160a33040..a383ad8e25 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.16.0 +ENV NODE_VERSION 12.16.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="c7c38c170c38a491ecffbd5324415818f88abc2a6a79076493c1028a19bf64df" \ + CHECKSUM="7606d86e842b710e4321fe1c7f7a32a8e145f5e0659de406399cda5a37411d92" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index a9db5f89e0..430682c442 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.16.0 +ENV NODE_VERSION 12.16.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="c7c38c170c38a491ecffbd5324415818f88abc2a6a79076493c1028a19bf64df" \ + CHECKSUM="7606d86e842b710e4321fe1c7f7a32a8e145f5e0659de406399cda5a37411d92" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index a2ea3c7d2a..f797515e5d 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.16.0 +ENV NODE_VERSION 12.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index e8dfce57e9..002df9e8d3 100644 --- a/12/buster/Dockerfile +++ b/12/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.16.0 +ENV NODE_VERSION 12.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index fa661b7cd3..012653de70 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.16.0 +ENV NODE_VERSION 12.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index b0c1e704ca..898c87a33c 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.16.0 +ENV NODE_VERSION 12.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6bc7fe5d018f2235cdcd2f7681990cee9d096497 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 19 Feb 2020 11:00:28 +0800 Subject: [PATCH 343/818] Update node.js v13 to 13.10.1 with Yarn v1.22.1 - https://nodejs.org/en/blog/release/v13.10.1/ - https://github.com/nodejs/node/releases/tag/v13.10.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.10.1 --- 13/alpine3.10/Dockerfile | 6 +++--- 13/alpine3.11/Dockerfile | 6 +++--- 13/buster-slim/Dockerfile | 4 ++-- 13/buster/Dockerfile | 4 ++-- 13/stretch-slim/Dockerfile | 4 ++-- 13/stretch/Dockerfile | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 0d00ec625c..81ca97417a 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.8.0 +ENV NODE_VERSION 13.10.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="3325ec0bff602d30222e0c6c6af81aefa04d7d20946bac65d55dbb09d7d7e1e0" \ + CHECKSUM="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index 661a7281e0..406689ec23 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.8.0 +ENV NODE_VERSION 13.10.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="3325ec0bff602d30222e0c6c6af81aefa04d7d20946bac65d55dbb09d7d7e1e0" \ + CHECKSUM="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 49ed187dc5..64613e5855 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.8.0 +ENV NODE_VERSION 13.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 55efaf3e73..07ea5974ca 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.8.0 +ENV NODE_VERSION 13.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && for key in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 72ab32e013..8385820095 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.8.0 +ENV NODE_VERSION 13.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 1c9f363a70..f673eda727 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.8.0 +ENV NODE_VERSION 13.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.0 RUN set -ex \ && for key in \ From fb0d1f05a64d7aadc5490a00d97ac0769118585e Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 9 Mar 2020 21:47:56 -0400 Subject: [PATCH 344/818] chore: Remove Chakracore files --- .travis.yml | 7 ------ chakracore/10/Dockerfile | 44 ---------------------------------- chakracore/Dockerfile.template | 44 ---------------------------------- chakracore/architectures | 2 -- chakracore/config | 1 - generate-stackbrew-library.sh | 2 -- test-build.sh | 7 ++---- 7 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 chakracore/10/Dockerfile delete mode 100644 chakracore/Dockerfile.template delete mode 100644 chakracore/architectures delete mode 100644 chakracore/config diff --git a/.travis.yml b/.travis.yml index 2150d70c5d..3fd72f5996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -220,10 +220,3 @@ jobs: env: - NODE_VERSION="13" - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: chakracore/10 on default - env: - - NODE_VERSION="chakracore/10" - - VARIANT="default" diff --git a/chakracore/10/Dockerfile b/chakracore/10/Dockerfile deleted file mode 100644 index ebbf175b22..0000000000 --- a/chakracore/10/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 10.13.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.21.1 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -CMD [ "node" ] diff --git a/chakracore/Dockerfile.template b/chakracore/Dockerfile.template deleted file mode 100644 index a413affc29..0000000000 --- a/chakracore/Dockerfile.template +++ /dev/null @@ -1,44 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 0.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/download/chakracore-release/v$NODE_VERSION/SHASUMS256.txt" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 0.0.0 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -CMD [ "node" ] diff --git a/chakracore/architectures b/chakracore/architectures deleted file mode 100644 index 85bd3bd021..0000000000 --- a/chakracore/architectures +++ /dev/null @@ -1,2 +0,0 @@ -bashbrew-arch variants -amd64 default diff --git a/chakracore/config b/chakracore/config deleted file mode 100644 index 116285c2f0..0000000000 --- a/chakracore/config +++ /dev/null @@ -1 +0,0 @@ -baseuri https://nodejs.org/download/chakracore-release diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index b375424615..d030d3f950 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -12,8 +12,6 @@ array_10='10 dubnium' array_12='12 erbium lts current' # shellcheck disable=SC2034 array_13='13 latest' -# shellcheck disable=SC2034 -array_chakracore_10='chakracore-10 chakracore' default_variant=$(get_config "./" "default_variant") diff --git a/test-build.sh b/test-build.sh index 65d7e301c9..4f18016c8c 100755 --- a/test-build.sh +++ b/test-build.sh @@ -74,11 +74,8 @@ for version in "${versions[@]}"; do tag=$(get_tag "${version}") full_version=$(get_full_version "${version}") - # Required for chakracore - if [ -f "${version}/Dockerfile" ]; then - build "${version}" "default" "${tag}" - test_image "${full_version}" "default" "${tag}" - fi + build "${version}" "default" "${tag}" + test_image "${full_version}" "default" "${tag}" # Get supported variants according to the target architecture. # See details in function.sh From 8acdc6cb8082c5f100a2a1c961835a8fbc032953 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 12 Mar 2020 01:06:35 -0400 Subject: [PATCH 345/818] fix: Remove default variant test --- test-build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/test-build.sh b/test-build.sh index 4f18016c8c..6614725d35 100755 --- a/test-build.sh +++ b/test-build.sh @@ -74,9 +74,6 @@ for version in "${versions[@]}"; do tag=$(get_tag "${version}") full_version=$(get_full_version "${version}") - build "${version}" "default" "${tag}" - test_image "${full_version}" "default" "${tag}" - # Get supported variants according to the target architecture. # See details in function.sh IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")" From 7c25509c79b594445b1a39f0f3635e6b61acb9d5 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Mar 2020 15:56:47 +0800 Subject: [PATCH 346/818] Update node.js v13 to 13.11.0 with Yarn v1.22.4 - https://nodejs.org/en/blog/release/v13.11.0/ - https://github.com/nodejs/node/releases/tag/v13.11.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.11.0 --- 13/alpine3.10/Dockerfile | 6 +++--- 13/alpine3.11/Dockerfile | 6 +++--- 13/buster-slim/Dockerfile | 4 ++-- 13/buster/Dockerfile | 4 ++-- 13/stretch-slim/Dockerfile | 4 ++-- 13/stretch/Dockerfile | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 81ca97417a..d63a228ed0 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.10.1 +ENV NODE_VERSION 13.11.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="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \ + CHECKSUM="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index 406689ec23..4485f930f1 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.10.1 +ENV NODE_VERSION 13.11.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="b5b1af4f97bf8759e0de58e0d659ffa81db4857500e56e2b0b3f5948351a9bfa" \ + CHECKSUM="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 64613e5855..a617b24211 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 07ea5974ca..4cb179436b 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 8385820095..229febaab3 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index f673eda727..1b09ba0599 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.10.1 +ENV NODE_VERSION 13.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ From b4117f9333da4138b03a546ec926ef50a31506c3 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 27 Mar 2020 12:02:41 +0800 Subject: [PATCH 347/818] Update node.js v13 from 13.11.0 to 13.12.0 - https://nodejs.org/en/blog/release/v13.12.0/ - https://github.com/nodejs/node/releases/tag/v13.12.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.12.0 --- 13/alpine3.10/Dockerfile | 4 ++-- 13/alpine3.11/Dockerfile | 4 ++-- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index d63a228ed0..5963dedd24 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.11.0 +ENV NODE_VERSION 13.12.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="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \ + CHECKSUM="2be1914d44aafdb6d0b41b8f78eb19dc7cbec21738e1f06d37ac2d06405c260f" \ ;; \ *) ;; \ esac \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index 4485f930f1..ad5e576bee 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.11.0 +ENV NODE_VERSION 13.12.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="3bbdfc77adc4682ac5d9907021494b37f365c3d7e3952b2efbc70d0512fad907" \ + CHECKSUM="2be1914d44aafdb6d0b41b8f78eb19dc7cbec21738e1f06d37ac2d06405c260f" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index a617b24211..a42cd2c453 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.11.0 +ENV NODE_VERSION 13.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index 4cb179436b..fa1a0364c6 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.11.0 +ENV NODE_VERSION 13.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 229febaab3..f70dc77c4c 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.11.0 +ENV NODE_VERSION 13.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index 1b09ba0599..a160cbcfe4 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.11.0 +ENV NODE_VERSION 13.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 73c45712bbb1e509f79d3254c965c391812051ef Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 9 Apr 2020 01:50:08 +0800 Subject: [PATCH 348/818] Update node.js v10 to v10.20.0 with Yarn v1.22.4 - https://nodejs.org/en/blog/release/v10.20.0/ - https://github.com/nodejs/node/releases/tag/v10.20.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.20.0 --- 10/alpine3.10/Dockerfile | 6 +++--- 10/alpine3.11/Dockerfile | 6 +++--- 10/alpine3.9/Dockerfile | 6 +++--- 10/buster-slim/Dockerfile | 4 ++-- 10/buster/Dockerfile | 4 ++-- 10/jessie-slim/Dockerfile | 4 ++-- 10/jessie/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index da66fe6bdd..614ab1ef67 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.19.0 +ENV NODE_VERSION 10.20.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="7d607297a0dd0b78861b4807733424ae288968d8653be644bedde123ddb0d96f" \ + CHECKSUM="741532f10edeb3ad05e2b179ad42b708fbfd5e1642a163580da7b73dfc7a18a4" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 859161e998..676edb2979 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.19.0 +ENV NODE_VERSION 10.20.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="7d607297a0dd0b78861b4807733424ae288968d8653be644bedde123ddb0d96f" \ + CHECKSUM="741532f10edeb3ad05e2b179ad42b708fbfd5e1642a163580da7b73dfc7a18a4" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index d976e9df2f..26caa46dbf 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.19.0 +ENV NODE_VERSION 10.20.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="7d607297a0dd0b78861b4807733424ae288968d8653be644bedde123ddb0d96f" \ + CHECKSUM="741532f10edeb3ad05e2b179ad42b708fbfd5e1642a163580da7b73dfc7a18a4" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 2154051810..7b60506765 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.19.0 +ENV NODE_VERSION 10.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 26521ae100..230bbf0a4a 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.19.0 +ENV NODE_VERSION 10.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index cbccbae83c..906cdc8790 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.19.0 +ENV NODE_VERSION 10.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index a01987f3ec..c1fe7c6640 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.19.0 +ENV NODE_VERSION 10.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index b07de85c2a..4697eb2a8d 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.19.0 +ENV NODE_VERSION 10.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 0daaf98afb..d302599ed9 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.19.0 +ENV NODE_VERSION 10.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.21.1 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ From eb9bb348eec67c1c5682e06fdb93aa45e294aa26 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 8 Apr 2020 17:02:19 -0400 Subject: [PATCH 349/818] feat: Update to Node 12.16.2 and Yarn 1.22.4 --- 12/alpine3.10/Dockerfile | 6 +++--- 12/alpine3.11/Dockerfile | 6 +++--- 12/alpine3.9/Dockerfile | 6 +++--- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index de0550a1df..f1792f1c3a 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.16.1 +ENV NODE_VERSION 12.16.2 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="7606d86e842b710e4321fe1c7f7a32a8e145f5e0659de406399cda5a37411d92" \ + CHECKSUM="f6b8bb0ee376cd1e7096f15b68efc3bb6adbd2cb33a12002d5982384b733dcab" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index a383ad8e25..8462ba391d 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.16.1 +ENV NODE_VERSION 12.16.2 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="7606d86e842b710e4321fe1c7f7a32a8e145f5e0659de406399cda5a37411d92" \ + CHECKSUM="f6b8bb0ee376cd1e7096f15b68efc3bb6adbd2cb33a12002d5982384b733dcab" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 430682c442..3dbf92ee74 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.16.1 +ENV NODE_VERSION 12.16.2 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="7606d86e842b710e4321fe1c7f7a32a8e145f5e0659de406399cda5a37411d92" \ + CHECKSUM="f6b8bb0ee376cd1e7096f15b68efc3bb6adbd2cb33a12002d5982384b733dcab" \ ;; \ *) ;; \ esac \ @@ -72,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index f1b4ca95b2..a681392cfa 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.16.1 +ENV NODE_VERSION 12.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 002df9e8d3..f901c38399 100644 --- a/12/buster/Dockerfile +++ b/12/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.16.1 +ENV NODE_VERSION 12.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index cf0bfdec3c..4e76d62d29 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.16.1 +ENV NODE_VERSION 12.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -56,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 898c87a33c..149ad297c3 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.16.1 +ENV NODE_VERSION 12.16.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.0 +ENV YARN_VERSION 1.22.4 RUN set -ex \ && for key in \ From d071b895dd1b8da6c566f45b971825fe5b087b21 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 12 Apr 2020 23:05:55 +0800 Subject: [PATCH 350/818] Update node.js v10 from v10.20.0 to v10.20.1 - https://nodejs.org/en/blog/release/v10.20.1/ - https://github.com/nodejs/node/releases/tag/v10.20.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.20.1 --- 10/alpine3.10/Dockerfile | 4 ++-- 10/alpine3.11/Dockerfile | 4 ++-- 10/alpine3.9/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 614ab1ef67..4c015659f7 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.20.0 +ENV NODE_VERSION 10.20.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="741532f10edeb3ad05e2b179ad42b708fbfd5e1642a163580da7b73dfc7a18a4" \ + CHECKSUM="a6376dd6e736a74098d1050d6653c346fde1d5416d83f063cb66510cdfea7a6d" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 676edb2979..e45065ec2e 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.20.0 +ENV NODE_VERSION 10.20.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="741532f10edeb3ad05e2b179ad42b708fbfd5e1642a163580da7b73dfc7a18a4" \ + CHECKSUM="a6376dd6e736a74098d1050d6653c346fde1d5416d83f063cb66510cdfea7a6d" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index 26caa46dbf..6d99e0ca84 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.20.0 +ENV NODE_VERSION 10.20.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="741532f10edeb3ad05e2b179ad42b708fbfd5e1642a163580da7b73dfc7a18a4" \ + CHECKSUM="a6376dd6e736a74098d1050d6653c346fde1d5416d83f063cb66510cdfea7a6d" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 7b60506765..f57c3b6747 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.20.0 +ENV NODE_VERSION 10.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 230bbf0a4a..a138f9b5ff 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.20.0 +ENV NODE_VERSION 10.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 906cdc8790..5320cac1e4 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.20.0 +ENV NODE_VERSION 10.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index c1fe7c6640..eff12a51f2 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.20.0 +ENV NODE_VERSION 10.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 4697eb2a8d..898d92c7eb 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.20.0 +ENV NODE_VERSION 10.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index d302599ed9..c6a70bacb5 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.20.0 +ENV NODE_VERSION 10.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1af60135115827cb8f32eb4075949bbcc67895e3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 14 Apr 2020 15:54:08 -0400 Subject: [PATCH 351/818] feat: Update to Node 13.13.0 --- 13/alpine3.10/Dockerfile | 4 ++-- 13/alpine3.11/Dockerfile | 4 ++-- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 5963dedd24..69acfe93d3 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.12.0 +ENV NODE_VERSION 13.13.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="2be1914d44aafdb6d0b41b8f78eb19dc7cbec21738e1f06d37ac2d06405c260f" \ + CHECKSUM="f552e1a09f257494cf54cd91c0bd9752993e262edf9dc14fd91dbc13468c980b" \ ;; \ *) ;; \ esac \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index ad5e576bee..bd175f8b01 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.12.0 +ENV NODE_VERSION 13.13.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="2be1914d44aafdb6d0b41b8f78eb19dc7cbec21738e1f06d37ac2d06405c260f" \ + CHECKSUM="f552e1a09f257494cf54cd91c0bd9752993e262edf9dc14fd91dbc13468c980b" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index a42cd2c453..495e167915 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.12.0 +ENV NODE_VERSION 13.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index fa1a0364c6..f74449a1e2 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.12.0 +ENV NODE_VERSION 13.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index f70dc77c4c..528ee587f0 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.12.0 +ENV NODE_VERSION 13.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index a160cbcfe4..dd1449c9db 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.12.0 +ENV NODE_VERSION 13.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 2d82f7b12b855d3ce857f09efcf2c5508f0fe26b Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 21 Apr 2020 19:39:00 +0200 Subject: [PATCH 352/818] feat: add node 14 --- .travis.yml | 42 +++++++++++ 14/alpine3.10/Dockerfile | 100 +++++++++++++++++++++++++++ 14/alpine3.10/docker-entrypoint.sh | 8 +++ 14/alpine3.11/Dockerfile | 100 +++++++++++++++++++++++++++ 14/alpine3.11/docker-entrypoint.sh | 8 +++ 14/architectures | 8 +++ 14/buster-slim/Dockerfile | 96 +++++++++++++++++++++++++ 14/buster-slim/docker-entrypoint.sh | 8 +++ 14/buster/Dockerfile | 72 +++++++++++++++++++ 14/buster/docker-entrypoint.sh | 8 +++ 14/stretch-slim/Dockerfile | 96 +++++++++++++++++++++++++ 14/stretch-slim/docker-entrypoint.sh | 8 +++ 14/stretch/Dockerfile | 72 +++++++++++++++++++ 14/stretch/docker-entrypoint.sh | 8 +++ generate-stackbrew-library.sh | 4 +- 15 files changed, 637 insertions(+), 1 deletion(-) create mode 100644 14/alpine3.10/Dockerfile create mode 100755 14/alpine3.10/docker-entrypoint.sh create mode 100644 14/alpine3.11/Dockerfile create mode 100755 14/alpine3.11/docker-entrypoint.sh create mode 100644 14/architectures create mode 100644 14/buster-slim/Dockerfile create mode 100755 14/buster-slim/docker-entrypoint.sh create mode 100644 14/buster/Dockerfile create mode 100755 14/buster/docker-entrypoint.sh create mode 100644 14/stretch-slim/Dockerfile create mode 100755 14/stretch-slim/docker-entrypoint.sh create mode 100644 14/stretch/Dockerfile create mode 100755 14/stretch/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 3fd72f5996..681ddaab0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -220,3 +220,45 @@ jobs: env: - NODE_VERSION="13" - VARIANT="alpine3.11" + + - stage: Build + before_script: *auto_skip + name: 14 on stretch + env: + - NODE_VERSION="14" + - VARIANT="stretch" + + - stage: Build + before_script: *auto_skip + name: 14 on stretch-slim + env: + - NODE_VERSION="14" + - VARIANT="stretch-slim" + + - stage: Build + before_script: *auto_skip + name: 14 on buster + env: + - NODE_VERSION="14" + - VARIANT="buster" + + - stage: Build + before_script: *auto_skip + name: 14 on buster-slim + env: + - NODE_VERSION="14" + - VARIANT="buster-slim" + + - stage: Build + before_script: *auto_skip + name: 14 on alpine3.10 + env: + - NODE_VERSION="14" + - VARIANT="alpine3.10" + + - stage: Build + before_script: *auto_skip + name: 14 on alpine3.11 + env: + - NODE_VERSION="14" + - VARIANT="alpine3.11" diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile new file mode 100644 index 0000000000..98a83c2597 --- /dev/null +++ b/14/alpine3.10/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 14.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="35f023387926a231fd64d204526ff15f501417b576ce3bf46002af7823c5fbd0" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/alpine3.10/docker-entrypoint.sh b/14/alpine3.10/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/alpine3.10/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile new file mode 100644 index 0000000000..ca3f97ec2f --- /dev/null +++ b/14/alpine3.11/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.11 + +ENV NODE_VERSION 14.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="35f023387926a231fd64d204526ff15f501417b576ce3bf46002af7823c5fbd0" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/alpine3.11/docker-entrypoint.sh b/14/alpine3.11/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/alpine3.11/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/architectures b/14/architectures new file mode 100644 index 0000000000..e7d6c981d1 --- /dev/null +++ b/14/architectures @@ -0,0 +1,8 @@ +bashbrew-arch variants +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +arm32v6 alpine3.10,alpine3.11 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +i386 alpine3.10,alpine3.11 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile new file mode 100644 index 0000000000..ae5fc4431b --- /dev/null +++ b/14/buster-slim/Dockerfile @@ -0,0 +1,96 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 14.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/buster-slim/docker-entrypoint.sh b/14/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile new file mode 100644 index 0000000000..a200185e57 --- /dev/null +++ b/14/buster/Dockerfile @@ -0,0 +1,72 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 14.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/buster/docker-entrypoint.sh b/14/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile new file mode 100644 index 0000000000..b777d9668d --- /dev/null +++ b/14/stretch-slim/Dockerfile @@ -0,0 +1,96 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 14.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/stretch-slim/docker-entrypoint.sh b/14/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile new file mode 100644 index 0000000000..6c315a08dd --- /dev/null +++ b/14/stretch/Dockerfile @@ -0,0 +1,72 @@ +FROM buildpack-deps:stretch + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 14.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/stretch/docker-entrypoint.sh b/14/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d030d3f950..b5550ab199 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,7 +11,9 @@ array_10='10 dubnium' # shellcheck disable=SC2034 array_12='12 erbium lts current' # shellcheck disable=SC2034 -array_13='13 latest' +array_13='13' +# shellcheck disable=SC2034 +array_14='14 latest' default_variant=$(get_config "./" "default_variant") From 33f5de2fa1cdba181e4f7c0e4fe2f155e58e20ae Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 21 Apr 2020 21:57:10 +0200 Subject: [PATCH 353/818] chore: tag node v14 as current --- generate-stackbrew-library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index b5550ab199..a346df5099 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,11 +9,11 @@ hash git 2> /dev/null || { echo >&2 "git not found, exiting."; } # shellcheck disable=SC2034 array_10='10 dubnium' # shellcheck disable=SC2034 -array_12='12 erbium lts current' +array_12='12 erbium lts' # shellcheck disable=SC2034 array_13='13' # shellcheck disable=SC2034 -array_14='14 latest' +array_14='14 latest current' default_variant=$(get_config "./" "default_variant") From 10e2c2254c41237a266192070559734f12d8dae7 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 28 Apr 2020 22:50:49 +0800 Subject: [PATCH 354/818] Update node.js v12 from v12.16.2 to v12.16.3 - https://github.com/nodejs/node/releases/tag/v12.16.3 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.16.3 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index f1792f1c3a..7706798fdd 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.16.2 +ENV NODE_VERSION 12.16.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="f6b8bb0ee376cd1e7096f15b68efc3bb6adbd2cb33a12002d5982384b733dcab" \ + CHECKSUM="af47aa64de372d9a9d16307b6af9785ee28bdf9892f1de28a78b85917dacf257" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 8462ba391d..842dc18020 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.16.2 +ENV NODE_VERSION 12.16.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="f6b8bb0ee376cd1e7096f15b68efc3bb6adbd2cb33a12002d5982384b733dcab" \ + CHECKSUM="af47aa64de372d9a9d16307b6af9785ee28bdf9892f1de28a78b85917dacf257" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 3dbf92ee74..4907965466 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.16.2 +ENV NODE_VERSION 12.16.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="f6b8bb0ee376cd1e7096f15b68efc3bb6adbd2cb33a12002d5982384b733dcab" \ + CHECKSUM="af47aa64de372d9a9d16307b6af9785ee28bdf9892f1de28a78b85917dacf257" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index a681392cfa..984c3f324b 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.16.2 +ENV NODE_VERSION 12.16.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index f901c38399..0cf65c3563 100644 --- a/12/buster/Dockerfile +++ b/12/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.16.2 +ENV NODE_VERSION 12.16.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 4e76d62d29..c58959c58c 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.16.2 +ENV NODE_VERSION 12.16.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 149ad297c3..c4399c0d47 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.16.2 +ENV NODE_VERSION 12.16.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From bf9fb2d1126062e27d0b763674064bb17da4718c Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 30 Apr 2020 12:43:51 +0800 Subject: [PATCH 355/818] Update node.js v13 from 13.12.0 to 13.13.0 - https://nodejs.org/en/blog/release/v13.13.0/ - https://github.com/nodejs/node/releases/tag/v13.13.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V13.md#13.13.0 --- 13/alpine3.10/Dockerfile | 4 ++-- 13/alpine3.11/Dockerfile | 4 ++-- 13/buster-slim/Dockerfile | 2 +- 13/buster/Dockerfile | 2 +- 13/stretch-slim/Dockerfile | 2 +- 13/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile index 69acfe93d3..d6240ff9ed 100644 --- a/13/alpine3.10/Dockerfile +++ b/13/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 13.13.0 +ENV NODE_VERSION 13.14.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="f552e1a09f257494cf54cd91c0bd9752993e262edf9dc14fd91dbc13468c980b" \ + CHECKSUM="09f7f82b8149a0c009f68d18e7d53ef344b9df8b18ddbbf3ff883a066d7caebc" \ ;; \ *) ;; \ esac \ diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile index bd175f8b01..076cc535f1 100644 --- a/13/alpine3.11/Dockerfile +++ b/13/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 13.13.0 +ENV NODE_VERSION 13.14.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="f552e1a09f257494cf54cd91c0bd9752993e262edf9dc14fd91dbc13468c980b" \ + CHECKSUM="09f7f82b8149a0c009f68d18e7d53ef344b9df8b18ddbbf3ff883a066d7caebc" \ ;; \ *) ;; \ esac \ diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile index 495e167915..18721e8c3f 100644 --- a/13/buster-slim/Dockerfile +++ b/13/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 13.13.0 +ENV NODE_VERSION 13.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile index f74449a1e2..71f038d7f1 100644 --- a/13/buster/Dockerfile +++ b/13/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 13.13.0 +ENV NODE_VERSION 13.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile index 528ee587f0..89d2abaf03 100644 --- a/13/stretch-slim/Dockerfile +++ b/13/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 13.13.0 +ENV NODE_VERSION 13.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile index dd1449c9db..26b708299a 100644 --- a/13/stretch/Dockerfile +++ b/13/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 13.13.0 +ENV NODE_VERSION 13.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 38922cd36cc63f8b5f114c4c97b08eba3f559446 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 30 Apr 2020 12:44:31 +0800 Subject: [PATCH 356/818] Update node.js v14 from 14.0.0 to 14.1.0 - https://nodejs.org/en/blog/release/v14.1.0/ - https://github.com/nodejs/node/releases/tag/v14.1.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.1.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 98a83c2597..958002bc8f 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.0.0 +ENV NODE_VERSION 14.1.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="35f023387926a231fd64d204526ff15f501417b576ce3bf46002af7823c5fbd0" \ + CHECKSUM="7f270e808073ea0bc81f65dc1d1c1d4e179371f564b86cd2991fae0e2e8cd579" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index ca3f97ec2f..123b33b35f 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.0.0 +ENV NODE_VERSION 14.1.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="35f023387926a231fd64d204526ff15f501417b576ce3bf46002af7823c5fbd0" \ + CHECKSUM="7f270e808073ea0bc81f65dc1d1c1d4e179371f564b86cd2991fae0e2e8cd579" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index ae5fc4431b..21fe635e00 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.0.0 +ENV NODE_VERSION 14.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index a200185e57..8cb3f63c83 100644 --- a/14/buster/Dockerfile +++ b/14/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.0.0 +ENV NODE_VERSION 14.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index b777d9668d..ba119d04f3 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.0.0 +ENV NODE_VERSION 14.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 6c315a08dd..41871d93a3 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.0.0 +ENV NODE_VERSION 14.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 910f8b1c0bdeee7bd464f0875297954bb86de9da Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 6 May 2020 08:12:53 +0800 Subject: [PATCH 357/818] Update node.js v14 from 14.1.0 to 14.2.0 - https://nodejs.org/en/blog/release/v14.2.0/ - https://github.com/nodejs/node/releases/tag/v14.2.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.2.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 958002bc8f..973309e1ff 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.1.0 +ENV NODE_VERSION 14.2.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="7f270e808073ea0bc81f65dc1d1c1d4e179371f564b86cd2991fae0e2e8cd579" \ + CHECKSUM="3a621e3d8f4186520c2bf1a81613e526f1f52a097bf945af5fa38d5496b12a8b" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 123b33b35f..1d8849d9fd 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.1.0 +ENV NODE_VERSION 14.2.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="7f270e808073ea0bc81f65dc1d1c1d4e179371f564b86cd2991fae0e2e8cd579" \ + CHECKSUM="3a621e3d8f4186520c2bf1a81613e526f1f52a097bf945af5fa38d5496b12a8b" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 21fe635e00..ffd0eb6d71 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.1.0 +ENV NODE_VERSION 14.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 8cb3f63c83..498eb702b8 100644 --- a/14/buster/Dockerfile +++ b/14/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.1.0 +ENV NODE_VERSION 14.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index ba119d04f3..c63d40efbc 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.1.0 +ENV NODE_VERSION 14.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 41871d93a3..a1c6f15779 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.1.0 +ENV NODE_VERSION 14.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 2f7f7ebce71a98dd8fe2182a0adf8f6db952ca80 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 20 May 2020 11:02:39 +0800 Subject: [PATCH 358/818] Update node.js v14 from 14.2.0 to 14.3.0 - https://nodejs.org/en/blog/release/v14.3.0/ - https://github.com/nodejs/node/releases/tag/v14.3.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.3.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 973309e1ff..b41a718abb 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.2.0 +ENV NODE_VERSION 14.3.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="3a621e3d8f4186520c2bf1a81613e526f1f52a097bf945af5fa38d5496b12a8b" \ + CHECKSUM="685b6e68eb0fa5cc531cdf413535caf348873f4b397639969fdfb3896255ea99" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 1d8849d9fd..bbc9149933 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.2.0 +ENV NODE_VERSION 14.3.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="3a621e3d8f4186520c2bf1a81613e526f1f52a097bf945af5fa38d5496b12a8b" \ + CHECKSUM="685b6e68eb0fa5cc531cdf413535caf348873f4b397639969fdfb3896255ea99" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index ffd0eb6d71..23e3d82d6c 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.2.0 +ENV NODE_VERSION 14.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 498eb702b8..971744093b 100644 --- a/14/buster/Dockerfile +++ b/14/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.2.0 +ENV NODE_VERSION 14.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index c63d40efbc..4ba8b969fc 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.2.0 +ENV NODE_VERSION 14.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index a1c6f15779..9642152a5d 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.2.0 +ENV NODE_VERSION 14.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 58bfdf5b81f821cf8f219c06c4dcf09eedbc95a2 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 26 May 2020 17:40:29 +0200 Subject: [PATCH 359/818] Update from 12.16.3 to 12.17.0 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 7706798fdd..b110c75772 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.16.3 +ENV NODE_VERSION 12.17.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="af47aa64de372d9a9d16307b6af9785ee28bdf9892f1de28a78b85917dacf257" \ + CHECKSUM="fbd8916cc5a3c85dc503cc1fe9606cf8860152c4e8b2f2fcc729e48db3e3d654" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 842dc18020..6f3ce7233f 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.16.3 +ENV NODE_VERSION 12.17.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="af47aa64de372d9a9d16307b6af9785ee28bdf9892f1de28a78b85917dacf257" \ + CHECKSUM="fbd8916cc5a3c85dc503cc1fe9606cf8860152c4e8b2f2fcc729e48db3e3d654" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 4907965466..09b185d029 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.16.3 +ENV NODE_VERSION 12.17.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="af47aa64de372d9a9d16307b6af9785ee28bdf9892f1de28a78b85917dacf257" \ + CHECKSUM="fbd8916cc5a3c85dc503cc1fe9606cf8860152c4e8b2f2fcc729e48db3e3d654" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 984c3f324b..40fde23006 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.16.3 +ENV NODE_VERSION 12.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 0cf65c3563..510053bb9e 100644 --- a/12/buster/Dockerfile +++ b/12/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.16.3 +ENV NODE_VERSION 12.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index c58959c58c..ea3d353c7b 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.16.3 +ENV NODE_VERSION 12.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index c4399c0d47..accc2b7e31 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.16.3 +ENV NODE_VERSION 12.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 94a4913649bf6b3d13da30c4cb480770a86b3877 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 2 Jun 2020 12:26:14 -0400 Subject: [PATCH 360/818] feat: Drop v13 now at EOL Hit EOL on June 1st --- .travis.yml | 42 ----------- 13/alpine3.10/Dockerfile | 100 --------------------------- 13/alpine3.10/docker-entrypoint.sh | 8 --- 13/alpine3.11/Dockerfile | 100 --------------------------- 13/alpine3.11/docker-entrypoint.sh | 8 --- 13/architectures | 8 --- 13/buster-slim/Dockerfile | 96 ------------------------- 13/buster-slim/docker-entrypoint.sh | 8 --- 13/buster/Dockerfile | 72 ------------------- 13/buster/docker-entrypoint.sh | 8 --- 13/stretch-slim/Dockerfile | 96 ------------------------- 13/stretch-slim/docker-entrypoint.sh | 8 --- 13/stretch/Dockerfile | 72 ------------------- 13/stretch/docker-entrypoint.sh | 8 --- generate-stackbrew-library.sh | 2 - 15 files changed, 636 deletions(-) delete mode 100644 13/alpine3.10/Dockerfile delete mode 100755 13/alpine3.10/docker-entrypoint.sh delete mode 100644 13/alpine3.11/Dockerfile delete mode 100755 13/alpine3.11/docker-entrypoint.sh delete mode 100644 13/architectures delete mode 100644 13/buster-slim/Dockerfile delete mode 100755 13/buster-slim/docker-entrypoint.sh delete mode 100644 13/buster/Dockerfile delete mode 100755 13/buster/docker-entrypoint.sh delete mode 100644 13/stretch-slim/Dockerfile delete mode 100755 13/stretch-slim/docker-entrypoint.sh delete mode 100644 13/stretch/Dockerfile delete mode 100755 13/stretch/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 681ddaab0a..6b411bf095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -179,48 +179,6 @@ jobs: - NODE_VERSION="12" - VARIANT="alpine3.11" - - stage: Build - before_script: *auto_skip - name: 13 on stretch - env: - - NODE_VERSION="13" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 13 on stretch-slim - env: - - NODE_VERSION="13" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 13 on buster - env: - - NODE_VERSION="13" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 13 on buster-slim - env: - - NODE_VERSION="13" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 13 on alpine3.10 - env: - - NODE_VERSION="13" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 13 on alpine3.11 - env: - - NODE_VERSION="13" - - VARIANT="alpine3.11" - - stage: Build before_script: *auto_skip name: 14 on stretch diff --git a/13/alpine3.10/Dockerfile b/13/alpine3.10/Dockerfile deleted file mode 100644 index d6240ff9ed..0000000000 --- a/13/alpine3.10/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.10 - -ENV NODE_VERSION 13.14.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="09f7f82b8149a0c009f68d18e7d53ef344b9df8b18ddbbf3ff883a066d7caebc" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/13/alpine3.10/docker-entrypoint.sh b/13/alpine3.10/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/13/alpine3.10/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/13/alpine3.11/Dockerfile b/13/alpine3.11/Dockerfile deleted file mode 100644 index 076cc535f1..0000000000 --- a/13/alpine3.11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.11 - -ENV NODE_VERSION 13.14.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="09f7f82b8149a0c009f68d18e7d53ef344b9df8b18ddbbf3ff883a066d7caebc" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/13/alpine3.11/docker-entrypoint.sh b/13/alpine3.11/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/13/alpine3.11/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/13/architectures b/13/architectures deleted file mode 100644 index e7d6c981d1..0000000000 --- a/13/architectures +++ /dev/null @@ -1,8 +0,0 @@ -bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -arm32v6 alpine3.10,alpine3.11 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -i386 alpine3.10,alpine3.11 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 diff --git a/13/buster-slim/Dockerfile b/13/buster-slim/Dockerfile deleted file mode 100644 index 18721e8c3f..0000000000 --- a/13/buster-slim/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 13.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/13/buster-slim/docker-entrypoint.sh b/13/buster-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/13/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/13/buster/Dockerfile b/13/buster/Dockerfile deleted file mode 100644 index 71f038d7f1..0000000000 --- a/13/buster/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 13.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/13/buster/docker-entrypoint.sh b/13/buster/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/13/buster/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/13/stretch-slim/Dockerfile b/13/stretch-slim/Dockerfile deleted file mode 100644 index 89d2abaf03..0000000000 --- a/13/stretch-slim/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 13.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/13/stretch-slim/docker-entrypoint.sh b/13/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/13/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/13/stretch/Dockerfile b/13/stretch/Dockerfile deleted file mode 100644 index 26b708299a..0000000000 --- a/13/stretch/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 13.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/13/stretch/docker-entrypoint.sh b/13/stretch/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/13/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a346df5099..2222c17823 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,8 +11,6 @@ array_10='10 dubnium' # shellcheck disable=SC2034 array_12='12 erbium lts' # shellcheck disable=SC2034 -array_13='13' -# shellcheck disable=SC2034 array_14='14 latest current' default_variant=$(get_config "./" "default_variant") From 18ed56ea9ba03c16f48372927f5eb2553033e8de Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 2 Jun 2020 16:40:36 -0400 Subject: [PATCH 361/818] feat: Update to v14.4.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index b41a718abb..9923caf4bf 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.3.0 +ENV NODE_VERSION 14.4.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="685b6e68eb0fa5cc531cdf413535caf348873f4b397639969fdfb3896255ea99" \ + CHECKSUM="c33037cadcd6caab8593b1b3f8befad6137b621378462fad24b4100eba879e4c" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index bbc9149933..2518b03f84 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.3.0 +ENV NODE_VERSION 14.4.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="685b6e68eb0fa5cc531cdf413535caf348873f4b397639969fdfb3896255ea99" \ + CHECKSUM="c33037cadcd6caab8593b1b3f8befad6137b621378462fad24b4100eba879e4c" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 23e3d82d6c..241a472539 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.3.0 +ENV NODE_VERSION 14.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 971744093b..da103e3ff5 100644 --- a/14/buster/Dockerfile +++ b/14/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.3.0 +ENV NODE_VERSION 14.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 4ba8b969fc..9b3fe40c0d 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.3.0 +ENV NODE_VERSION 14.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 9642152a5d..5fc7327a33 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.3.0 +ENV NODE_VERSION 14.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From cc23289cffb36d96cffdc2055122858a1c0614a3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 2 Jun 2020 18:04:50 -0400 Subject: [PATCH 362/818] feat: Update to v10.21.0 --- 10/alpine3.10/Dockerfile | 4 ++-- 10/alpine3.11/Dockerfile | 4 ++-- 10/alpine3.9/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/jessie-slim/Dockerfile | 2 +- 10/jessie/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 4c015659f7..4bef827688 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.20.1 +ENV NODE_VERSION 10.21.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="a6376dd6e736a74098d1050d6653c346fde1d5416d83f063cb66510cdfea7a6d" \ + CHECKSUM="355919f1ccf585c4078fffeff1e3d0a0e44855f5d84777bbf110db131093aafe" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index e45065ec2e..459c37c643 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.20.1 +ENV NODE_VERSION 10.21.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="a6376dd6e736a74098d1050d6653c346fde1d5416d83f063cb66510cdfea7a6d" \ + CHECKSUM="355919f1ccf585c4078fffeff1e3d0a0e44855f5d84777bbf110db131093aafe" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index 6d99e0ca84..289de4dc9b 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.20.1 +ENV NODE_VERSION 10.21.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="a6376dd6e736a74098d1050d6653c346fde1d5416d83f063cb66510cdfea7a6d" \ + CHECKSUM="355919f1ccf585c4078fffeff1e3d0a0e44855f5d84777bbf110db131093aafe" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index f57c3b6747..f84d133e65 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.20.1 +ENV NODE_VERSION 10.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index a138f9b5ff..9bd2244c11 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.20.1 +ENV NODE_VERSION 10.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 5320cac1e4..7df4ecf039 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.20.1 +ENV NODE_VERSION 10.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile index eff12a51f2..64c765ec70 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.20.1 +ENV NODE_VERSION 10.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 898d92c7eb..f4757c2ecd 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.20.1 +ENV NODE_VERSION 10.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index c6a70bacb5..8272f60b5b 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.20.1 +ENV NODE_VERSION 10.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 0acac6b0224a313d5e6c4b233bf38c1eaaf11849 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 2 Jun 2020 18:05:08 -0400 Subject: [PATCH 363/818] feat: Update to v12.18.0 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index b110c75772..d4873527f0 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.17.0 +ENV NODE_VERSION 12.18.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="fbd8916cc5a3c85dc503cc1fe9606cf8860152c4e8b2f2fcc729e48db3e3d654" \ + CHECKSUM="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 6f3ce7233f..cfb84aa75b 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.17.0 +ENV NODE_VERSION 12.18.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="fbd8916cc5a3c85dc503cc1fe9606cf8860152c4e8b2f2fcc729e48db3e3d654" \ + CHECKSUM="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 09b185d029..bd5ad8ddc5 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.17.0 +ENV NODE_VERSION 12.18.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="fbd8916cc5a3c85dc503cc1fe9606cf8860152c4e8b2f2fcc729e48db3e3d654" \ + CHECKSUM="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 40fde23006..87b6af1188 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.17.0 +ENV NODE_VERSION 12.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 510053bb9e..bed7dcd5ad 100644 --- a/12/buster/Dockerfile +++ b/12/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.17.0 +ENV NODE_VERSION 12.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index ea3d353c7b..88f5a29387 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.17.0 +ENV NODE_VERSION 12.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index accc2b7e31..a60fadd5dc 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.17.0 +ENV NODE_VERSION 12.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9b96de59fa55206ae177e138bdb506308ecb4d80 Mon Sep 17 00:00:00 2001 From: Bence Laky Date: Sat, 30 May 2020 12:14:34 +0200 Subject: [PATCH 364/818] Add support for Alpine 3.12 --- .travis.yml | 14 ++++ 12/alpine3.12/Dockerfile | 100 +++++++++++++++++++++++++++++ 12/alpine3.12/docker-entrypoint.sh | 8 +++ 12/architectures | 14 ++-- 14/alpine3.12/Dockerfile | 100 +++++++++++++++++++++++++++++ 14/alpine3.12/docker-entrypoint.sh | 8 +++ 14/architectures | 14 ++-- architectures | 14 ++-- 8 files changed, 251 insertions(+), 21 deletions(-) create mode 100644 12/alpine3.12/Dockerfile create mode 100755 12/alpine3.12/docker-entrypoint.sh create mode 100644 14/alpine3.12/Dockerfile create mode 100755 14/alpine3.12/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 6b411bf095..8a7fd3f1c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -179,6 +179,13 @@ jobs: - NODE_VERSION="12" - VARIANT="alpine3.11" + - stage: Build + before_script: *auto_skip + name: 12 on alpine3.12 + env: + - NODE_VERSION="12" + - VARIANT="alpine3.12" + - stage: Build before_script: *auto_skip name: 14 on stretch @@ -220,3 +227,10 @@ jobs: env: - NODE_VERSION="14" - VARIANT="alpine3.11" + + - stage: Build + before_script: *auto_skip + name: 14 on alpine3.12 + env: + - NODE_VERSION="14" + - VARIANT="alpine3.12" diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile new file mode 100644 index 0000000000..19b0dd6fe5 --- /dev/null +++ b/12/alpine3.12/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.12 + +ENV NODE_VERSION 12.18.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/alpine3.12/docker-entrypoint.sh b/12/alpine3.12/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/alpine3.12/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/architectures b/12/architectures index 5dfbc16e32..d2e1de551b 100644 --- a/12/architectures +++ b/12/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -arm32v6 alpine3.9,alpine3.10,alpine3.11 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -i386 alpine3.9,alpine3.10,alpine3.11 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm32v6 alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +i386 alpine3.9,alpine3.10,alpine3.11,alpine3.12 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile new file mode 100644 index 0000000000..83380d55ed --- /dev/null +++ b/14/alpine3.12/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.12 + +ENV NODE_VERSION 14.4.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="c33037cadcd6caab8593b1b3f8befad6137b621378462fad24b4100eba879e4c" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + FD3A5288F042B6850C66B31F09FE44734EB7990E \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + 77984A986EBC2AA786BC0F66B01FBB92821C587A \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.4 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/alpine3.12/docker-entrypoint.sh b/14/alpine3.12/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/alpine3.12/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/architectures b/14/architectures index e7d6c981d1..2afcdbc782 100644 --- a/14/architectures +++ b/14/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -arm32v6 alpine3.10,alpine3.11 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -i386 alpine3.10,alpine3.11 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11 +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 +arm32v6 alpine3.10,alpine3.11,alpine3.12 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 +i386 alpine3.10,alpine3.11,alpine3.12 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 diff --git a/architectures b/architectures index 0d29de6a87..f051468688 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 From 9518f46153d0ab2a3ebb20bc24c28ee0c48af208 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 17 Jun 2020 22:50:47 +0200 Subject: [PATCH 365/818] fix: update to node 12.18.1 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index d4873527f0..e0cbb5c146 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.18.0 +ENV NODE_VERSION 12.18.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="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ + CHECKSUM="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index cfb84aa75b..2c4ecc5649 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.18.0 +ENV NODE_VERSION 12.18.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="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ + CHECKSUM="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 19b0dd6fe5..ccaa3ab622 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.18.0 +ENV NODE_VERSION 12.18.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="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ + CHECKSUM="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index bd5ad8ddc5..ac159290e2 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.18.0 +ENV NODE_VERSION 12.18.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="9b652a509823aad1deabb4def231ffff6220d111bf75ea91bf49352792c97122" \ + CHECKSUM="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 87b6af1188..d7ec9f0d48 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.0 +ENV NODE_VERSION 12.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index bed7dcd5ad..0d91646a41 100644 --- a/12/buster/Dockerfile +++ b/12/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.0 +ENV NODE_VERSION 12.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 88f5a29387..d78bf5ee45 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.18.0 +ENV NODE_VERSION 12.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index a60fadd5dc..51ac168871 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.18.0 +ENV NODE_VERSION 12.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1f26041ed1cdbe7df00004006c4105e6b960fc3e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 30 Jun 2020 22:47:33 +0800 Subject: [PATCH 366/818] Update node.js v12 from v12.18.1 to v12.18.2 - https://github.com/nodejs/node/releases/tag/v12.18.2 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.18.2 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index e0cbb5c146..e41cebe4be 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.18.1 +ENV NODE_VERSION 12.18.2 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="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ + CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 2c4ecc5649..688c3a2145 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.18.1 +ENV NODE_VERSION 12.18.2 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="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ + CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index ccaa3ab622..d4e2aae227 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.18.1 +ENV NODE_VERSION 12.18.2 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="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ + CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index ac159290e2..fc8124e409 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.18.1 +ENV NODE_VERSION 12.18.2 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="dbe26351b57cabd0fd41a8ad5f688a4e9f2e1e037bd984c2fa14852e1ac46a94" \ + CHECKSUM="bd85af8f081a15fc7e957fa129dc7bd5f6926a1104a98ca502982b8ffb8053be" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index d7ec9f0d48..02da40ba4e 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.1 +ENV NODE_VERSION 12.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 0d91646a41..0f0a3b5e37 100644 --- a/12/buster/Dockerfile +++ b/12/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.1 +ENV NODE_VERSION 12.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index d78bf5ee45..a51c3aaea5 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.18.1 +ENV NODE_VERSION 12.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 51ac168871..773bea89f4 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.18.1 +ENV NODE_VERSION 12.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1d6a051d71e817f3947612a260ddcb02e48c2f74 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 30 Jun 2020 20:28:32 -0400 Subject: [PATCH 367/818] feat: Update 14.4.0 to 14.5.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 9923caf4bf..d9091f8360 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.4.0 +ENV NODE_VERSION 14.5.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="c33037cadcd6caab8593b1b3f8befad6137b621378462fad24b4100eba879e4c" \ + CHECKSUM="06cd37ebff802dda592aee08c2ca015650d8a134dd95e945b7bd78c4b73a8bd5" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 2518b03f84..cedcc298e7 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.4.0 +ENV NODE_VERSION 14.5.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="c33037cadcd6caab8593b1b3f8befad6137b621378462fad24b4100eba879e4c" \ + CHECKSUM="06cd37ebff802dda592aee08c2ca015650d8a134dd95e945b7bd78c4b73a8bd5" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 83380d55ed..3f742d5342 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.4.0 +ENV NODE_VERSION 14.5.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="c33037cadcd6caab8593b1b3f8befad6137b621378462fad24b4100eba879e4c" \ + CHECKSUM="06cd37ebff802dda592aee08c2ca015650d8a134dd95e945b7bd78c4b73a8bd5" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 241a472539..2fe6b638b1 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.4.0 +ENV NODE_VERSION 14.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index da103e3ff5..2b5d614248 100644 --- a/14/buster/Dockerfile +++ b/14/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.4.0 +ENV NODE_VERSION 14.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 9b3fe40c0d..66e1734c3f 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.4.0 +ENV NODE_VERSION 14.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 5fc7327a33..58aabea5dc 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.4.0 +ENV NODE_VERSION 14.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 553b5e3b59972931b5f055a5cab8ea67479d954b Mon Sep 17 00:00:00 2001 From: Tommi Vainikainen Date: Mon, 6 Jul 2020 21:24:56 +0300 Subject: [PATCH 368/818] Remove chakracore config leftovers where subdir had versions --- functions.sh | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/functions.sh b/functions.sh index 5f37f3522c..be9c575396 100755 --- a/functions.sh +++ b/functions.sh @@ -46,10 +46,10 @@ function get_arch() { } # Get corresponding variants based on the architecture. -# All supported variants of each supported architecutre are listed in a +# All supported variants of each supported architecture are listed in a # file - 'architectures'. Its format is: -# ,... -# ,... +# ,... +# ,... function get_variants() { local dir dir=${1:-.} @@ -133,33 +133,17 @@ function get_config() { # Get available versions for a given path # -# If full or partial versions are provided then they are processed and -# validated. e.g. "6 chakracore" returns "6 chakracore/8" since it processed the -# chakracore entry and found it to be a fork rather than a complete version. -# # The result is a list of valid versions. function get_versions() { - local prefix - prefix=${1:-.} - shift - local versions=() - local dirs=("$@") + local dirs=() local default_variant default_variant=$(get_config "./" "default_variant") - if [ ${#dirs[@]} -eq 0 ]; then - IFS=' ' read -ra dirs <<< "$(echo "${prefix%/}/"*/)" - fi + IFS=' ' read -ra dirs <<< "$(echo "./"*/)" for dir in "${dirs[@]}"; do - if [ -a "${dir}/config" ]; then - local subdirs - IFS=' ' read -ra subdirs <<< "$(get_versions "${dir#./}")" - for subdir in "${subdirs[@]}"; do - versions+=("${subdir}") - done - elif [ -a "${dir}/Dockerfile" ] || [ -a "${dir}/${default_variant}/Dockerfile" ]; then + if [ -a "${dir}/Dockerfile" ] || [ -a "${dir}/${default_variant}/Dockerfile" ]; then versions+=("${dir#./}") fi done From 82d8c23efe9835f4d24d90c8dea0543701bb1101 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 16 Jul 2020 18:08:36 +0100 Subject: [PATCH 369/818] keys: add key for @richardlau Refs: https://github.com/nodejs/node/pull/34397 Refs: https://github.com/nodejs/Release/issues/585 --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index 94a01e332c..b79d53f9bd 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -9,3 +9,4 @@ B9AE9905FFD7803F25714661B63B535A4C206CA9 4ED778F539E3634C779C87C6D7062848A1AB005C A48C2BEE680E841632CD4E44F07496B3EB3C1762 B9E2F5981AA6E0CD28160D9FF13993A75599653C +C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C From 5fdf90de4d469036c18dfcbc184b73335d1a6161 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 16 Jul 2020 23:55:38 -0400 Subject: [PATCH 370/818] chore: Remove old signing keys --- keys/node.keys | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/keys/node.keys b/keys/node.keys index b79d53f9bd..6046b15c1c 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,12 +1,9 @@ +4ED778F539E3634C779C87C6D7062848A1AB005C 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 -FD3A5288F042B6850C66B31F09FE44734EB7990E 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 -DD8F2338BAE7501E3DD5AC78C273792F7D83545D -C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 -B9AE9905FFD7803F25714661B63B535A4C206CA9 -77984A986EBC2AA786BC0F66B01FBB92821C587A 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 -4ED778F539E3634C779C87C6D7062848A1AB005C +C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 +C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C +DD8F2338BAE7501E3DD5AC78C273792F7D83545D A48C2BEE680E841632CD4E44F07496B3EB3C1762 B9E2F5981AA6E0CD28160D9FF13993A75599653C -C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C From 744e358d7ddee039618e304f98b9f979152ecced Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 22 Jul 2020 02:09:48 +0800 Subject: [PATCH 371/818] Update node.js v10 from v10.21.0 to v10.22.0 - https://nodejs.org/en/blog/release/v10.22.0/ - https://github.com/nodejs/node/releases/tag/v10.22.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V10.md#10.22.0 --- 10/alpine3.10/Dockerfile | 5 +++-- 10/alpine3.11/Dockerfile | 5 +++-- 10/alpine3.9/Dockerfile | 5 +++-- 10/buster-slim/Dockerfile | 3 ++- 10/buster/Dockerfile | 3 ++- 10/jessie-slim/Dockerfile | 3 ++- 10/jessie/Dockerfile | 3 ++- 10/stretch-slim/Dockerfile | 3 ++- 10/stretch/Dockerfile | 3 ++- 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 4bef827688..7ee7a3bd41 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.21.0 +ENV NODE_VERSION 10.22.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="355919f1ccf585c4078fffeff1e3d0a0e44855f5d84777bbf110db131093aafe" \ + CHECKSUM="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ ;; \ *) ;; \ 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/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 459c37c643..4825469c8e 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.21.0 +ENV NODE_VERSION 10.22.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="355919f1ccf585c4078fffeff1e3d0a0e44855f5d84777bbf110db131093aafe" \ + CHECKSUM="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ ;; \ *) ;; \ 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/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index 289de4dc9b..d55ff21e4e 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.21.0 +ENV NODE_VERSION 10.22.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="355919f1ccf585c4078fffeff1e3d0a0e44855f5d84777bbf110db131093aafe" \ + CHECKSUM="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ ;; \ *) ;; \ 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/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index f84d133e65..16c01201ca 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.21.0 +ENV NODE_VERSION 10.22.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/10/buster/Dockerfile b/10/buster/Dockerfile index 9bd2244c11..838ba21f1a 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.21.0 +ENV NODE_VERSION 10.22.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/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile index 7df4ecf039..e1729be54b 100644 --- a/10/jessie-slim/Dockerfile +++ b/10/jessie-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 -ENV NODE_VERSION 10.21.0 +ENV NODE_VERSION 10.22.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/10/jessie/Dockerfile b/10/jessie/Dockerfile index 64c765ec70..c3ba688724 100644 --- a/10/jessie/Dockerfile +++ b/10/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 -ENV NODE_VERSION 10.21.0 +ENV NODE_VERSION 10.22.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/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index f4757c2ecd..ba8690eff5 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.21.0 +ENV NODE_VERSION 10.22.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/10/stretch/Dockerfile b/10/stretch/Dockerfile index 8272f60b5b..4999081c85 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.21.0 +ENV NODE_VERSION 10.22.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" || \ From 77bc184f0c0a642a74cb44687e89a475d06ec20b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 22 Jul 2020 02:24:04 -0400 Subject: [PATCH 372/818] feat: Update 14.5.0 to 14.6.0 --- 14/alpine3.10/Dockerfile | 5 +++-- 14/alpine3.11/Dockerfile | 5 +++-- 14/alpine3.12/Dockerfile | 5 +++-- 14/buster-slim/Dockerfile | 3 ++- 14/buster/Dockerfile | 3 ++- 14/stretch-slim/Dockerfile | 3 ++- 14/stretch/Dockerfile | 3 ++- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index d9091f8360..3ec4ee415e 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/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/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index cedcc298e7..41b5331804 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/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/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 3f742d5342..7a311153c5 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/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/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 2fe6b638b1..39f48c7167 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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/14/buster/Dockerfile b/14/buster/Dockerfile index 2b5d614248..201e3e582d 100644 --- a/14/buster/Dockerfile +++ b/14/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/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 66e1734c3f..b8f30c6fbb 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 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/14/stretch/Dockerfile b/14/stretch/Dockerfile index 58aabea5dc..dc66a49830 100644 --- a/14/stretch/Dockerfile +++ b/14/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 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" || \ From db2fe728780d431907da4583e490c50b4e5c785b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 22 Jul 2020 17:05:39 +0800 Subject: [PATCH 373/818] Add update-keys.sh for nodejs release keys update --- update-keys.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 update-keys.sh diff --git a/update-keys.sh b/update-keys.sh new file mode 100755 index 0000000000..31b8b63f54 --- /dev/null +++ b/update-keys.sh @@ -0,0 +1,3 @@ +#!/bin/sh -ex + +curl -fsSLo- --compressed https://github.com/nodejs/node/raw/master/README.md | awk '/^gpg --keyserver pool.sks-keyservers.net --recv-keys/ {print $NF}' > keys/node.keys From 6dbb02337e086149fc300089557e08d373de85e3 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 22 Jul 2020 17:56:58 -0700 Subject: [PATCH 374/818] Remove EOL Jessie variants, update Stretch LTS arches --- .travis.yml | 14 ----- 10/architectures | 8 +-- 10/jessie-slim/Dockerfile | 97 ----------------------------- 10/jessie-slim/docker-entrypoint.sh | 8 --- 10/jessie/Dockerfile | 73 ---------------------- 10/jessie/docker-entrypoint.sh | 8 --- 12/architectures | 4 +- 14/architectures | 4 +- architectures | 14 ++--- config | 2 +- 10 files changed, 16 insertions(+), 216 deletions(-) delete mode 100644 10/jessie-slim/Dockerfile delete mode 100755 10/jessie-slim/docker-entrypoint.sh delete mode 100644 10/jessie/Dockerfile delete mode 100755 10/jessie/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 8a7fd3f1c9..83ca542b9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,20 +67,6 @@ jobs: # Docker Build # - - stage: Build - before_script: *auto_skip - name: 10 on jessie - env: - - NODE_VERSION="10" - - VARIANT="jessie" - - - stage: Build - before_script: *auto_skip - name: 10 on jessie-slim - env: - - NODE_VERSION="10" - - VARIANT="jessie-slim" - - stage: Build before_script: *auto_skip name: 10 on stretch diff --git a/10/architectures b/10/architectures index 4af7322479..2816fd1bb3 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 arm32v6 alpine3.9,alpine3.10,alpine3.11 -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 i386 alpine3.9,alpine3.10,alpine3.11 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +ppc64le buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +s390x buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 diff --git a/10/jessie-slim/Dockerfile b/10/jessie-slim/Dockerfile deleted file mode 100644 index e1729be54b..0000000000 --- a/10/jessie-slim/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -FROM debian:jessie-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 10.22.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 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" || \ - 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/jessie-slim/docker-entrypoint.sh b/10/jessie-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/jessie-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/10/jessie/Dockerfile b/10/jessie/Dockerfile deleted file mode 100644 index c3ba688724..0000000000 --- a/10/jessie/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM buildpack-deps:jessie - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 10.22.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - 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" || \ - 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.4 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/jessie/docker-entrypoint.sh b/10/jessie/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/jessie/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/architectures b/12/architectures index d2e1de551b..b069c9d9da 100644 --- a/12/architectures +++ b/12/architectures @@ -4,5 +4,5 @@ arm32v6 alpine3.9,alpine3.10,alpine3.11,alpine3.12 arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 i386 alpine3.9,alpine3.10,alpine3.11,alpine3.12 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +ppc64le buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +s390x buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 diff --git a/14/architectures b/14/architectures index 2afcdbc782..b9eda449aa 100644 --- a/14/architectures +++ b/14/architectures @@ -4,5 +4,5 @@ arm32v6 alpine3.10,alpine3.11,alpine3.12 arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 i386 alpine3.10,alpine3.11,alpine3.12 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 +ppc64le buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 +s390x buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 diff --git a/architectures b/architectures index f051468688..822603ba90 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm32v6 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm32v7 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm64v8 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -i386 jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -ppc64le jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -s390x jessie,jessie-slim,stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm32v6 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +i386 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 diff --git a/config b/config index bd652eee00..101bfe76b1 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch alpine_version 3.11 -debian_versions jessie stretch buster +debian_versions stretch buster From fdd2b251827817ac7bb4f0b2b082483abff8ea77 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 23 Jul 2020 00:48:04 -0400 Subject: [PATCH 375/818] feat: Update 12.18.2 to 12.18.3 --- 12/alpine3.10/Dockerfile | 14 ++++++-------- 12/alpine3.11/Dockerfile | 14 ++++++-------- 12/alpine3.12/Dockerfile | 14 ++++++-------- 12/alpine3.9/Dockerfile | 14 ++++++-------- 12/buster-slim/Dockerfile | 12 +++++------- 12/buster/Dockerfile | 12 +++++------- 12/stretch-slim/Dockerfile | 12 +++++------- 12/stretch/Dockerfile | 12 +++++------- 8 files changed, 44 insertions(+), 60 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index e41cebe4be..38d63ee950 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/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/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 688c3a2145..ffb04675c2 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/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/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index d4e2aae227..053935b5a4 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/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/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index fc8124e409..dce084d1d4 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/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/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 02da40ba4e..bf17ae28c7 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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/12/buster/Dockerfile b/12/buster/Dockerfile index 0f0a3b5e37..339a8183a6 100644 --- a/12/buster/Dockerfile +++ b/12/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/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index a51c3aaea5..ec32edc9c4 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 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/12/stretch/Dockerfile b/12/stretch/Dockerfile index 773bea89f4..8475f9e40a 100644 --- a/12/stretch/Dockerfile +++ b/12/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 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 \ From e985c267cdde9d6dcb52f91a54236c8e38498acd Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 28 Jul 2020 13:00:32 +0200 Subject: [PATCH 376/818] chore: remove mention of jessie from SECURITY.md --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index f6cb6240c3..b6bd73dc9a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,6 +7,6 @@ Security issues relating to Node.js project should follow the process documented CVEs for the base image packages should be reported to those repositories. Nothing to address those CVEs is in the hands of this repos. - [Alpine](https://github.com/alpinelinux/docker-alpine) -- [Debian (buster, jessie, stretch)](https://github.com/debuerreotype/docker-debian-artifacts) +- [Debian (buster, stretch)](https://github.com/debuerreotype/docker-debian-artifacts) When base images are patched, the images are rebuilt and rolled out to the Docker hub without intervention by this repo. This process is explained in . From eb55191f0ead53944e86ccb99f230f3ca95148a5 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 30 Jul 2020 14:05:37 +0800 Subject: [PATCH 377/818] Update node.js v14 from 14.6.0 to 14.7.0 Node.js release keys were also updated, see #1291 #1290 - https://nodejs.org/en/blog/release/v14.7.0/ - https://github.com/nodejs/node/releases/tag/v14.7.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.7.0 --- 14/alpine3.10/Dockerfile | 15 ++++++--------- 14/alpine3.11/Dockerfile | 15 ++++++--------- 14/alpine3.12/Dockerfile | 15 ++++++--------- 14/buster-slim/Dockerfile | 13 +++++-------- 14/buster/Dockerfile | 13 +++++-------- 14/stretch-slim/Dockerfile | 13 +++++-------- 14/stretch/Dockerfile | 13 +++++-------- 7 files changed, 38 insertions(+), 59 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 3ec4ee415e..5ed46bd7f0 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.6.0 +ENV NODE_VERSION 14.7.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="3bf72b8895b508f91880f816705428933aea44b1f57dbe3f1fef7d7595b64872" \ + CHECKSUM="fc556b2b3f751e08d745e97bf6197d977de2a885a6080d0a731158c00ffbb02f" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,15 @@ 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 \ - 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/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 41b5331804..3d0a7449c9 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.6.0 +ENV NODE_VERSION 14.7.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="3bf72b8895b508f91880f816705428933aea44b1f57dbe3f1fef7d7595b64872" \ + CHECKSUM="fc556b2b3f751e08d745e97bf6197d977de2a885a6080d0a731158c00ffbb02f" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,15 @@ 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 \ - 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/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 7a311153c5..ed2497a5ef 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.6.0 +ENV NODE_VERSION 14.7.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="3bf72b8895b508f91880f816705428933aea44b1f57dbe3f1fef7d7595b64872" \ + CHECKSUM="fc556b2b3f751e08d745e97bf6197d977de2a885a6080d0a731158c00ffbb02f" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,15 @@ 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 \ - 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/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 39f48c7167..bb053eaa92 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.6.0 +ENV NODE_VERSION 14.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,15 @@ 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 \ - 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/14/buster/Dockerfile b/14/buster/Dockerfile index 201e3e582d..1eda9dca09 100644 --- a/14/buster/Dockerfile +++ b/14/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.6.0 +ENV NODE_VERSION 14.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -18,18 +18,15 @@ 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 \ - 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/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index b8f30c6fbb..7ed91679f7 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.6.0 +ENV NODE_VERSION 14.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,15 @@ 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 \ - 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/14/stretch/Dockerfile b/14/stretch/Dockerfile index dc66a49830..fb7d8ec25f 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.6.0 +ENV NODE_VERSION 14.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -18,18 +18,15 @@ 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 \ - 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" || \ From e6a3915db698acb537fcc5e9fa6edb09d2bb8edd Mon Sep 17 00:00:00 2001 From: Ruy Adorno Date: Tue, 4 Aug 2020 21:44:14 -0400 Subject: [PATCH 378/818] keys: add key for @ruyadorno Refs: https://github.com/nodejs/node/pull/34628 Refs: https://github.com/nodejs/Release/pull/597 --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index 6046b15c1c..475e6c6fa6 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -6,4 +6,5 @@ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C DD8F2338BAE7501E3DD5AC78C273792F7D83545D A48C2BEE680E841632CD4E44F07496B3EB3C1762 +108F52B48DB57BB0CC439B2997B01419BD92F80A B9E2F5981AA6E0CD28160D9FF13993A75599653C From afee5ceeb1c4589385223a67bbbdaac3522e31cb Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 11 Aug 2020 17:47:10 -0400 Subject: [PATCH 379/818] feat: Update v14.7.0 to v14.8.0 --- 14/alpine3.10/Dockerfile | 5 +++-- 14/alpine3.11/Dockerfile | 5 +++-- 14/alpine3.12/Dockerfile | 5 +++-- 14/buster-slim/Dockerfile | 3 ++- 14/buster/Dockerfile | 3 ++- 14/stretch-slim/Dockerfile | 3 ++- 14/stretch/Dockerfile | 3 ++- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 5ed46bd7f0..c86b5c4094 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.7.0 +ENV NODE_VERSION 14.8.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="fc556b2b3f751e08d745e97bf6197d977de2a885a6080d0a731158c00ffbb02f" \ + CHECKSUM="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 3d0a7449c9..77886ec83f 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.7.0 +ENV NODE_VERSION 14.8.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="fc556b2b3f751e08d745e97bf6197d977de2a885a6080d0a731158c00ffbb02f" \ + CHECKSUM="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index ed2497a5ef..cc29702a6f 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.7.0 +ENV NODE_VERSION 14.8.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="fc556b2b3f751e08d745e97bf6197d977de2a885a6080d0a731158c00ffbb02f" \ + CHECKSUM="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index bb053eaa92..0f8b77e2de 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.7.0 +ENV NODE_VERSION 14.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 1eda9dca09..010e83b773 100644 --- a/14/buster/Dockerfile +++ b/14/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.7.0 +ENV NODE_VERSION 14.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 7ed91679f7..47a9abfbc7 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.7.0 +ENV NODE_VERSION 14.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index fb7d8ec25f..6e76691ed6 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.7.0 +ENV NODE_VERSION 14.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ From 42a70beebdcc284aa19c176b604353a5f9007b33 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 15 Aug 2020 00:45:33 -0400 Subject: [PATCH 380/818] chore: Generate Docker file GitHub Actions --- .github/workflows/10-alpine3.10.yml | 24 ++++ .github/workflows/10-alpine3.11.yml | 24 ++++ .github/workflows/10-alpine3.9.yml | 24 ++++ .github/workflows/10-buster-slim.yml | 24 ++++ .github/workflows/10-buster.yml | 24 ++++ .github/workflows/10-stretch-slim.yml | 24 ++++ .github/workflows/10-stretch.yml | 24 ++++ .github/workflows/12-alpine3.10.yml | 24 ++++ .github/workflows/12-alpine3.11.yml | 24 ++++ .github/workflows/12-alpine3.12.yml | 24 ++++ .github/workflows/12-alpine3.9.yml | 24 ++++ .github/workflows/12-buster-slim.yml | 24 ++++ .github/workflows/12-buster.yml | 24 ++++ .github/workflows/12-stretch-slim.yml | 24 ++++ .github/workflows/12-stretch.yml | 24 ++++ .github/workflows/14-alpine3.10.yml | 24 ++++ .github/workflows/14-alpine3.11.yml | 24 ++++ .github/workflows/14-alpine3.12.yml | 24 ++++ .github/workflows/14-buster-slim.yml | 24 ++++ .github/workflows/14-buster.yml | 24 ++++ .github/workflows/14-stretch-slim.yml | 24 ++++ .github/workflows/14-stretch.yml | 24 ++++ .travis.yml | 183 -------------------------- travis.yml.template | 29 ---- update.sh | 55 +++++--- 25 files changed, 563 insertions(+), 232 deletions(-) create mode 100644 .github/workflows/10-alpine3.10.yml create mode 100644 .github/workflows/10-alpine3.11.yml create mode 100644 .github/workflows/10-alpine3.9.yml create mode 100644 .github/workflows/10-buster-slim.yml create mode 100644 .github/workflows/10-buster.yml create mode 100644 .github/workflows/10-stretch-slim.yml create mode 100644 .github/workflows/10-stretch.yml create mode 100644 .github/workflows/12-alpine3.10.yml create mode 100644 .github/workflows/12-alpine3.11.yml create mode 100644 .github/workflows/12-alpine3.12.yml create mode 100644 .github/workflows/12-alpine3.9.yml create mode 100644 .github/workflows/12-buster-slim.yml create mode 100644 .github/workflows/12-buster.yml create mode 100644 .github/workflows/12-stretch-slim.yml create mode 100644 .github/workflows/12-stretch.yml create mode 100644 .github/workflows/14-alpine3.10.yml create mode 100644 .github/workflows/14-alpine3.11.yml create mode 100644 .github/workflows/14-alpine3.12.yml create mode 100644 .github/workflows/14-buster-slim.yml create mode 100644 .github/workflows/14-buster.yml create mode 100644 .github/workflows/14-stretch-slim.yml create mode 100644 .github/workflows/14-stretch.yml diff --git a/.github/workflows/10-alpine3.10.yml b/.github/workflows/10-alpine3.10.yml new file mode 100644 index 0000000000..1e27cc11f7 --- /dev/null +++ b/.github/workflows/10-alpine3.10.yml @@ -0,0 +1,24 @@ +name: 10 on alpine3.10 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.10/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.10/Dockerfile + +jobs: + build: + name: 10 on alpine3.10 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 alpine3.10 diff --git a/.github/workflows/10-alpine3.11.yml b/.github/workflows/10-alpine3.11.yml new file mode 100644 index 0000000000..e7f459afe4 --- /dev/null +++ b/.github/workflows/10-alpine3.11.yml @@ -0,0 +1,24 @@ +name: 10 on alpine3.11 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.11/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.11/Dockerfile + +jobs: + build: + name: 10 on alpine3.11 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 alpine3.11 diff --git a/.github/workflows/10-alpine3.9.yml b/.github/workflows/10-alpine3.9.yml new file mode 100644 index 0000000000..cfc60915af --- /dev/null +++ b/.github/workflows/10-alpine3.9.yml @@ -0,0 +1,24 @@ +name: 10 on alpine3.9 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.9/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/alpine3.9/Dockerfile + +jobs: + build: + name: 10 on alpine3.9 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 alpine3.9 diff --git a/.github/workflows/10-buster-slim.yml b/.github/workflows/10-buster-slim.yml new file mode 100644 index 0000000000..7d1b53e9ae --- /dev/null +++ b/.github/workflows/10-buster-slim.yml @@ -0,0 +1,24 @@ +name: 10 on buster-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster-slim/Dockerfile + +jobs: + build: + name: 10 on buster-slim + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 buster-slim diff --git a/.github/workflows/10-buster.yml b/.github/workflows/10-buster.yml new file mode 100644 index 0000000000..648f5f7b97 --- /dev/null +++ b/.github/workflows/10-buster.yml @@ -0,0 +1,24 @@ +name: 10 on buster + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/buster/Dockerfile + +jobs: + build: + name: 10 on buster + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 buster diff --git a/.github/workflows/10-stretch-slim.yml b/.github/workflows/10-stretch-slim.yml new file mode 100644 index 0000000000..846ec74de4 --- /dev/null +++ b/.github/workflows/10-stretch-slim.yml @@ -0,0 +1,24 @@ +name: 10 on stretch-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch-slim/Dockerfile + +jobs: + build: + name: 10 on stretch-slim + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 stretch-slim diff --git a/.github/workflows/10-stretch.yml b/.github/workflows/10-stretch.yml new file mode 100644 index 0000000000..7a9dc1b22d --- /dev/null +++ b/.github/workflows/10-stretch.yml @@ -0,0 +1,24 @@ +name: 10 on stretch + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 10/stretch/Dockerfile + +jobs: + build: + name: 10 on stretch + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 10 stretch diff --git a/.github/workflows/12-alpine3.10.yml b/.github/workflows/12-alpine3.10.yml new file mode 100644 index 0000000000..e81565fe7b --- /dev/null +++ b/.github/workflows/12-alpine3.10.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.10 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.10/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.10/Dockerfile + +jobs: + build: + name: 12 on alpine3.10 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.10 diff --git a/.github/workflows/12-alpine3.11.yml b/.github/workflows/12-alpine3.11.yml new file mode 100644 index 0000000000..531a09680a --- /dev/null +++ b/.github/workflows/12-alpine3.11.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.11 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.11/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.11/Dockerfile + +jobs: + build: + name: 12 on alpine3.11 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.11 diff --git a/.github/workflows/12-alpine3.12.yml b/.github/workflows/12-alpine3.12.yml new file mode 100644 index 0000000000..f18fc554e6 --- /dev/null +++ b/.github/workflows/12-alpine3.12.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.12 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.12/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.12/Dockerfile + +jobs: + build: + name: 12 on alpine3.12 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.12 diff --git a/.github/workflows/12-alpine3.9.yml b/.github/workflows/12-alpine3.9.yml new file mode 100644 index 0000000000..385ff52a25 --- /dev/null +++ b/.github/workflows/12-alpine3.9.yml @@ -0,0 +1,24 @@ +name: 12 on alpine3.9 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.9/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/alpine3.9/Dockerfile + +jobs: + build: + name: 12 on alpine3.9 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 alpine3.9 diff --git a/.github/workflows/12-buster-slim.yml b/.github/workflows/12-buster-slim.yml new file mode 100644 index 0000000000..04f8e8b110 --- /dev/null +++ b/.github/workflows/12-buster-slim.yml @@ -0,0 +1,24 @@ +name: 12 on buster-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster-slim/Dockerfile + +jobs: + build: + name: 12 on buster-slim + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 buster-slim diff --git a/.github/workflows/12-buster.yml b/.github/workflows/12-buster.yml new file mode 100644 index 0000000000..0b16ee6a9e --- /dev/null +++ b/.github/workflows/12-buster.yml @@ -0,0 +1,24 @@ +name: 12 on buster + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/buster/Dockerfile + +jobs: + build: + name: 12 on buster + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 buster diff --git a/.github/workflows/12-stretch-slim.yml b/.github/workflows/12-stretch-slim.yml new file mode 100644 index 0000000000..608160eebe --- /dev/null +++ b/.github/workflows/12-stretch-slim.yml @@ -0,0 +1,24 @@ +name: 12 on stretch-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch-slim/Dockerfile + +jobs: + build: + name: 12 on stretch-slim + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 stretch-slim diff --git a/.github/workflows/12-stretch.yml b/.github/workflows/12-stretch.yml new file mode 100644 index 0000000000..8019f3e1f0 --- /dev/null +++ b/.github/workflows/12-stretch.yml @@ -0,0 +1,24 @@ +name: 12 on stretch + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 12/stretch/Dockerfile + +jobs: + build: + name: 12 on stretch + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 12 stretch diff --git a/.github/workflows/14-alpine3.10.yml b/.github/workflows/14-alpine3.10.yml new file mode 100644 index 0000000000..e0d04a271e --- /dev/null +++ b/.github/workflows/14-alpine3.10.yml @@ -0,0 +1,24 @@ +name: 14 on alpine3.10 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.10/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.10/Dockerfile + +jobs: + build: + name: 14 on alpine3.10 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 alpine3.10 diff --git a/.github/workflows/14-alpine3.11.yml b/.github/workflows/14-alpine3.11.yml new file mode 100644 index 0000000000..c401f93897 --- /dev/null +++ b/.github/workflows/14-alpine3.11.yml @@ -0,0 +1,24 @@ +name: 14 on alpine3.11 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.11/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.11/Dockerfile + +jobs: + build: + name: 14 on alpine3.11 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 alpine3.11 diff --git a/.github/workflows/14-alpine3.12.yml b/.github/workflows/14-alpine3.12.yml new file mode 100644 index 0000000000..3a20d95204 --- /dev/null +++ b/.github/workflows/14-alpine3.12.yml @@ -0,0 +1,24 @@ +name: 14 on alpine3.12 + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.12/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/alpine3.12/Dockerfile + +jobs: + build: + name: 14 on alpine3.12 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 alpine3.12 diff --git a/.github/workflows/14-buster-slim.yml b/.github/workflows/14-buster-slim.yml new file mode 100644 index 0000000000..b7d027f93a --- /dev/null +++ b/.github/workflows/14-buster-slim.yml @@ -0,0 +1,24 @@ +name: 14 on buster-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster-slim/Dockerfile + +jobs: + build: + name: 14 on buster-slim + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 buster-slim diff --git a/.github/workflows/14-buster.yml b/.github/workflows/14-buster.yml new file mode 100644 index 0000000000..4481aadc2d --- /dev/null +++ b/.github/workflows/14-buster.yml @@ -0,0 +1,24 @@ +name: 14 on buster + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/buster/Dockerfile + +jobs: + build: + name: 14 on buster + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 buster diff --git a/.github/workflows/14-stretch-slim.yml b/.github/workflows/14-stretch-slim.yml new file mode 100644 index 0000000000..d7c68f0268 --- /dev/null +++ b/.github/workflows/14-stretch-slim.yml @@ -0,0 +1,24 @@ +name: 14 on stretch-slim + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch-slim/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch-slim/Dockerfile + +jobs: + build: + name: 14 on stretch-slim + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 stretch-slim diff --git a/.github/workflows/14-stretch.yml b/.github/workflows/14-stretch.yml new file mode 100644 index 0000000000..dfbfea4968 --- /dev/null +++ b/.github/workflows/14-stretch.yml @@ -0,0 +1,24 @@ +name: 14 on stretch + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - 14/stretch/Dockerfile + +jobs: + build: + name: 14 on stretch + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh 14 stretch diff --git a/.travis.yml b/.travis.yml index 83ca542b9d..31ee9716a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,35 +6,8 @@ dist: xenial language: minimal -services: - - docker - -.before_script: &auto_skip -- | - if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then - TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" - fi - if [ "default" = "$VARIANT" ]; then - Dockerfile="$NODE_VERSION/Dockerfile" - else - Dockerfile="$NODE_VERSION/$VARIANT/Dockerfile" - fi - if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then - echo "This is a new branch" - elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then - echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile$"; then - echo "Change of $Dockerfile detected." - else - echo "Skip build of $Dockerfile as it's not changed." - exit - fi - -script: ./test-build.sh $NODE_VERSION $VARIANT - stages: - Test - - Build - name: Deploy if: branch = master AND type IN (push) @@ -64,159 +37,3 @@ jobs: fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" - - # Docker Build # - - - stage: Build - before_script: *auto_skip - name: 10 on stretch - env: - - NODE_VERSION="10" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 10 on stretch-slim - env: - - NODE_VERSION="10" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 10 on buster - env: - - NODE_VERSION="10" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 10 on buster-slim - env: - - NODE_VERSION="10" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 10 on alpine3.9 - env: - - NODE_VERSION="10" - - VARIANT="alpine3.9" - - - stage: Build - before_script: *auto_skip - name: 10 on alpine3.10 - env: - - NODE_VERSION="10" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 10 on alpine3.11 - env: - - NODE_VERSION="10" - - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: 12 on stretch - env: - - NODE_VERSION="12" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 12 on stretch-slim - env: - - NODE_VERSION="12" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 12 on buster - env: - - NODE_VERSION="12" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 12 on buster-slim - env: - - NODE_VERSION="12" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.9 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.9" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.10 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.11 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: 12 on alpine3.12 - env: - - NODE_VERSION="12" - - VARIANT="alpine3.12" - - - stage: Build - before_script: *auto_skip - name: 14 on stretch - env: - - NODE_VERSION="14" - - VARIANT="stretch" - - - stage: Build - before_script: *auto_skip - name: 14 on stretch-slim - env: - - NODE_VERSION="14" - - VARIANT="stretch-slim" - - - stage: Build - before_script: *auto_skip - name: 14 on buster - env: - - NODE_VERSION="14" - - VARIANT="buster" - - - stage: Build - before_script: *auto_skip - name: 14 on buster-slim - env: - - NODE_VERSION="14" - - VARIANT="buster-slim" - - - stage: Build - before_script: *auto_skip - name: 14 on alpine3.10 - env: - - NODE_VERSION="14" - - VARIANT="alpine3.10" - - - stage: Build - before_script: *auto_skip - name: 14 on alpine3.11 - env: - - NODE_VERSION="14" - - VARIANT="alpine3.11" - - - stage: Build - before_script: *auto_skip - name: 14 on alpine3.12 - env: - - NODE_VERSION="14" - - VARIANT="alpine3.12" diff --git a/travis.yml.template b/travis.yml.template index 0aa5a08dc2..346b2b81fc 100644 --- a/travis.yml.template +++ b/travis.yml.template @@ -4,35 +4,8 @@ dist: xenial language: minimal -services: - - docker - -.before_script: &auto_skip -- | - if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then - TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA" - fi - if [ "default" = "$VARIANT" ]; then - Dockerfile="$NODE_VERSION/Dockerfile" - else - Dockerfile="$NODE_VERSION/$VARIANT/Dockerfile" - fi - if [ "" = "$TRAVIS_COMMIT_RANGE" ]; then - echo "This is a new branch" - elif ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- &> /dev/null; then - echo "Change range not recognized: '$TRAVIS_COMMIT_RANGE'" - elif git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^$Dockerfile$"; then - echo "Change of $Dockerfile detected." - else - echo "Skip build of $Dockerfile as it's not changed." - exit - fi - -script: ./test-build.sh $NODE_VERSION $VARIANT - stages: - Test - - Build - name: Deploy if: branch = master AND type IN (push) @@ -62,5 +35,3 @@ jobs: fi script: - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" - - # Docker Build # diff --git a/update.sh b/update.sh index 87f1c863a6..8b66a6e55e 100755 --- a/update.sh +++ b/update.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ue function usage() { @@ -17,26 +18,26 @@ function usage() { - update.sh 8 buster-slim,buster # Update only buster's slim and buster variants for version 8 - update.sh -s 8 stretch # Update only stretch variant for version 8, skip updating Alpine and Yarn - update.sh . alpine # Update the alpine variant for all versions - - update.sh -t # Update .travis.yml only + - update.sh -b # Update CI files only OPTIONS: -s Security update; skip updating the yarn and alpine versions. - -t Travis CI config update only + -b CI config update only -h Show this message EOF } SKIP=false -TRAVIS_CI_ONLY=false -while getopts "sth" opt; do +CI_ONLY=false +while getopts "sbh" opt; do case "${opt}" in s) SKIP=true shift ;; - t) - TRAVIS_CI_ONLY=true + b) + CI_ONLY=true shift ;; h) @@ -195,25 +196,39 @@ function add_stage() { local variant=${1} shift - echo ' - - stage: Build - before_script: *auto_skip - name: '"${version}"' on '"${variant}"' - env: - - NODE_VERSION="'"${version}"'" - - VARIANT="'"${variant}"'"' >> .travis.yml + echo "name: ${version} on ${variant} + +on: + push: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - ${version}/${variant}/Dockerfile + pull_request: + paths: + - functions.sh + - test-build.sh + - test-image.bats + - ${version}/${variant}/Dockerfile + +jobs: + build: + name: ${version} on ${variant} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: sudo apt-get install bats + - run: ./test-build.sh ${version} ${variant}" > ".github/workflows/${version}-${variant}.yml" } -echo '# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # -' | cat - travis.yml.template > .travis.yml - for version in "${versions[@]}"; do parentpath=$(dirname "${version}") versionnum=$(basename "${version}") baseuri=$(get_config "${parentpath}" "baseuri") update_version=$(in_versions_to_update "${version}") - [ "${update_version}" -eq 0 ] && [ true != "$TRAVIS_CI_ONLY" ] && info "Updating version ${version}..." + [ "${update_version}" -eq 0 ] && [ true != "$CI_ONLY" ] && info "Updating version ${version}..." # Get supported variants according the target architecture # See details in function.sh @@ -221,7 +236,7 @@ for version in "${versions[@]}"; do if [ -f "${version}/Dockerfile" ]; then add_stage "${baseuri}" "${version}" "default" - [ true = "$TRAVIS_CI_ONLY" ] && continue + [ true = "$CI_ONLY" ] && continue if [ "${update_version}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & @@ -232,7 +247,7 @@ for version in "${versions[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue add_stage "${baseuri}" "${version}" "${variant}" - [ true = "$TRAVIS_CI_ONLY" ] && continue + [ true = "$CI_ONLY" ] && continue update_variant=$(in_variants_to_update "${variant}") template_file="${parentpath}/Dockerfile-${variant}.template" From 867a5671453b58325a4a34622e8a707a10d0b7ee Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 7 Jan 2020 02:41:22 -0500 Subject: [PATCH 381/818] chore: Switch pipeline generation test to Actions --- .github/workflows/dockerfiles.yml | 11 +++++++++++ .travis.yml | 9 --------- 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/dockerfiles.yml diff --git a/.github/workflows/dockerfiles.yml b/.github/workflows/dockerfiles.yml new file mode 100644 index 0000000000..a9da1ab7ec --- /dev/null +++ b/.github/workflows/dockerfiles.yml @@ -0,0 +1,11 @@ +name: Check for out of sync YAML pipeline files + +on: [pull_request] + +jobs: + regen: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: ./update.sh -t + - run: git diff --color --exit-code diff --git a/.travis.yml b/.travis.yml index 31ee9716a9..69242a0f62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,20 +7,11 @@ dist: xenial language: minimal stages: - - Test - name: Deploy if: branch = master AND type IN (push) jobs: - fast_finish: true - include: - - stage: Test - name: .travis.yml and travis.yml.template consistency - script: - - ./update.sh -t - - git diff --stat --exit-code .travis.yml - - stage: Deploy before_script: - | From a84ff50223f7df081247c122d8566bf91f036be5 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 20 Feb 2020 00:22:14 -0500 Subject: [PATCH 382/818] fix: Remove -it from BATS testing Interactive shell doesn't seem to work on Actions --- test-image.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-image.bats b/test-image.bats index 0ed164867c..b424b95a4e 100755 --- a/test-image.bats +++ b/test-image.bats @@ -1,17 +1,17 @@ #!/usr/bin/env bats @test "Test for node and version" { - run docker run --rm -it node:"$full_tag" node -e "process.stdout.write(process.versions.node)" + run docker run --rm node:"$full_tag" node -e "process.stdout.write(process.versions.node)" [ "$status" -eq 0 ] [ "$output" == "${full_version}" ] } @test "Test for npm" { - run docker run --rm -it node:"$full_tag" npm --version + run docker run --rm node:"$full_tag" npm --version [ "$status" -eq 0 ] } @test "Test for yarn" { - run docker run --rm -it node:"$full_tag" yarn --version + run docker run --rm node:"$full_tag" yarn --version [ "$status" -eq 0 ] } From 41467a844eee86ee6a1aabce12467c6cd72bb322 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 28 Aug 2020 03:05:09 +0800 Subject: [PATCH 383/818] Update node.js v14 from 14.8.0 to 14.9.0 - https://nodejs.org/en/blog/release/v14.9.0/ - https://github.com/nodejs/node/releases/tag/v14.9.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.9.0 --- 14/alpine3.10/Dockerfile | 6 +++--- 14/alpine3.11/Dockerfile | 6 +++--- 14/alpine3.12/Dockerfile | 6 +++--- 14/buster-slim/Dockerfile | 4 ++-- 14/buster/Dockerfile | 4 ++-- 14/stretch-slim/Dockerfile | 4 ++-- 14/stretch/Dockerfile | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index c86b5c4094..6459d4755b 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.9.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="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ + CHECKSUM="ba4bab3d73a187f9026bce6844da93b7df5ae3e1876330e925419e5e0b3d49b1" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 77886ec83f..0185fa46de 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.9.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="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ + CHECKSUM="ba4bab3d73a187f9026bce6844da93b7df5ae3e1876330e925419e5e0b3d49b1" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index cc29702a6f..544b8ef3c8 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.8.0 +ENV NODE_VERSION 14.9.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="5439e4f7dab6432e19369215d48d5317994b1a5e72c525c05c697603c77e48c1" \ + CHECKSUM="ba4bab3d73a187f9026bce6844da93b7df5ae3e1876330e925419e5e0b3d49b1" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 0f8b77e2de..c664bfb199 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.8.0 +ENV NODE_VERSION 14.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 010e83b773..89c590ef40 100644 --- a/14/buster/Dockerfile +++ b/14/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.8.0 +ENV NODE_VERSION 14.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 47a9abfbc7..86bf0fad0a 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.8.0 +ENV NODE_VERSION 14.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 6e76691ed6..a6f1412ed9 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.8.0 +ENV NODE_VERSION 14.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ From 6614c14c32d34e703d53bd6fb73ab2299deb2f83 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 9 Sep 2020 00:41:31 -0400 Subject: [PATCH 384/818] feat: Update v14.9.0 to v14.10.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 6459d4755b..2297adb5ca 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.9.0 +ENV NODE_VERSION 14.10.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="ba4bab3d73a187f9026bce6844da93b7df5ae3e1876330e925419e5e0b3d49b1" \ + CHECKSUM="68f06052674a23d78d1de559ff2c795ec2f8ac3e720b571b6369342123191f2f" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 0185fa46de..0dd11386dd 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.9.0 +ENV NODE_VERSION 14.10.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="ba4bab3d73a187f9026bce6844da93b7df5ae3e1876330e925419e5e0b3d49b1" \ + CHECKSUM="68f06052674a23d78d1de559ff2c795ec2f8ac3e720b571b6369342123191f2f" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 544b8ef3c8..8eecf42297 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.9.0 +ENV NODE_VERSION 14.10.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="ba4bab3d73a187f9026bce6844da93b7df5ae3e1876330e925419e5e0b3d49b1" \ + CHECKSUM="68f06052674a23d78d1de559ff2c795ec2f8ac3e720b571b6369342123191f2f" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index c664bfb199..b38ac2b07e 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.9.0 +ENV NODE_VERSION 14.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 89c590ef40..2f5ce0eb75 100644 --- a/14/buster/Dockerfile +++ b/14/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.9.0 +ENV NODE_VERSION 14.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 86bf0fad0a..0ead75ebef 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.9.0 +ENV NODE_VERSION 14.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index a6f1412ed9..3db1d4211b 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.9.0 +ENV NODE_VERSION 14.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 87e7f479d60757f3df6e3b308b5c384ac3c487aa Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 11 Sep 2020 03:03:17 +0800 Subject: [PATCH 385/818] Update node.js v14 from 14.10.0 to 14.10.1 - https://nodejs.org/en/blog/release/v14.10.1/ - https://github.com/nodejs/node/releases/tag/v14.10.1 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.10.1 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 2297adb5ca..13bf1b1ec8 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.10.0 +ENV NODE_VERSION 14.10.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="68f06052674a23d78d1de559ff2c795ec2f8ac3e720b571b6369342123191f2f" \ + CHECKSUM="d02158ff73d054607aff0d73e0befad252af6a96db33e87c93227f5eb28f3757" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 0dd11386dd..322fc073cf 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.10.0 +ENV NODE_VERSION 14.10.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="68f06052674a23d78d1de559ff2c795ec2f8ac3e720b571b6369342123191f2f" \ + CHECKSUM="d02158ff73d054607aff0d73e0befad252af6a96db33e87c93227f5eb28f3757" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 8eecf42297..ce5df3cc89 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.10.0 +ENV NODE_VERSION 14.10.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="68f06052674a23d78d1de559ff2c795ec2f8ac3e720b571b6369342123191f2f" \ + CHECKSUM="d02158ff73d054607aff0d73e0befad252af6a96db33e87c93227f5eb28f3757" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index b38ac2b07e..ad502cb78c 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.10.0 +ENV NODE_VERSION 14.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 2f5ce0eb75..5678dcfe98 100644 --- a/14/buster/Dockerfile +++ b/14/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.10.0 +ENV NODE_VERSION 14.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 0ead75ebef..77ae4da542 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.10.0 +ENV NODE_VERSION 14.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 3db1d4211b..834ebe9097 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.10.0 +ENV NODE_VERSION 14.10.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c7bc3b9da1b534cc66021f7606af7e5b72f5ed11 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 15 Sep 2020 19:34:33 -0400 Subject: [PATCH 386/818] feat: v14.11.0 securty release --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 13bf1b1ec8..ecfca31a42 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.10.1 +ENV NODE_VERSION 14.11.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="d02158ff73d054607aff0d73e0befad252af6a96db33e87c93227f5eb28f3757" \ + CHECKSUM="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 322fc073cf..fa72e9d520 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.10.1 +ENV NODE_VERSION 14.11.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="d02158ff73d054607aff0d73e0befad252af6a96db33e87c93227f5eb28f3757" \ + CHECKSUM="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index ce5df3cc89..22bdc75d23 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.10.1 +ENV NODE_VERSION 14.11.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="d02158ff73d054607aff0d73e0befad252af6a96db33e87c93227f5eb28f3757" \ + CHECKSUM="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index ad502cb78c..8d4117803e 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.10.1 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 5678dcfe98..ce18647d01 100644 --- a/14/buster/Dockerfile +++ b/14/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.10.1 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 77ae4da542..7fd5a7b6f5 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.10.1 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 834ebe9097..5102745e41 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.10.1 +ENV NODE_VERSION 14.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From de78cda8d04c7c3a5c45302dcce22d5ea258f7ef Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 15 Sep 2020 20:39:37 -0400 Subject: [PATCH 387/818] feat: v12.18.4 security release --- 12/alpine3.10/Dockerfile | 5 +++-- 12/alpine3.11/Dockerfile | 5 +++-- 12/alpine3.12/Dockerfile | 5 +++-- 12/alpine3.9/Dockerfile | 5 +++-- 12/buster-slim/Dockerfile | 3 ++- 12/buster/Dockerfile | 3 ++- 12/stretch-slim/Dockerfile | 3 ++- 12/stretch/Dockerfile | 3 ++- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 38d63ee950..cd2620eee0 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 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="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index ffb04675c2..5e79ebe1d0 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 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="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 053935b5a4..65eb5db0a2 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 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="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index dce084d1d4..4ef5645957 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.18.3 +ENV NODE_VERSION 12.18.4 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="14dafe026366e7a9cc8d4737b1fcdcb6c534667e22bbeea63a29a1791ac6ac1f" \ + CHECKSUM="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index bf17ae28c7..875f046f71 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 339a8183a6..f9b2577709 100644 --- a/12/buster/Dockerfile +++ b/12/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.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index ec32edc9c4..66a3e6659d 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.18.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 8475f9e40a..2101a316a5 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.18.3 +ENV NODE_VERSION 12.18.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \ From 140d3e49b9dce8532cfc06108f586802ca4be5f5 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 15 Sep 2020 20:48:06 -0400 Subject: [PATCH 388/818] feat: v10.22.1 security release --- 10/alpine3.10/Dockerfile | 16 +++++++--------- 10/alpine3.11/Dockerfile | 16 +++++++--------- 10/alpine3.9/Dockerfile | 16 +++++++--------- 10/buster-slim/Dockerfile | 14 ++++++-------- 10/buster/Dockerfile | 14 ++++++-------- 10/stretch-slim/Dockerfile | 14 ++++++-------- 10/stretch/Dockerfile | 14 ++++++-------- 7 files changed, 45 insertions(+), 59 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 7ee7a3bd41..02dc33c23d 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.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="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ + CHECKSUM="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,16 @@ 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 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ 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/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 4825469c8e..cd6555a035 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.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="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ + CHECKSUM="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,16 @@ 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 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ 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/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index d55ff21e4e..f9386040b7 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.22.0 +ENV NODE_VERSION 10.22.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="2afa21473a5eb8f407c52fe3bf08180630f3ac9541d52b98e99dbf4fe79f82d2" \ + CHECKSUM="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ ;; \ *) ;; \ esac \ @@ -36,18 +36,16 @@ 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 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ 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/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 16c01201ca..3dfe42dedd 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,16 @@ 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 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ 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/10/buster/Dockerfile b/10/buster/Dockerfile index 838ba21f1a..8ac9c75e4b 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -18,18 +18,16 @@ 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 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ 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/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index ba8690eff5..1a1d2036ae 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,16 @@ 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 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ 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/10/stretch/Dockerfile b/10/stretch/Dockerfile index 4999081c85..53d43a2129 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.22.0 +ENV NODE_VERSION 10.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -18,18 +18,16 @@ 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 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ 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" || \ From 3d290f8d6d4692d658a1fbd0684c7747770d9516 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Sat, 19 Sep 2020 18:24:00 -0500 Subject: [PATCH 389/818] fix: use python3 or python2 for alpine In alpine3.12, they removed the python package in favor of either python2 or python3. https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.12.0#python2_no_longer_provides_python_and_python-devel However, nodejs 12, 10 require python2 for building from source. I added a change in update.sh that swaps out python3 for python2 in those older versions for alpine Dockerfiles. Refs #1330 --- 10/alpine3.10/Dockerfile | 2 +- 10/alpine3.11/Dockerfile | 2 +- 10/alpine3.9/Dockerfile | 2 +- 12/alpine3.10/Dockerfile | 2 +- 12/alpine3.11/Dockerfile | 2 +- 12/alpine3.12/Dockerfile | 2 +- 12/alpine3.9/Dockerfile | 2 +- 14/alpine3.10/Dockerfile | 2 +- 14/alpine3.11/Dockerfile | 2 +- 14/alpine3.12/Dockerfile | 2 +- Dockerfile-alpine.template | 2 +- update.sh | 9 +++++++++ 12 files changed, 20 insertions(+), 11 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 02dc33c23d..ebad2ff468 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python2 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index cd6555a035..b6472e4091 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python2 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index f9386040b7..8cdfc97999 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python2 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index cd2620eee0..c9a0c86741 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python2 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 5e79ebe1d0..77baec2805 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python2 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 65eb5db0a2..e616a2a018 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python2 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 4ef5645957..d0e502dc9f 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python2 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index ecfca31a42..32aaeac8eb 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python3 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index fa72e9d520..a7fb317b65 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python3 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 22bdc75d23..9f6345587b 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + python3 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 34700211fd..f5c4c949f7 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - python \ + ${PYTHON_VERSION} \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ "${NODE_KEYS[@]}" diff --git a/update.sh b/update.sh index 8b66a6e55e..eaa3e78e17 100755 --- a/update.sh +++ b/update.sh @@ -167,6 +167,15 @@ function update_node_version() { )\"" sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=${checksum}/" "${dockerfile}-tmp" + + # Use python2 for nodejs < 14 on alpine + if [ "$version" -lt 14 ]; then + pythonVersion="python2" + else + pythonVersion="python3" + fi + + sed -Ei -e 's/\$\{PYTHON_VERSION\}/'"${pythonVersion}"'/' "${dockerfile}-tmp" elif is_debian "${variant}"; then sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp" elif is_debian_slim "${variant}"; then From 0e8c6f58d5adf699b783a3ebb3b8ad6a55d1cb02 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 23 Sep 2020 17:40:42 -0400 Subject: [PATCH 390/818] feat: Upgrade v14.11.0 to v14.12.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index ecfca31a42..19b3a309aa 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.11.0 +ENV NODE_VERSION 14.12.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="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ + CHECKSUM="2f747beb8cd78d37129702dcd748457d2bbc967849ac85b5f80885fa9b6d6e2b" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index fa72e9d520..52b6d2f8fb 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.11.0 +ENV NODE_VERSION 14.12.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="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ + CHECKSUM="2f747beb8cd78d37129702dcd748457d2bbc967849ac85b5f80885fa9b6d6e2b" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 22bdc75d23..ce97c47e3d 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.11.0 +ENV NODE_VERSION 14.12.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="de7f2885da05f33b26b387a7ba017d27cc22ad9ef5a3a45d366e62218fcb8661" \ + CHECKSUM="2f747beb8cd78d37129702dcd748457d2bbc967849ac85b5f80885fa9b6d6e2b" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 8d4117803e..1b3418e273 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.11.0 +ENV NODE_VERSION 14.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index ce18647d01..ed3b997189 100644 --- a/14/buster/Dockerfile +++ b/14/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.11.0 +ENV NODE_VERSION 14.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 7fd5a7b6f5..68f42c5895 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.11.0 +ENV NODE_VERSION 14.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 5102745e41..51fb489ef3 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.11.0 +ENV NODE_VERSION 14.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 80ded64083b5c9be7853d9d3634a22a96e15e92d Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Tue, 29 Sep 2020 23:18:43 -0500 Subject: [PATCH 391/818] feat(node): upgrade node to 14.13.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index bda3a0b6e9..cf5b490d52 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.12.0 +ENV NODE_VERSION 14.13.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="2f747beb8cd78d37129702dcd748457d2bbc967849ac85b5f80885fa9b6d6e2b" \ + CHECKSUM="33cab05ea361ad298072dfbe132bf060d98e60953793e05ebc15e0beb5e24c1d" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index e417641bdc..761daeab10 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.12.0 +ENV NODE_VERSION 14.13.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="2f747beb8cd78d37129702dcd748457d2bbc967849ac85b5f80885fa9b6d6e2b" \ + CHECKSUM="33cab05ea361ad298072dfbe132bf060d98e60953793e05ebc15e0beb5e24c1d" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index dc52dfb9f6..865aae059c 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.12.0 +ENV NODE_VERSION 14.13.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="2f747beb8cd78d37129702dcd748457d2bbc967849ac85b5f80885fa9b6d6e2b" \ + CHECKSUM="33cab05ea361ad298072dfbe132bf060d98e60953793e05ebc15e0beb5e24c1d" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 1b3418e273..2759ca2669 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.12.0 +ENV NODE_VERSION 14.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index ed3b997189..f622e56bbd 100644 --- a/14/buster/Dockerfile +++ b/14/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.12.0 +ENV NODE_VERSION 14.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 68f42c5895..33ad36ae89 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.12.0 +ENV NODE_VERSION 14.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 51fb489ef3..d50eecd69b 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.12.0 +ENV NODE_VERSION 14.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 56fd8929ede3937b970af8e5458030b581947daf Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 6 Oct 2020 12:33:45 -0400 Subject: [PATCH 392/818] fix: Remove 386 architecture for v12 and v14 Official support stopped in v8 and is currnetly all failing in the official-images CI. Can be re-enabled if support is fixed --- 12/architectures | 1 - 14/architectures | 1 - 2 files changed, 2 deletions(-) diff --git a/12/architectures b/12/architectures index b069c9d9da..780a34dbcd 100644 --- a/12/architectures +++ b/12/architectures @@ -3,6 +3,5 @@ amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 arm32v6 alpine3.9,alpine3.10,alpine3.11,alpine3.12 arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -i386 alpine3.9,alpine3.10,alpine3.11,alpine3.12 ppc64le buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 s390x buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 diff --git a/14/architectures b/14/architectures index b9eda449aa..5ac47a6bb3 100644 --- a/14/architectures +++ b/14/architectures @@ -3,6 +3,5 @@ amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.1 arm32v6 alpine3.10,alpine3.11,alpine3.12 arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 -i386 alpine3.10,alpine3.11,alpine3.12 ppc64le buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 s390x buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 From 9d95788e892febc27ff308a659eceea54a8cb976 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Wed, 23 Sep 2020 17:11:05 -0500 Subject: [PATCH 393/818] ci: use github action for automated deployment --- .github/workflows/official-pr.yml | 63 +++++++++++ .travis.yml | 30 ------ ACTIVE_MAINTAINERS | 5 - generate-stackbrew-pr.sh | 168 ------------------------------ travis.yml.template | 37 ------- 5 files changed, 63 insertions(+), 240 deletions(-) create mode 100644 .github/workflows/official-pr.yml delete mode 100644 .travis.yml delete mode 100644 ACTIVE_MAINTAINERS delete mode 100755 generate-stackbrew-pr.sh delete mode 100644 travis.yml.template diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml new file mode 100644 index 0000000000..a2ad3460c4 --- /dev/null +++ b/.github/workflows/official-pr.yml @@ -0,0 +1,63 @@ +name: Create official images PR + +on: + pull_request_target: + types: + - closed + + paths: + - "**/Dockerfile" + - "**/architectures" + - "**/docker-entrypoint.sh" + - "generate-stackbrew-library.sh" + - "functions.sh" + +jobs: + pr: + runs-on: ubuntu-latest + if: github.repository_owner == 'nodejs' && github.event.pull_request.merged_by != '' + + steps: + - name: Checkout the docker-node repo + uses: actions/checkout@v2 + with: + path: docker-node + fetch-depth: 50 + + - name: Checkout the official-images repo + uses: actions/checkout@v2 + with: + path: official-images + repository: docker-library/official-images + + - name: Generate Stackbrew for diff + run: | + cd docker-node + ./generate-stackbrew-library.sh > ../official-images/library/node + + - name: Create PR in official-images + id: create-pr + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GH_API_TOKEN }} + push-to-fork: nodejs-github-bot/official-images + path: official-images + branch: autopr + branch-suffix: short-commit-hash + commit-message: "Node: ${{ github.event.pull_request.title }}" + title: "Node: ${{ github.event.pull_request.title }}" + body: | + Pull Request: ${{ github.event.pull_request.html_url }} + @LaurentGoderre @pesho @PeterDaveHello @SimenB @Starefossen + + - name: PR details + run: | + echo "Pull Request Number - ${{ steps.create-pr.outputs.pull-request-number }}" + echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}" + + - name: Create PR comment + uses: peter-evans/create-or-update-comment@v1 + with: + issue-number: ${{ github.event.pull_request.number }} + body: | + Created PR on the official-images repo (${{ steps.create-pr.outputs.pull-request-url }}). See https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what if you are wondering when it will be available on the Docker Hub. diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 69242a0f62..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -# DO NOT MODIFY. THIS FILE IS AUTOGENERATED # - ---- - -dist: xenial - -language: minimal - -stages: - - name: Deploy - if: branch = master AND type IN (push) - -jobs: - include: - - stage: Deploy - before_script: - - | - if ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "Dockerfile$"; then - if git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^generate-stackbrew-library.sh$"; then - if ! git diff "$TRAVIS_COMMIT_RANGE" -- generate-stackbrew-library.sh | grep -Eq '^[-+]array_[0-9]'; then - echo "Skip deployment as none of the Dockerfiles and version tag array in generate-stackbrew-library.sh has been changed." - exit - fi - else - echo "Skip deployment as none of the Dockerfiles and generate-stackbrew-library.sh has been changed." - exit - fi - fi - script: - - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" diff --git a/ACTIVE_MAINTAINERS b/ACTIVE_MAINTAINERS deleted file mode 100644 index 6425f28e38..0000000000 --- a/ACTIVE_MAINTAINERS +++ /dev/null @@ -1,5 +0,0 @@ -LaurentGoderre -pesho -PeterDaveHello -SimenB -Starefossen diff --git a/generate-stackbrew-pr.sh b/generate-stackbrew-pr.sh deleted file mode 100755 index ce13aa4c2e..0000000000 --- a/generate-stackbrew-pr.sh +++ /dev/null @@ -1,168 +0,0 @@ -#!/usr/bin/env bash - -set -e -. functions.sh - -COMMIT_RANGE="${1}" -COMMIT_ID="$(git show -s --format="%H" "${COMMIT_RANGE}" | head -n 1)" - -if [ -n "$TRAVIS" ]; then - COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE}" - BRANCH_NAME="travis-${TRAVIS_BUILD_ID}" - GITHUB_USERNAME="${AUTOPR_GITHUB_USERNAME:-nodejs-github-bot}" -else - COMMIT_MESSAGE="$(git show -s --format=%B "${COMMIT_ID}")" - BRANCH_NAME="autopr-$(date +%s)" - if [[ "$(git remote get-url origin)" =~ github.com/([^/]*)/docker-node.git ]]; then - GITHUB_USERNAME="${BASH_REMATCH[1]}" - fi -fi - -if [[ "${COMMIT_MESSAGE}" =~ Merge\ pull\ request\ \#([0-9]*) ]]; then - - # This is a merge from a pull request - PR_NUMBER="${BASH_REMATCH[1]}" - COMMIT_MESSAGE="$(printf "%s" "${COMMIT_MESSAGE}" | tail -n 1)" -fi - -IMAGES_FILE="library/node" -REPO_NAME="official-images" -ORIGIN_SLUG="${GITHUB_USERNAME}/${REPO_NAME}" -UPSTREAM_SLUG="${AUTOPR_UPSTREAM:-docker-library}/${REPO_NAME}" -DOCKER_SLUG="${TRAVIS_REPO_SLUG:-nodejs/docker-node}" -gitpath="../${REPO_NAME}" - -function auth_header() { - echo "Authorization: token ${GITHUB_API_TOKEN}" -} - -function permission_check() { - if [ -z "${GITHUB_API_TOKEN}" ]; then - fatal "Environment variable \$GITHUB_API_TOKEN is missing or empty" - fi - - auth="$(curl -H "$(auth_header)" \ - -s \ - "https://api.github.com")" - - if [ "$(echo "${auth}" | jq -r .message)" = "Bad credentials" ]; then - fatal "Authentication Failed! Invalid \$GITHUB_API_TOKEN" - fi - - auth="$(curl -H "$(auth_header)" \ - -s \ - "https://api.github.com/repos/${ORIGIN_SLUG}/collaborators/${GITHUB_USERNAME}/permission")" - if [ "$(echo "${auth}" | jq -r .message)" != "null" ]; then - fatal "\$GITHUB_API_TOKEN can't push to https://github.com/${ORIGIN_SLUG}.git" - fi -} - -function setup_git_author() { - # Set Git User Info - GIT_AUTHOR_NAME="Node.js GitHub Bot" - GIT_AUTHOR_EMAIL="github-bot@iojs.org" - GIT_COMMITTER_NAME="Node.js GitHub Bot" - GIT_COMMITTER_EMAIL="github-bot@iojs.org" - - export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL -} - -function message() { - echo "Node: ${COMMIT_MESSAGE}" -} - -function pr_payload() { - local escaped_message - local body - local maintainers - - escaped_message="$(echo "${COMMIT_MESSAGE}" | head -n 1 | sed -E -e "s/\"/\\\\\"/g")" - - if [ -n "${PR_NUMBER}" ]; then - body="Pull Request: ${DOCKER_SLUG}#${PR_NUMBER}" - else - body="Commit: https://github.com/${DOCKER_SLUG}/compare/${COMMIT_RANGE}" - fi - - for maintainer in $(xargs < ACTIVE_MAINTAINERS); do - maintainers="$maintainers @$maintainer" - done - - printf "{ - \"title\": \"Node: %s\", - \"body\" : \"%s.
cc %s\", - \"head\" : \"%s\", - \"base\": \"master\" - }" "${escaped_message}" "${body}" "${maintainers}" "${GITHUB_USERNAME}:${BRANCH_NAME}" -} - -function comment_payload() { - local pr_url - pr_url="${1}" - echo "{ - \"body\": \"Created PR to the ${REPO_NAME} repo (${pr_url}). See https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what if you are wondering when it will be available on the Docker Hub.\" - }" -} - -if images_updated "${COMMIT_RANGE}"; then - - permission_check - - # Set Git User Info - [ -z "$GIT_AUTHOR_NAME" ] && setup_git_author - - info "Cloning..." - git clone --depth 50 "https://github.com/${UPSTREAM_SLUG}.git" ${gitpath} 2> /dev/null - - stackbrew="$(./generate-stackbrew-library.sh)" - - cd ${gitpath} - - echo "${stackbrew}" > "${IMAGES_FILE}" - git checkout -b "${BRANCH_NAME}" - git add "${IMAGES_FILE}" - git commit -m "$(message)" - - info "Pushing..." - git fetch --unshallow "https://github.com/${ORIGIN_SLUG}.git" - git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" || fatal "Error pushing the updated stackbrew" - - cd - && rm -rf ${gitpath} - - info "Creating Pull request" - pr_response_payload="$(curl -H "$(auth_header)" \ - -s \ - -X POST \ - -d "$(pr_payload)" \ - "https://api.github.com/repos/${UPSTREAM_SLUG}/pulls")" - - url="$(echo "${pr_response_payload}" | jq -r .html_url)" - if [ "${url}" != "null" ]; then - info "Pull request created at ${url}" - - if [ -n "${PR_NUMBER}" ]; then - comment_endpoint="https://api.github.com/repos/${DOCKER_SLUG}/issues/${PR_NUMBER}/comments" - else - comment_endpoint="https://api.github.com/repos/${DOCKER_SLUG}/commits/${COMMIT_ID}/comments" - fi - - info "Creating Commit Comment" - commit_response_payload="$(curl -H "$(auth_header)" \ - -s \ - -X POST \ - -d "$(comment_payload "${url}")" \ - "${comment_endpoint}")" - - if [ "$(echo "${commit_response_payload}" | jq -r .message)" != "null" ]; then - fatal "Error linking the pull request (${error_message})" - else - comment_url="$(echo "${commit_response_payload}" | jq -r .html_url)" - info "Created comment at ${comment_url}" - fi - else - error_message=$(echo "${pr_response_payload}" | jq -r .message) - fatal "Error creating pull request (${error_message})" - fi -else - info "No change!" -fi diff --git a/travis.yml.template b/travis.yml.template deleted file mode 100644 index 346b2b81fc..0000000000 --- a/travis.yml.template +++ /dev/null @@ -1,37 +0,0 @@ ---- - -dist: xenial - -language: minimal - -stages: - - Test - - name: Deploy - if: branch = master AND type IN (push) - -jobs: - fast_finish: true - - include: - - stage: Test - name: .travis.yml and travis.yml.template consistency - script: - - ./update.sh -t - - git diff --stat --exit-code .travis.yml - - - stage: Deploy - before_script: - - | - if ! git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "Dockerfile$"; then - if git diff --name-only "$TRAVIS_COMMIT_RANGE" -- | grep -Eq "^generate-stackbrew-library.sh$"; then - if ! git diff "$TRAVIS_COMMIT_RANGE" -- generate-stackbrew-library.sh | grep -Eq '^[-+]array_[0-9]'; then - echo "Skip deployment as none of the Dockerfiles and version tag array in generate-stackbrew-library.sh has been changed." - exit - fi - else - echo "Skip deployment as none of the Dockerfiles and generate-stackbrew-library.sh has been changed." - exit - fi - fi - script: - - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE" From 07f6f2563f73e9c084344dafa3de2c874adbab33 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Fri, 2 Oct 2020 16:17:56 -0500 Subject: [PATCH 394/818] ci(pr): use single branch and update pr This will have the action use a single branch and update or create a PR --- .github/workflows/official-pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index a2ad3460c4..fe1279d241 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -42,8 +42,7 @@ jobs: token: ${{ secrets.GH_API_TOKEN }} push-to-fork: nodejs-github-bot/official-images path: official-images - branch: autopr - branch-suffix: short-commit-hash + branch: node commit-message: "Node: ${{ github.event.pull_request.title }}" title: "Node: ${{ github.event.pull_request.title }}" body: | From a8494b1676216bfe274073993016da0c2e0bfcdd Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Tue, 6 Oct 2020 18:03:59 -0500 Subject: [PATCH 395/818] feat: upgrade node to 12.19.0 --- 12/alpine3.10/Dockerfile | 6 +++--- 12/alpine3.11/Dockerfile | 6 +++--- 12/alpine3.12/Dockerfile | 6 +++--- 12/alpine3.9/Dockerfile | 6 +++--- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index c9a0c86741..e5a1b795b9 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.18.4 +ENV NODE_VERSION 12.19.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="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ + CHECKSUM="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 77baec2805..8007796104 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.18.4 +ENV NODE_VERSION 12.19.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="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ + CHECKSUM="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index e616a2a018..f56baf3a47 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.18.4 +ENV NODE_VERSION 12.19.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="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ + CHECKSUM="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index d0e502dc9f..2bad543831 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.18.4 +ENV NODE_VERSION 12.19.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="99715657ad621bd364070f176d27c6902ce49441af88e5df2dbe63392a3097da" \ + CHECKSUM="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 875f046f71..5cd732bbd0 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.4 +ENV NODE_VERSION 12.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index f9b2577709..90a94be1f9 100644 --- a/12/buster/Dockerfile +++ b/12/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.4 +ENV NODE_VERSION 12.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 66a3e6659d..2e2fe2cc2b 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.18.4 +ENV NODE_VERSION 12.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 2101a316a5..e0d9bdc9e0 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.18.4 +ENV NODE_VERSION 12.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ From 84a84876c025bbc2bce43007b7d3de0c57617f8f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2020 04:16:17 +0000 Subject: [PATCH 396/818] Create Dependabot config file --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..afb98ae0c7 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 From 7f53dd161e275622e89fe45cc6e855e3f6e6e10b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2020 04:31:52 +0000 Subject: [PATCH 397/818] chore(deps): bump actions/setup-node from v1 to v2.1.2 Bumps [actions/setup-node](https://github.com/actions/setup-node) from v1 to v2.1.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v1...c6fd00ceb9747fb23ffdf72987450a2664414867) Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index bd90a4d205..417b12ac1f 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2.1.2 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 87ad6bdc79..25af6af86c 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2.1.2 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 4339197825..792d338699 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2.1.2 with: node-version: '12.x' - name: Install markdown-link-check From 5bc0ce8473706b26b08e0ff3e1ec145e07f37a89 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Tue, 6 Oct 2020 23:52:14 -0500 Subject: [PATCH 398/818] ci(pr): fix auto-pr using non-current commit See https://github.community/t/github-actions-are-severely-limited-on-prs/18179/2 --- .github/workflows/official-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index fe1279d241..b46df76ab1 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -22,6 +22,7 @@ jobs: uses: actions/checkout@v2 with: path: docker-node + ref: ${{ github.event.pull_request.head.ref }} fetch-depth: 50 - name: Checkout the official-images repo From b161a740dfa731ec2058347fa832ba9355b63d79 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Tue, 29 Sep 2020 21:53:49 -0500 Subject: [PATCH 399/818] refactor(architectures): sort and align --- 10/architectures | 16 ++++++++-------- 12/architectures | 14 +++++++------- 14/architectures | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/10/architectures b/10/architectures index 2816fd1bb3..d31c0c2518 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ -bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -arm32v6 alpine3.9,alpine3.10,alpine3.11 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -i386 alpine3.9,alpine3.10,alpine3.11 -ppc64le buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 -s390x buster,buster-slim,alpine3.9,alpine3.10,alpine3.11 +bashbrew-arch variants +amd64 alpine3.10,alpine3.11,alpine3.9,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.9 +arm32v7 alpine3.10,alpine3.11,alpine3.9,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.9,buster,buster-slim,stretch,stretch-slim +i386 alpine3.10,alpine3.11,alpine3.9 +ppc64le alpine3.10,alpine3.11,alpine3.9,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.9,buster,buster-slim diff --git a/12/architectures b/12/architectures index 780a34dbcd..5b2820969c 100644 --- a/12/architectures +++ b/12/architectures @@ -1,7 +1,7 @@ -bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm32v6 alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -ppc64le buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -s390x buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +bashbrew-arch variants +amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.9 +arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim +ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim diff --git a/14/architectures b/14/architectures index 5ac47a6bb3..e596715982 100644 --- a/14/architectures +++ b/14/architectures @@ -1,7 +1,7 @@ -bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 -arm32v6 alpine3.10,alpine3.11,alpine3.12 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 -ppc64le buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 -s390x buster,buster-slim,alpine3.10,alpine3.11,alpine3.12 +bashbrew-arch variants +amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12 +arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim From d4bf95ab61b929b4b4b9dadf4f5e119ff700f404 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Wed, 7 Oct 2020 00:27:46 -0500 Subject: [PATCH 400/818] refactor(pr): trigger on pr action change --- .github/workflows/official-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index b46df76ab1..3d323608fb 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -6,6 +6,7 @@ on: - closed paths: + - ".github/workflows/official-pr.yml" - "**/Dockerfile" - "**/architectures" - "**/docker-entrypoint.sh" From d2bc87cf238f6a8e9cd55e81512e51bece5e2e21 Mon Sep 17 00:00:00 2001 From: Danielle Adams Date: Wed, 7 Oct 2020 13:58:37 -0400 Subject: [PATCH 401/818] keys: add key for @danielleadams --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index 475e6c6fa6..661ec2c80d 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,5 +1,6 @@ 4ED778F539E3634C779C87C6D7062848A1AB005C 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 +1C050899334244A8AF75E53792EF661D867B9DFA 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 From 7b21ecfb598b6606d9e07fbf032165168c61bfaa Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Wed, 7 Oct 2020 00:25:03 -0500 Subject: [PATCH 402/818] ci(pr): checkout base_ref --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index b46df76ab1..4fe3539cdb 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v2 with: path: docker-node - ref: ${{ github.event.pull_request.head.ref }} + ref: ${{ github.base_ref }} fetch-depth: 50 - name: Checkout the official-images repo From a6f8a9c2fef70a4654afb2e97922ce57587339f5 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Wed, 7 Oct 2020 20:07:16 -0500 Subject: [PATCH 403/818] ci(pr): add context dump for debug purposes https://github.com/crazy-max/ghaction-dump-context --- .github/workflows/official-pr.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index f97230e9c2..e9af41d165 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -62,3 +62,7 @@ jobs: issue-number: ${{ github.event.pull_request.number }} body: | Created PR on the official-images repo (${{ steps.create-pr.outputs.pull-request-url }}). See https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what if you are wondering when it will be available on the Docker Hub. + + - name: Dump context + if: always() + uses: crazy-max/ghaction-dump-context@v1 From bcd3607a38cdf5529cef9a6ed1163d7e06ddea6d Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Wed, 7 Oct 2020 18:45:32 -0500 Subject: [PATCH 404/818] feat: upgrade node to 14.13.1 https://github.com/nodejs/node/releases/tag/v14.13.1 --- 14/alpine3.10/Dockerfile | 5 +++-- 14/alpine3.11/Dockerfile | 5 +++-- 14/alpine3.12/Dockerfile | 5 +++-- 14/buster-slim/Dockerfile | 3 ++- 14/buster/Dockerfile | 3 ++- 14/stretch-slim/Dockerfile | 3 ++- 14/stretch/Dockerfile | 3 ++- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index cf5b490d52..89ae411c0f 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.13.0 +ENV NODE_VERSION 14.13.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="33cab05ea361ad298072dfbe132bf060d98e60953793e05ebc15e0beb5e24c1d" \ + CHECKSUM="b8b33ec1d2f6463ded7c02bf29ef4141ff4aabb2c0e0ba14cf16ac7c0a6a31a5" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 761daeab10..001e9a2b70 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.13.0 +ENV NODE_VERSION 14.13.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="33cab05ea361ad298072dfbe132bf060d98e60953793e05ebc15e0beb5e24c1d" \ + CHECKSUM="b8b33ec1d2f6463ded7c02bf29ef4141ff4aabb2c0e0ba14cf16ac7c0a6a31a5" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 865aae059c..f38f56d01c 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.13.0 +ENV NODE_VERSION 14.13.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="33cab05ea361ad298072dfbe132bf060d98e60953793e05ebc15e0beb5e24c1d" \ + CHECKSUM="b8b33ec1d2f6463ded7c02bf29ef4141ff4aabb2c0e0ba14cf16ac7c0a6a31a5" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 2759ca2669..bf18b41773 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.13.0 +ENV NODE_VERSION 14.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index f622e56bbd..96a2335a8c 100644 --- a/14/buster/Dockerfile +++ b/14/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.13.0 +ENV NODE_VERSION 14.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 33ad36ae89..75f22c3272 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.13.0 +ENV NODE_VERSION 14.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index d50eecd69b..55e04829e6 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.13.0 +ENV NODE_VERSION 14.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ From ee169b2fdded535c80917483e9759261bef9eb8b Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Thu, 24 Sep 2020 21:58:22 -0500 Subject: [PATCH 405/818] ci: use single dynamic build-test action Add a GitHub action that dynamically generates the matrix of Dockerfiles to test based on what files have changed. This avoids having to have generated workflows for each version x variant combo. It looks for any changed Dockerfiles, or docker-entrypoint.sh. If any of the testing files are changed, it will test all Dockerfiles --- .github/workflows/10-alpine3.10.yml | 24 ------- .github/workflows/10-alpine3.11.yml | 24 ------- .github/workflows/10-alpine3.9.yml | 24 ------- .github/workflows/10-buster-slim.yml | 24 ------- .github/workflows/10-buster.yml | 24 ------- .github/workflows/10-stretch-slim.yml | 24 ------- .github/workflows/10-stretch.yml | 24 ------- .github/workflows/12-alpine3.10.yml | 24 ------- .github/workflows/12-alpine3.11.yml | 24 ------- .github/workflows/12-alpine3.12.yml | 24 ------- .github/workflows/12-alpine3.9.yml | 24 ------- .github/workflows/12-buster-slim.yml | 24 ------- .github/workflows/12-buster.yml | 24 ------- .github/workflows/12-stretch-slim.yml | 24 ------- .github/workflows/12-stretch.yml | 24 ------- .github/workflows/14-alpine3.10.yml | 24 ------- .github/workflows/14-alpine3.11.yml | 24 ------- .github/workflows/14-alpine3.12.yml | 24 ------- .github/workflows/14-buster-slim.yml | 24 ------- .github/workflows/14-buster.yml | 24 ------- .github/workflows/14-stretch-slim.yml | 24 ------- .github/workflows/14-stretch.yml | 24 ------- .github/workflows/build-test.yml | 89 +++++++++++++++++++++++++ .github/workflows/dockerfiles.yml | 11 ---- genMatrix.js | 80 +++++++++++++++++++++++ test-build.sh | 93 --------------------------- test-image.bats | 17 ----- update.sh | 49 +------------- 28 files changed, 171 insertions(+), 696 deletions(-) delete mode 100644 .github/workflows/10-alpine3.10.yml delete mode 100644 .github/workflows/10-alpine3.11.yml delete mode 100644 .github/workflows/10-alpine3.9.yml delete mode 100644 .github/workflows/10-buster-slim.yml delete mode 100644 .github/workflows/10-buster.yml delete mode 100644 .github/workflows/10-stretch-slim.yml delete mode 100644 .github/workflows/10-stretch.yml delete mode 100644 .github/workflows/12-alpine3.10.yml delete mode 100644 .github/workflows/12-alpine3.11.yml delete mode 100644 .github/workflows/12-alpine3.12.yml delete mode 100644 .github/workflows/12-alpine3.9.yml delete mode 100644 .github/workflows/12-buster-slim.yml delete mode 100644 .github/workflows/12-buster.yml delete mode 100644 .github/workflows/12-stretch-slim.yml delete mode 100644 .github/workflows/12-stretch.yml delete mode 100644 .github/workflows/14-alpine3.10.yml delete mode 100644 .github/workflows/14-alpine3.11.yml delete mode 100644 .github/workflows/14-alpine3.12.yml delete mode 100644 .github/workflows/14-buster-slim.yml delete mode 100644 .github/workflows/14-buster.yml delete mode 100644 .github/workflows/14-stretch-slim.yml delete mode 100644 .github/workflows/14-stretch.yml create mode 100644 .github/workflows/build-test.yml delete mode 100644 .github/workflows/dockerfiles.yml create mode 100644 genMatrix.js delete mode 100755 test-build.sh delete mode 100755 test-image.bats diff --git a/.github/workflows/10-alpine3.10.yml b/.github/workflows/10-alpine3.10.yml deleted file mode 100644 index 1e27cc11f7..0000000000 --- a/.github/workflows/10-alpine3.10.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 10 on alpine3.10 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/alpine3.10/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/alpine3.10/Dockerfile - -jobs: - build: - name: 10 on alpine3.10 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 10 alpine3.10 diff --git a/.github/workflows/10-alpine3.11.yml b/.github/workflows/10-alpine3.11.yml deleted file mode 100644 index e7f459afe4..0000000000 --- a/.github/workflows/10-alpine3.11.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 10 on alpine3.11 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/alpine3.11/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/alpine3.11/Dockerfile - -jobs: - build: - name: 10 on alpine3.11 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 10 alpine3.11 diff --git a/.github/workflows/10-alpine3.9.yml b/.github/workflows/10-alpine3.9.yml deleted file mode 100644 index cfc60915af..0000000000 --- a/.github/workflows/10-alpine3.9.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 10 on alpine3.9 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/alpine3.9/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/alpine3.9/Dockerfile - -jobs: - build: - name: 10 on alpine3.9 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 10 alpine3.9 diff --git a/.github/workflows/10-buster-slim.yml b/.github/workflows/10-buster-slim.yml deleted file mode 100644 index 7d1b53e9ae..0000000000 --- a/.github/workflows/10-buster-slim.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 10 on buster-slim - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/buster-slim/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/buster-slim/Dockerfile - -jobs: - build: - name: 10 on buster-slim - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 10 buster-slim diff --git a/.github/workflows/10-buster.yml b/.github/workflows/10-buster.yml deleted file mode 100644 index 648f5f7b97..0000000000 --- a/.github/workflows/10-buster.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 10 on buster - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/buster/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/buster/Dockerfile - -jobs: - build: - name: 10 on buster - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 10 buster diff --git a/.github/workflows/10-stretch-slim.yml b/.github/workflows/10-stretch-slim.yml deleted file mode 100644 index 846ec74de4..0000000000 --- a/.github/workflows/10-stretch-slim.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 10 on stretch-slim - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/stretch-slim/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/stretch-slim/Dockerfile - -jobs: - build: - name: 10 on stretch-slim - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 10 stretch-slim diff --git a/.github/workflows/10-stretch.yml b/.github/workflows/10-stretch.yml deleted file mode 100644 index 7a9dc1b22d..0000000000 --- a/.github/workflows/10-stretch.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 10 on stretch - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/stretch/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 10/stretch/Dockerfile - -jobs: - build: - name: 10 on stretch - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 10 stretch diff --git a/.github/workflows/12-alpine3.10.yml b/.github/workflows/12-alpine3.10.yml deleted file mode 100644 index e81565fe7b..0000000000 --- a/.github/workflows/12-alpine3.10.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on alpine3.10 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.10/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.10/Dockerfile - -jobs: - build: - name: 12 on alpine3.10 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 alpine3.10 diff --git a/.github/workflows/12-alpine3.11.yml b/.github/workflows/12-alpine3.11.yml deleted file mode 100644 index 531a09680a..0000000000 --- a/.github/workflows/12-alpine3.11.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on alpine3.11 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.11/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.11/Dockerfile - -jobs: - build: - name: 12 on alpine3.11 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 alpine3.11 diff --git a/.github/workflows/12-alpine3.12.yml b/.github/workflows/12-alpine3.12.yml deleted file mode 100644 index f18fc554e6..0000000000 --- a/.github/workflows/12-alpine3.12.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on alpine3.12 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.12/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.12/Dockerfile - -jobs: - build: - name: 12 on alpine3.12 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 alpine3.12 diff --git a/.github/workflows/12-alpine3.9.yml b/.github/workflows/12-alpine3.9.yml deleted file mode 100644 index 385ff52a25..0000000000 --- a/.github/workflows/12-alpine3.9.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on alpine3.9 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.9/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/alpine3.9/Dockerfile - -jobs: - build: - name: 12 on alpine3.9 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 alpine3.9 diff --git a/.github/workflows/12-buster-slim.yml b/.github/workflows/12-buster-slim.yml deleted file mode 100644 index 04f8e8b110..0000000000 --- a/.github/workflows/12-buster-slim.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on buster-slim - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/buster-slim/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/buster-slim/Dockerfile - -jobs: - build: - name: 12 on buster-slim - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 buster-slim diff --git a/.github/workflows/12-buster.yml b/.github/workflows/12-buster.yml deleted file mode 100644 index 0b16ee6a9e..0000000000 --- a/.github/workflows/12-buster.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on buster - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/buster/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/buster/Dockerfile - -jobs: - build: - name: 12 on buster - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 buster diff --git a/.github/workflows/12-stretch-slim.yml b/.github/workflows/12-stretch-slim.yml deleted file mode 100644 index 608160eebe..0000000000 --- a/.github/workflows/12-stretch-slim.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on stretch-slim - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/stretch-slim/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/stretch-slim/Dockerfile - -jobs: - build: - name: 12 on stretch-slim - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 stretch-slim diff --git a/.github/workflows/12-stretch.yml b/.github/workflows/12-stretch.yml deleted file mode 100644 index 8019f3e1f0..0000000000 --- a/.github/workflows/12-stretch.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 12 on stretch - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/stretch/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 12/stretch/Dockerfile - -jobs: - build: - name: 12 on stretch - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 12 stretch diff --git a/.github/workflows/14-alpine3.10.yml b/.github/workflows/14-alpine3.10.yml deleted file mode 100644 index e0d04a271e..0000000000 --- a/.github/workflows/14-alpine3.10.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 14 on alpine3.10 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/alpine3.10/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/alpine3.10/Dockerfile - -jobs: - build: - name: 14 on alpine3.10 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 14 alpine3.10 diff --git a/.github/workflows/14-alpine3.11.yml b/.github/workflows/14-alpine3.11.yml deleted file mode 100644 index c401f93897..0000000000 --- a/.github/workflows/14-alpine3.11.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 14 on alpine3.11 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/alpine3.11/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/alpine3.11/Dockerfile - -jobs: - build: - name: 14 on alpine3.11 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 14 alpine3.11 diff --git a/.github/workflows/14-alpine3.12.yml b/.github/workflows/14-alpine3.12.yml deleted file mode 100644 index 3a20d95204..0000000000 --- a/.github/workflows/14-alpine3.12.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 14 on alpine3.12 - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/alpine3.12/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/alpine3.12/Dockerfile - -jobs: - build: - name: 14 on alpine3.12 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 14 alpine3.12 diff --git a/.github/workflows/14-buster-slim.yml b/.github/workflows/14-buster-slim.yml deleted file mode 100644 index b7d027f93a..0000000000 --- a/.github/workflows/14-buster-slim.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 14 on buster-slim - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/buster-slim/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/buster-slim/Dockerfile - -jobs: - build: - name: 14 on buster-slim - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 14 buster-slim diff --git a/.github/workflows/14-buster.yml b/.github/workflows/14-buster.yml deleted file mode 100644 index 4481aadc2d..0000000000 --- a/.github/workflows/14-buster.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 14 on buster - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/buster/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/buster/Dockerfile - -jobs: - build: - name: 14 on buster - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 14 buster diff --git a/.github/workflows/14-stretch-slim.yml b/.github/workflows/14-stretch-slim.yml deleted file mode 100644 index d7c68f0268..0000000000 --- a/.github/workflows/14-stretch-slim.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 14 on stretch-slim - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/stretch-slim/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/stretch-slim/Dockerfile - -jobs: - build: - name: 14 on stretch-slim - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 14 stretch-slim diff --git a/.github/workflows/14-stretch.yml b/.github/workflows/14-stretch.yml deleted file mode 100644 index dfbfea4968..0000000000 --- a/.github/workflows/14-stretch.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: 14 on stretch - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/stretch/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - 14/stretch/Dockerfile - -jobs: - build: - name: 14 on stretch - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh 14 stretch diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000000..16483a9a32 --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,89 @@ +name: build-test + +on: + push: + paths: + - "**/Dockerfile" + - "**/docker-entrypoint.sh" + - genMatrix.js + - ".github/workflows/build-test.yml" + + pull_request: + paths: + - "**/Dockerfile" + - "**/docker-entrypoint.sh" + - genMatrix.js + - ".github/workflows/build-test.yml" + +jobs: + gen-matrix: + name: generate-matrix + runs-on: ubuntu-latest + + steps: + - name: Calculate file differences + uses: lots0logs/gh-action-get-changed-files@2.1.4 + id: diff + with: + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Checkout + uses: actions/checkout@v2 + + - name: Generate testing matrix + uses: actions/github-script@v3 + id: generator + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const script = require(`${process.env.GITHUB_WORKSPACE}/genMatrix.js`) + return script( + ${{ steps.diff.outputs.added }}, + ${{ steps.diff.outputs.modified }}, + ${{ steps.diff.outputs.renamed }}, + ); + + outputs: + matrix: ${{ steps.generator.outputs.result }} + + build: + if: ${{ fromJson(needs.gen-matrix.outputs.matrix) }} + needs: gen-matrix + name: build + runs-on: ubuntu-latest + timeout-minutes: 60 + strategy: + fail-fast: false + matrix: ${{ fromJson(needs.gen-matrix.outputs.matrix) }} + + steps: + - name: Get short node version + uses: actions/github-script@v3 + id: short-version + with: + result-encoding: string + script: return "${{ matrix.version }}".split('.')[0] + + - name: Checkout + uses: actions/checkout@v2 + + - name: Build image + uses: docker/build-push-action@v2 + with: + push: false + load: true + context: . + file: ./${{ steps.short-version.outputs.result }}/${{ matrix.variant }}/Dockerfile + tags: node:${{ matrix.version }}-${{ matrix.variant }} + + - name: Test for node version + run: | + image_node_version=$(docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} node --print "process.versions.node") + echo "Expected: \"${{ matrix.version }}\", Got: \"${image_node_version}\"" + [ "${image_node_version}" == "${{ matrix.version }}" ] + + - name: Test for npm + run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} npm --version + + - name: Test for yarn + run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} yarn --version diff --git a/.github/workflows/dockerfiles.yml b/.github/workflows/dockerfiles.yml deleted file mode 100644 index a9da1ab7ec..0000000000 --- a/.github/workflows/dockerfiles.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Check for out of sync YAML pipeline files - -on: [pull_request] - -jobs: - regen: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: ./update.sh -t - - run: git diff --color --exit-code diff --git a/genMatrix.js b/genMatrix.js new file mode 100644 index 0000000000..9f57ea5096 --- /dev/null +++ b/genMatrix.js @@ -0,0 +1,80 @@ +'use strict'; +const path = require('path'); +const fs = require('fs'); + +const testFiles = [ + 'genMatrix.js', + '.github/workflows/build-test.yml', +]; + +const nodeDirRegex = /^\d+$/; + +const areTestFilesChanged = (changedFiles) => changedFiles + .some((file) => testFiles.includes(file)); + +// Returns a list of the child directories in the given path +const getChildDirectories = (parent) => fs.readdirSync(parent, { withFileTypes: true }) + .filter((dirent) => dirent.isDirectory()) + .map(({ name }) => path.resolve(parent, name)); + +const getNodeVerionDirs = (base) => getChildDirectories(base) + .filter((childPath) => nodeDirRegex.test(path.basename(childPath))); + +// Returns the paths of Dockerfiles that are at: base/*/Dockerfile +const getDockerfilesInChildDirs = (base) => getChildDirectories(base) + .map((childDir) => path.resolve(childDir, 'Dockerfile')); + +const getAllDockerfiles = (base) => getNodeVerionDirs(base).flatMap(getDockerfilesInChildDirs); + +const getAffectedDockerfiles = (filesAdded, filesModified, filesRenamed) => { + const files = [ + ...filesAdded, + ...filesModified, + ...filesRenamed, + ]; + + // If the test files were changed, include everything + if (areTestFilesChanged(files)) { + console.log('Test files changed so scheduling all Dockerfiles'); + return getAllDockerfiles(__dirname); + } + + const modifiedDockerfiles = files.filter((file) => file.endsWith('/Dockerfile')); + + // Get Dockerfiles affected by modified docker-entrypoint.sh files + const entrypointAffectedDockerfiles = files + .filter((file) => file.endsWith('/docker-entrypoint.sh')) + .map((file) => path.resolve(path.dirname(file), 'Dockerfile')); + + return [ + ...modifiedDockerfiles, + ...entrypointAffectedDockerfiles, + ]; +}; + +const getFullNodeVersionFromDockerfile = (file) => fs.readFileSync(file, 'utf8') + .match(/^ENV NODE_VERSION (\d*\.*\d*\.\d*)/m)[1]; + +const getDockerfileMatrixEntry = (file) => { + const [variant] = path.dirname(file).split(path.sep).slice(-1); + + const version = getFullNodeVersionFromDockerfile(file); + + return { + version, + variant, + }; +}; + +const generateBuildMatrix = (filesAdded, filesModified, filesRenamed) => { + const dockerfiles = [...new Set(getAffectedDockerfiles(filesAdded, filesModified, filesRenamed))]; + + const entries = dockerfiles.map(getDockerfileMatrixEntry); + + // Return null if there are no entries so we can skip the matrix step + return entries.length + ? { include: entries } + : null; +}; + +module.exports = generateBuildMatrix; diff --git a/test-build.sh b/test-build.sh deleted file mode 100755 index 6614725d35..0000000000 --- a/test-build.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env bash -# -# Run a test build for all images. - -set -euo pipefail - -. functions.sh - -# Convert comma delimited cli arguments to arrays -# E.g. ./test-build.sh 10,12 slim,alpine -# "10,12" becomes "10 12" and "slim,alpine" becomes "slim alpine" -IFS=',' read -ra versions_arg <<< "${1:-}" -IFS=',' read -ra variant_arg <<< "${2:-}" - -default_variant=$(get_config "./" "default_variant") - -function build() { - local version - local tag - local variant - local full_tag - local path - version="$1" - shift - variant="$1" - shift - tag="$1" - shift - - full_tag=$(get_full_tag "${variant}" "${tag}") - path=$(get_path "${version}" "${variant}") - - info "Building ${full_tag}..." - - if ! docker build --cpuset-cpus="0,1" -t node:"${full_tag}" "${path}"; then - fatal "Build of ${full_tag} failed!" - fi - info "Build of ${full_tag} succeeded." -} - -function test_image() { - local full_version - local variant - local tag - local full_tag - full_version="$1" - shift - variant="$1" - shift - tag="$1" - shift - - full_tag=$(get_full_tag "${variant}" "${tag}") - - info "Testing ${full_tag}" - ( - export full_version=${full_version} - export full_tag=${full_tag} - bats test-image.bats - ) -} - -cd "$(cd "${0%/*}" && pwd -P)" || exit - -IFS=' ' read -ra versions <<< "$(get_versions . "${versions_arg[@]}")" -if [ ${#versions[@]} -eq 0 ]; then - fatal "No valid versions found!" -fi - -for version in "${versions[@]}"; do - # Skip "docs" and other non-docker directories - [ -f "${version}/Dockerfile" ] || [ -a "${version}/${default_variant}/Dockerfile" ] || continue - - tag=$(get_tag "${version}") - full_version=$(get_full_version "${version}") - - # Get supported variants according to the target architecture. - # See details in function.sh - IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "${version}")" "${variant_arg[@]}")" - - for variant in "${variants[@]}"; do - # Skip non-docker directories - [ -f "${version}/${variant}/Dockerfile" ] || continue - - build "${version}" "${variant}" "${tag}" - test_image "${full_version}" "${variant}" "${tag}" - done - -done - -info "All builds successful!" - -exit 0 diff --git a/test-image.bats b/test-image.bats deleted file mode 100755 index b424b95a4e..0000000000 --- a/test-image.bats +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bats - -@test "Test for node and version" { - run docker run --rm node:"$full_tag" node -e "process.stdout.write(process.versions.node)" - [ "$status" -eq 0 ] - [ "$output" == "${full_version}" ] -} - -@test "Test for npm" { - run docker run --rm node:"$full_tag" npm --version - [ "$status" -eq 0 ] -} - -@test "Test for yarn" { - run docker run --rm node:"$full_tag" yarn --version - [ "$status" -eq 0 ] -} diff --git a/update.sh b/update.sh index eaa3e78e17..507af21a75 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,6 @@ function usage() { - update.sh 8 buster-slim,buster # Update only buster's slim and buster variants for version 8 - update.sh -s 8 stretch # Update only stretch variant for version 8, skip updating Alpine and Yarn - update.sh . alpine # Update the alpine variant for all versions - - update.sh -b # Update CI files only OPTIONS: -s Security update; skip updating the yarn and alpine versions. @@ -29,17 +28,12 @@ EOF } SKIP=false -CI_ONLY=false -while getopts "sbh" opt; do +while getopts "sh" opt; do case "${opt}" in s) SKIP=true shift ;; - b) - CI_ONLY=true - shift - ;; h) usage exit @@ -197,56 +191,19 @@ function update_node_version() { ) } -function add_stage() { - local baseuri=${1} - shift - local version=${1} - shift - local variant=${1} - shift - - echo "name: ${version} on ${variant} - -on: - push: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - ${version}/${variant}/Dockerfile - pull_request: - paths: - - functions.sh - - test-build.sh - - test-image.bats - - ${version}/${variant}/Dockerfile - -jobs: - build: - name: ${version} on ${variant} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: sudo apt-get install bats - - run: ./test-build.sh ${version} ${variant}" > ".github/workflows/${version}-${variant}.yml" -} - for version in "${versions[@]}"; do parentpath=$(dirname "${version}") versionnum=$(basename "${version}") baseuri=$(get_config "${parentpath}" "baseuri") update_version=$(in_versions_to_update "${version}") - [ "${update_version}" -eq 0 ] && [ true != "$CI_ONLY" ] && info "Updating version ${version}..." + [ "${update_version}" -eq 0 ] && info "Updating version ${version}..." # Get supported variants according the target architecture # See details in function.sh IFS=' ' read -ra variants <<< "$(get_variants "${parentpath}")" if [ -f "${version}/Dockerfile" ]; then - add_stage "${baseuri}" "${version}" "default" - [ true = "$CI_ONLY" ] && continue - if [ "${update_version}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & fi @@ -255,8 +212,6 @@ for version in "${versions[@]}"; do for variant in "${variants[@]}"; do # Skip non-docker directories [ -f "${version}/${variant}/Dockerfile" ] || continue - add_stage "${baseuri}" "${version}" "${variant}" - [ true = "$CI_ONLY" ] && continue update_variant=$(in_variants_to_update "${variant}") template_file="${parentpath}/Dockerfile-${variant}.template" From 7b11db1cab459beb96448e18ec421ec952fa0491 Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Thu, 15 Oct 2020 21:22:12 -0500 Subject: [PATCH 406/818] feat: upgrade node to 14.14.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 89ae411c0f..e8f902df2f 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.13.1 +ENV NODE_VERSION 14.14.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="b8b33ec1d2f6463ded7c02bf29ef4141ff4aabb2c0e0ba14cf16ac7c0a6a31a5" \ + CHECKSUM="03e07b7e8d1c0aee204a4db53d9e84748623d2498476226b68eaaf61280a2e59" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 001e9a2b70..3d5fce68bb 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.13.1 +ENV NODE_VERSION 14.14.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="b8b33ec1d2f6463ded7c02bf29ef4141ff4aabb2c0e0ba14cf16ac7c0a6a31a5" \ + CHECKSUM="03e07b7e8d1c0aee204a4db53d9e84748623d2498476226b68eaaf61280a2e59" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index f38f56d01c..ba9364d495 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.13.1 +ENV NODE_VERSION 14.14.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="b8b33ec1d2f6463ded7c02bf29ef4141ff4aabb2c0e0ba14cf16ac7c0a6a31a5" \ + CHECKSUM="03e07b7e8d1c0aee204a4db53d9e84748623d2498476226b68eaaf61280a2e59" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index bf18b41773..3f56339f43 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.13.1 +ENV NODE_VERSION 14.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 96a2335a8c..8049842fdd 100644 --- a/14/buster/Dockerfile +++ b/14/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.13.1 +ENV NODE_VERSION 14.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 75f22c3272..fcac63d3da 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.13.1 +ENV NODE_VERSION 14.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 55e04829e6..7b2cce1126 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.13.1 +ENV NODE_VERSION 14.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9a8ea84f6258c8ad9edbb010484a52016df66e8d Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 20 Oct 2020 17:53:24 +0200 Subject: [PATCH 407/818] feat: add node v15.0.0 https://nodejs.org/en/blog/release/v15.0.0/ --- 15/alpine3.10/Dockerfile | 100 +++++++++++++++++++++++++++ 15/alpine3.10/docker-entrypoint.sh | 8 +++ 15/alpine3.11/Dockerfile | 100 +++++++++++++++++++++++++++ 15/alpine3.11/docker-entrypoint.sh | 8 +++ 15/alpine3.12/Dockerfile | 100 +++++++++++++++++++++++++++ 15/alpine3.12/docker-entrypoint.sh | 8 +++ 15/architectures | 7 ++ 15/buster-slim/Dockerfile | 96 +++++++++++++++++++++++++ 15/buster-slim/docker-entrypoint.sh | 8 +++ 15/buster/Dockerfile | 72 +++++++++++++++++++ 15/buster/docker-entrypoint.sh | 8 +++ 15/stretch-slim/Dockerfile | 96 +++++++++++++++++++++++++ 15/stretch-slim/docker-entrypoint.sh | 8 +++ 15/stretch/Dockerfile | 72 +++++++++++++++++++ 15/stretch/docker-entrypoint.sh | 8 +++ config | 4 +- generate-stackbrew-library.sh | 4 +- 17 files changed, 704 insertions(+), 3 deletions(-) create mode 100644 15/alpine3.10/Dockerfile create mode 100755 15/alpine3.10/docker-entrypoint.sh create mode 100644 15/alpine3.11/Dockerfile create mode 100755 15/alpine3.11/docker-entrypoint.sh create mode 100644 15/alpine3.12/Dockerfile create mode 100755 15/alpine3.12/docker-entrypoint.sh create mode 100644 15/architectures create mode 100644 15/buster-slim/Dockerfile create mode 100755 15/buster-slim/docker-entrypoint.sh create mode 100644 15/buster/Dockerfile create mode 100755 15/buster/docker-entrypoint.sh create mode 100644 15/stretch-slim/Dockerfile create mode 100755 15/stretch-slim/docker-entrypoint.sh create mode 100644 15/stretch/Dockerfile create mode 100755 15/stretch/docker-entrypoint.sh diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile new file mode 100644 index 0000000000..1f42990ffc --- /dev/null +++ b/15/alpine3.10/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.10 + +ENV NODE_VERSION 15.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="df1baec61cfc066f8e32366d67c7faf7b6fa117337f76629a0dd45ee490671d2" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/alpine3.10/docker-entrypoint.sh b/15/alpine3.10/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/alpine3.10/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile new file mode 100644 index 0000000000..76afd11a19 --- /dev/null +++ b/15/alpine3.11/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.11 + +ENV NODE_VERSION 15.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="df1baec61cfc066f8e32366d67c7faf7b6fa117337f76629a0dd45ee490671d2" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/alpine3.11/docker-entrypoint.sh b/15/alpine3.11/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/alpine3.11/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile new file mode 100644 index 0000000000..75ab778d90 --- /dev/null +++ b/15/alpine3.12/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.12 + +ENV NODE_VERSION 15.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="df1baec61cfc066f8e32366d67c7faf7b6fa117337f76629a0dd45ee490671d2" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/alpine3.12/docker-entrypoint.sh b/15/alpine3.12/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/alpine3.12/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/15/architectures b/15/architectures new file mode 100644 index 0000000000..e596715982 --- /dev/null +++ b/15/architectures @@ -0,0 +1,7 @@ +bashbrew-arch variants +amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12 +arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile new file mode 100644 index 0000000000..e89530d9f0 --- /dev/null +++ b/15/buster-slim/Dockerfile @@ -0,0 +1,96 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 15.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/buster-slim/docker-entrypoint.sh b/15/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile new file mode 100644 index 0000000000..f663df6eb2 --- /dev/null +++ b/15/buster/Dockerfile @@ -0,0 +1,72 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 15.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/buster/docker-entrypoint.sh b/15/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile new file mode 100644 index 0000000000..2dfb20a286 --- /dev/null +++ b/15/stretch-slim/Dockerfile @@ -0,0 +1,96 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 15.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/stretch-slim/docker-entrypoint.sh b/15/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile new file mode 100644 index 0000000000..59761919a6 --- /dev/null +++ b/15/stretch/Dockerfile @@ -0,0 +1,72 @@ +FROM buildpack-deps:stretch + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 15.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/stretch/docker-entrypoint.sh b/15/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/config b/config index 101bfe76b1..ca753d87b8 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist -default_variant stretch -alpine_version 3.11 +default_variant buster +alpine_version 3.12 debian_versions stretch buster diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 2222c17823..d0f9d7b701 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -11,7 +11,9 @@ array_10='10 dubnium' # shellcheck disable=SC2034 array_12='12 erbium lts' # shellcheck disable=SC2034 -array_14='14 latest current' +array_14='14' +# shellcheck disable=SC2034 +array_15='15 latest current' default_variant=$(get_config "./" "default_variant") From a170bca461426df481abadb24a7f676aa79d5aba Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 21 Oct 2020 20:44:23 -0400 Subject: [PATCH 408/818] fix: Revert default variant changes --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config b/config index ca753d87b8..101bfe76b1 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist -default_variant buster -alpine_version 3.12 +default_variant stretch +alpine_version 3.11 debian_versions stretch buster From 56e1954bd38408f9e1ba8639486edd896f50b88f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 21 Oct 2020 20:48:45 -0400 Subject: [PATCH 409/818] chore: Trigger upstream PR on config change --- .github/workflows/official-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index e9af41d165..9084654d38 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -12,6 +12,7 @@ on: - "**/docker-entrypoint.sh" - "generate-stackbrew-library.sh" - "functions.sh" + - "config" jobs: pr: From ca12e1da5d0fffc240fdb24e85052c6fa298a822 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 22 Oct 2020 14:30:33 -0400 Subject: [PATCH 410/818] chore: Sort and sync default architecture file - Remove slim architectures no longer supported - Sort architecture names to match children --- architectures | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/architectures b/architectures index 822603ba90..2d5e52a630 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ -bashbrew-arch variants -amd64 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm32v6 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm32v7 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -arm64v8 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -i386 stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -ppc64le stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 -s390x stretch,stretch-slim,buster,buster-slim,alpine3.9,alpine3.10,alpine3.11,alpine3.12 +bashbrew-arch variants +amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.9 +arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim +i386 alpine3.10,alpine3.11,alpine3.12,alpine3.9 +ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim From d58d7e65c4f92ef22a190b0ca835ce62464ff3ba Mon Sep 17 00:00:00 2001 From: Travis Shivers Date: Wed, 21 Oct 2020 22:15:06 -0500 Subject: [PATCH 411/818] feat: upgrade to node 15.0.1 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 1f42990ffc..82555bbbe5 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.0.0 +ENV NODE_VERSION 15.0.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="df1baec61cfc066f8e32366d67c7faf7b6fa117337f76629a0dd45ee490671d2" \ + CHECKSUM="6c855f5aa9f93d1a9d2415dc70b567c7f06bb2b47309098934d790d51cae4d66" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 76afd11a19..0ffcc5feeb 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.0.0 +ENV NODE_VERSION 15.0.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="df1baec61cfc066f8e32366d67c7faf7b6fa117337f76629a0dd45ee490671d2" \ + CHECKSUM="6c855f5aa9f93d1a9d2415dc70b567c7f06bb2b47309098934d790d51cae4d66" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 75ab778d90..f07389792e 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.0.0 +ENV NODE_VERSION 15.0.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="df1baec61cfc066f8e32366d67c7faf7b6fa117337f76629a0dd45ee490671d2" \ + CHECKSUM="6c855f5aa9f93d1a9d2415dc70b567c7f06bb2b47309098934d790d51cae4d66" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index e89530d9f0..0aaec26fb5 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.0.0 +ENV NODE_VERSION 15.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index f663df6eb2..13471e7d1c 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.0.0 +ENV NODE_VERSION 15.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 2dfb20a286..82e0e2cf2c 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.0.0 +ENV NODE_VERSION 15.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 59761919a6..9fcb2f9ce9 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.0.0 +ENV NODE_VERSION 15.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c2604466d06ba562fd9040d18c57af16545c6a5b Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 27 Oct 2020 17:29:12 +0100 Subject: [PATCH 412/818] chore: update to v10.23.0 & v14.15.0 https://nodejs.org/en/blog/release/v10.23.0/ https://nodejs.org/en/blog/release/v14.15.0/ --- 10/alpine3.10/Dockerfile | 7 ++++--- 10/alpine3.11/Dockerfile | 7 ++++--- 10/alpine3.9/Dockerfile | 7 ++++--- 10/buster-slim/Dockerfile | 5 +++-- 10/buster/Dockerfile | 5 +++-- 10/stretch-slim/Dockerfile | 5 +++-- 10/stretch/Dockerfile | 5 +++-- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- generate-stackbrew-library.sh | 4 ++-- 15 files changed, 36 insertions(+), 29 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index ebad2ff468..773abb4958 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.22.1 +ENV NODE_VERSION 10.23.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="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ + CHECKSUM="149ab80ab7e618acd7b8402dbb86ff13d89cd4a0b39d45ee9b735944e1b89737" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ @@ -71,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index b6472e4091..6b355bc51a 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.22.1 +ENV NODE_VERSION 10.23.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="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ + CHECKSUM="149ab80ab7e618acd7b8402dbb86ff13d89cd4a0b39d45ee9b735944e1b89737" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ @@ -71,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index 8cdfc97999..adb513e0b0 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.22.1 +ENV NODE_VERSION 10.23.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="72f0693db768ef07c712e7a575bd6914b8a74338e91e9e969c8d7e2a832d38f3" \ + CHECKSUM="149ab80ab7e618acd7b8402dbb86ff13d89cd4a0b39d45ee9b735944e1b89737" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ @@ -71,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 3dfe42dedd..77deadc62f 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.22.1 +ENV NODE_VERSION 10.23.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ @@ -55,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 8ac9c75e4b..184d58de6f 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.22.1 +ENV NODE_VERSION 10.23.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ @@ -44,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 1a1d2036ae..c6eb006522 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.22.1 +ENV NODE_VERSION 10.23.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ @@ -55,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 53d43a2129..c494aa4ecd 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.22.1 +ENV NODE_VERSION 10.23.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ @@ -44,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.4 +ENV YARN_VERSION 1.22.5 RUN set -ex \ && for key in \ diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index e8f902df2f..566b78c376 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.14.0 +ENV NODE_VERSION 14.15.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="03e07b7e8d1c0aee204a4db53d9e84748623d2498476226b68eaaf61280a2e59" \ + CHECKSUM="452b407a2d85b2eeaa58a5b99fb864cb9f9d3f3602f1610b7ea4c7e9007e2ce3" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 3d5fce68bb..68d870d186 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.14.0 +ENV NODE_VERSION 14.15.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="03e07b7e8d1c0aee204a4db53d9e84748623d2498476226b68eaaf61280a2e59" \ + CHECKSUM="452b407a2d85b2eeaa58a5b99fb864cb9f9d3f3602f1610b7ea4c7e9007e2ce3" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index ba9364d495..ed31a2edbf 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.14.0 +ENV NODE_VERSION 14.15.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="03e07b7e8d1c0aee204a4db53d9e84748623d2498476226b68eaaf61280a2e59" \ + CHECKSUM="452b407a2d85b2eeaa58a5b99fb864cb9f9d3f3602f1610b7ea4c7e9007e2ce3" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 3f56339f43..84d8adbe31 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.14.0 +ENV NODE_VERSION 14.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 8049842fdd..7e33e3e344 100644 --- a/14/buster/Dockerfile +++ b/14/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.14.0 +ENV NODE_VERSION 14.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index fcac63d3da..4d40dd3567 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.14.0 +ENV NODE_VERSION 14.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 7b2cce1126..af94fc1270 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.14.0 +ENV NODE_VERSION 14.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d0f9d7b701..aafe46b419 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -9,9 +9,9 @@ hash git 2> /dev/null || { echo >&2 "git not found, exiting."; } # shellcheck disable=SC2034 array_10='10 dubnium' # shellcheck disable=SC2034 -array_12='12 erbium lts' +array_12='12 erbium' # shellcheck disable=SC2034 -array_14='14' +array_14='14 fermium lts' # shellcheck disable=SC2034 array_15='15 latest current' From aac823513e871573d5bd819d19091610e19f26d3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 27 Oct 2020 19:36:00 -0400 Subject: [PATCH 413/818] chore: Add nschonni and ttshivers to official PR --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 9084654d38..a05ded1a86 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -50,7 +50,7 @@ jobs: title: "Node: ${{ github.event.pull_request.title }}" body: | Pull Request: ${{ github.event.pull_request.html_url }} - @LaurentGoderre @pesho @PeterDaveHello @SimenB @Starefossen + @LaurentGoderre @pesho @PeterDaveHello @SimenB @Starefossen @nschonni @ttshivers - name: PR details run: | From c65f06c86b06c56da7dde4c1bf55fd18747cb7b6 Mon Sep 17 00:00:00 2001 From: Rishab Arora Date: Mon, 2 Nov 2020 17:37:24 +0530 Subject: [PATCH 414/818] Add buster and stretch to the image variant list As the title suggests, please add buster and stretch in the image variants list. --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 072637a460..1144af5f59 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,8 @@ The official Node.js docker image, made with love by the node community. - [Image Variants](#image-variants) - [`node:`](#nodeversion) - [`node:alpine`](#nodealpine) + - [`node:buster`](#nodebuster) + - [`node:stretch`](#nodestretch) - [`node:slim`](#nodeslim) - [License](#license) - [Supported Docker versions](#supported-docker-versions) @@ -190,6 +192,19 @@ image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). +### Debian Based Images +## `node:buster` +This image is based on version 10 of +[Debian](http://debian.org), available in +[the `debian` official image](https://hub.docker.com/_/debian). Debian is +completely open source, and thus can be contributed too and made better. + +## `node:stretch` +This image is based on version 9 of +[Debian](http://debian.org), available in +[the `debian` official image](https://hub.docker.com/_/debian). Debian is +completely open source, and thus can be contributed too and made better. + ### `node:slim` This image does not contain the common packages contained in the default tag and From 3be20797f947cb48250ce6397a866aa0887ddcf5 Mon Sep 17 00:00:00 2001 From: Rishab Arora Date: Mon, 2 Nov 2020 17:42:00 +0530 Subject: [PATCH 415/818] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1144af5f59..610b2d51b8 100644 --- a/README.md +++ b/README.md @@ -192,14 +192,13 @@ image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). -### Debian Based Images -## `node:buster` +### `node:buster` This image is based on version 10 of [Debian](http://debian.org), available in [the `debian` official image](https://hub.docker.com/_/debian). Debian is completely open source, and thus can be contributed too and made better. -## `node:stretch` +### `node:stretch` This image is based on version 9 of [Debian](http://debian.org), available in [the `debian` official image](https://hub.docker.com/_/debian). Debian is From b34318aeb9c13d2c45d5b62e3b6691e6ca879194 Mon Sep 17 00:00:00 2001 From: Rishab Arora Date: Mon, 2 Nov 2020 21:01:25 +0530 Subject: [PATCH 416/818] Update README.md Co-authored-by: Simen Bekkhus --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 610b2d51b8..1afe577350 100644 --- a/README.md +++ b/README.md @@ -195,14 +195,12 @@ examples of how to install packages if you are unfamiliar). ### `node:buster` This image is based on version 10 of [Debian](http://debian.org), available in -[the `debian` official image](https://hub.docker.com/_/debian). Debian is -completely open source, and thus can be contributed too and made better. +[the `debian` official image](https://hub.docker.com/_/debian). ### `node:stretch` This image is based on version 9 of [Debian](http://debian.org), available in -[the `debian` official image](https://hub.docker.com/_/debian). Debian is -completely open source, and thus can be contributed too and made better. +[the `debian` official image](https://hub.docker.com/_/debian). ### `node:slim` From 747216238b68525f68f176959b00af5968260b9c Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 2 Nov 2020 10:58:56 -0500 Subject: [PATCH 417/818] fix: DocToc in Bestpractices.md Add control statements and re-run generation --- docs/BestPractices.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index c883b2a0a4..97117fee3c 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -1,17 +1,23 @@ # Docker and Node.js Best Practices + + ## Table of Contents - [Environment Variables](#environment-variables) - [Global npm dependencies](#global-npm-dependencies) - [Upgrading/downgrading Yarn](#upgradingdowngrading-yarn) + - [Local](#local) + - [Global](#global) - [Handling Kernel Signals](#handling-kernel-signals) - [Non-root User](#non-root-user) - [Memory](#memory) - [CMD](#cmd) - [Docker Run](#docker-run) - [Security](#security) -- [node-gyp in alpine variant](#node-gyp-alpine) +- [node-gyp alpine](#node-gyp-alpine) + + ## Environment Variables From 1825e3dd00b8423dca519ff8589906d3428f5a8b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 2 Nov 2020 13:01:23 -0500 Subject: [PATCH 418/818] chore: Point to nodejs admin CoC --- GOVERNANCE.md | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 77020bc50c..fb0b9a698f 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -141,44 +141,5 @@ By making a contribution to this project, I certify that: ## Code of Conduct -This Code of Conduct is adapted from [Rust's wonderful -CoC](https://github.com/rust-lang/rust/wiki/Note-development-policy#conduct). - -* We are committed to providing a friendly, safe and welcoming - environment for all, regardless of gender, sexual orientation, - disability, ethnicity, religion, or similar personal characteristic. - -* Please avoid using overtly sexual nicknames or other nicknames that - might detract from a friendly, safe and welcoming environment for - all. - -* Please be kind and courteous. There's no need to be mean or rude. -* Respect that people have differences of opinion and that every - design or implementation choice carries a trade-off and numerous - costs. There is seldom a right answer. - -* Please keep unstructured critique to a minimum. If you have solid - ideas you want to experiment with, make a fork and see how it works. - -* We will exclude you from interaction if you insult, demean or harass - anyone. That is not welcome behaviour. We interpret the term - "harassment" as including the definition in the [Citizen Code of - Conduct](http://citizencodeofconduct.org/); if you have any lack of - clarity about what might be included in that concept, please read - their definition. In particular, we don't tolerate behavior that - excludes people in socially marginalized groups. - -* Private harassment is also unacceptable. No matter who you are, if - you feel you have been or are being harassed or made uncomfortable - by a community member, please contact one of the channel ops or any - of the TC members immediately with a capture (log, photo, email) of - the harassment if possible. Whether you're a regular contributor or - a newcomer, we care about making this community a safe place for you - and we've got your back. - -* Likewise any spamming, trolling, flaming, baiting or other - attention-stealing behaviour is not welcome. - -* Avoid the use of personal pronouns in code comments or - documentation. There is no need to address persons when explaining - code (e.g. "When the developer") +The Node.js Code of Conduct, which applies to this project, can be found at +. From ca3217a6e461e2744d89083a0cc0b81fd2286d90 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 2 Nov 2020 17:42:03 -0500 Subject: [PATCH 419/818] chore: Don't comment on PR for no-op --- .github/workflows/official-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index a05ded1a86..74c6809eff 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -59,6 +59,7 @@ jobs: - name: Create PR comment uses: peter-evans/create-or-update-comment@v1 + if: ${{ steps.create-pr.outputs.pull-request-url != '' }} with: issue-number: ${{ github.event.pull_request.number }} body: | From 48663687bf55d8c070e1d7135fd5b45f61806e4f Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 5 Nov 2020 00:38:01 +0100 Subject: [PATCH 420/818] feat: update to node 15.1.0 https://nodejs.org/en/blog/release/v15.1.0/ --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 82555bbbe5..2e5507af3e 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.0.1 +ENV NODE_VERSION 15.1.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="6c855f5aa9f93d1a9d2415dc70b567c7f06bb2b47309098934d790d51cae4d66" \ + CHECKSUM="a13c18ddeb849267e6321ca97570259a0651e42ec43b10a29ef119c79a2adcd6" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 0ffcc5feeb..a365a3be01 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.0.1 +ENV NODE_VERSION 15.1.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="6c855f5aa9f93d1a9d2415dc70b567c7f06bb2b47309098934d790d51cae4d66" \ + CHECKSUM="a13c18ddeb849267e6321ca97570259a0651e42ec43b10a29ef119c79a2adcd6" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index f07389792e..a69cef35ba 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.0.1 +ENV NODE_VERSION 15.1.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="6c855f5aa9f93d1a9d2415dc70b567c7f06bb2b47309098934d790d51cae4d66" \ + CHECKSUM="a13c18ddeb849267e6321ca97570259a0651e42ec43b10a29ef119c79a2adcd6" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 0aaec26fb5..a15098bb28 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.0.1 +ENV NODE_VERSION 15.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 13471e7d1c..32484d672c 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.0.1 +ENV NODE_VERSION 15.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 82e0e2cf2c..8c710f7571 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.0.1 +ENV NODE_VERSION 15.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 9fcb2f9ce9..27a6480d12 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.0.1 +ENV NODE_VERSION 15.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f95299db93314da688432592b528409f844989ed Mon Sep 17 00:00:00 2001 From: Sudipto Ghosh Date: Thu, 8 Oct 2020 23:22:14 +0530 Subject: [PATCH 421/818] added issue and pr templates --- .github/ISSUE_TEMPLATE/1-bug-report.md | 48 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/2-feature-request.md | 29 ++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 14 ++++++ .github/PULL_REQUEST_TEMPLATE.md | 50 +++++++++++++++++++++ 4 files changed, 141 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/1-bug-report.md create mode 100644 .github/ISSUE_TEMPLATE/2-feature-request.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md new file mode 100644 index 0000000000..d8ea9da3b4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/1-bug-report.md @@ -0,0 +1,48 @@ +--- +name: "\U0001F41B Bug Report" +about: Create a bug report to help us improve +--- + + + +## Environment + +* **Platform**: +* **Docker Version**: +* **Node.js Version**: +* **Image Tag**: + +## Expected Behavior + + + +## Current Behavior + + + +## Possible Solution + + + +## Steps to Reproduce + + + +## Additional Information + + + diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md new file mode 100644 index 0000000000..31a875664e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/2-feature-request.md @@ -0,0 +1,29 @@ +--- +name: "\U0001F680 Feature Request" +about: Suggest an idea for this project +--- + + + +## Problem + + + +## Solution + + + +## Alternatives to Consider + + + diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000..d08bfe4cf3 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,14 @@ +blank_issues_enabled: false +contact_links: + - name: Need help with Node.js? + url: https://github.com/nodejs/help + about: Please file an issue in our help repo. + - name: Found a problem with Node.js beyond the API reference documentation? + url: https://github.com/nodejs/nodejs.org/issues/new/choose + about: Please file an issue in the Node.js website repository. + - name: Want to report security issues or vulnerabilites? + url: https://github.com/nodejs/docker-node/security/policy + about: Please go through our policy for reporting CVEs and security issues. + - name: Need help with common questions related to using Node.js with Docker? + url: https://stackoverflow.com/questions/tagged/node.js%2bdocker%2bdockerfile + about: Please visit Stack Overflow to explore related questions and answers. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..431978e4d1 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,50 @@ + + +## Description + + + +## Motivation and Context + + + +## Testing Details + + + +## Example Output(if appropriate) + +## Types of changes + + + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to change) + +## Checklist + + + +- [ ] My code follows the code style of this project. +- [ ] My change requires a change to the documentation. +- [ ] I have updated the documentation accordingly. +- [ ] I have read the **CONTRIBUTING.md** document. +- [ ] All new and existing tests passed. + From d5d4624b9fef82ae942f8de232c7bdca54b61fc7 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 11 Nov 2020 01:01:55 -0500 Subject: [PATCH 422/818] feat: Update to Node 15.2.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 2e5507af3e..338573fab6 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.1.0 +ENV NODE_VERSION 15.2.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="a13c18ddeb849267e6321ca97570259a0651e42ec43b10a29ef119c79a2adcd6" \ + CHECKSUM="240895f1ac8983aea1c845dfee00938c5fced6235102e5f313277627fad36da2" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index a365a3be01..8c6ac113eb 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.1.0 +ENV NODE_VERSION 15.2.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="a13c18ddeb849267e6321ca97570259a0651e42ec43b10a29ef119c79a2adcd6" \ + CHECKSUM="240895f1ac8983aea1c845dfee00938c5fced6235102e5f313277627fad36da2" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index a69cef35ba..d7a2b3b639 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.1.0 +ENV NODE_VERSION 15.2.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="a13c18ddeb849267e6321ca97570259a0651e42ec43b10a29ef119c79a2adcd6" \ + CHECKSUM="240895f1ac8983aea1c845dfee00938c5fced6235102e5f313277627fad36da2" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index a15098bb28..452fdb4d25 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.1.0 +ENV NODE_VERSION 15.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 32484d672c..e7a55622b2 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.1.0 +ENV NODE_VERSION 15.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 8c710f7571..e089ec4637 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.1.0 +ENV NODE_VERSION 15.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 27a6480d12..49be594af8 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.1.0 +ENV NODE_VERSION 15.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From ba99d6d8dfa58fa4595ad3b23693d17fad05c44e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 17 Nov 2020 00:41:30 +0800 Subject: [PATCH 423/818] November 2020 Security Releases for Debian base images References: - https://nodejs.org/en/blog/release/v12.19.1 - https://nodejs.org/en/blog/release/v14.15.1 - https://nodejs.org/en/blog/release/v15.2.1 - https://nodejs.org/en/blog/vulnerability/november-2020-security-releases/ --- 12/buster-slim/Dockerfile | 3 ++- 12/buster/Dockerfile | 3 ++- 12/stretch-slim/Dockerfile | 3 ++- 12/stretch/Dockerfile | 3 ++- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 5cd732bbd0..dcc9b3f8c8 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.19.0 +ENV NODE_VERSION 12.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 90a94be1f9..f6867c3e50 100644 --- a/12/buster/Dockerfile +++ b/12/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.19.0 +ENV NODE_VERSION 12.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 2e2fe2cc2b..aa3cd0344b 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.19.0 +ENV NODE_VERSION 12.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,6 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index e0d9bdc9e0..d7e283f66c 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.19.0 +ENV NODE_VERSION 12.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,6 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 84d8adbe31..772cc57727 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.15.0 +ENV NODE_VERSION 14.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 7e33e3e344..3e23c3c3a9 100644 --- a/14/buster/Dockerfile +++ b/14/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.15.0 +ENV NODE_VERSION 14.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 4d40dd3567..c19c6ef91c 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.15.0 +ENV NODE_VERSION 14.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index af94fc1270..dbeb84c5a5 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.15.0 +ENV NODE_VERSION 14.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 452fdb4d25..166045bd93 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.2.0 +ENV NODE_VERSION 15.2.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index e7a55622b2..8b8f44d773 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.2.0 +ENV NODE_VERSION 15.2.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index e089ec4637..fc7c18446b 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.2.0 +ENV NODE_VERSION 15.2.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 49be594af8..94e4c32463 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.2.0 +ENV NODE_VERSION 15.2.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 41ea0562287bbf98693572c9228edc1beb7fd709 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 16 Nov 2020 16:18:34 -0500 Subject: [PATCH 424/818] feat: November 16 Security Updates for Apline --- 12/alpine3.10/Dockerfile | 5 +++-- 12/alpine3.11/Dockerfile | 5 +++-- 12/alpine3.12/Dockerfile | 5 +++-- 12/alpine3.9/Dockerfile | 5 +++-- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index e5a1b795b9..900a249a10 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.19.0 +ENV NODE_VERSION 12.19.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="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ + CHECKSUM="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 8007796104..8f37816eed 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.19.0 +ENV NODE_VERSION 12.19.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="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ + CHECKSUM="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index f56baf3a47..ac8481ff99 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.19.0 +ENV NODE_VERSION 12.19.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="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ + CHECKSUM="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 2bad543831..c3517fd821 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.19.0 +ENV NODE_VERSION 12.19.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="0d26ef0d4fa7ffe4f9f4a954bbf6172372528636acf2a69b0fc9ac22e247ac23" \ + CHECKSUM="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ ;; \ *) ;; \ esac \ @@ -38,6 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 1C050899334244A8AF75E53792EF661D867B9DFA \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 566b78c376..45836d3d14 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.15.0 +ENV NODE_VERSION 14.15.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="452b407a2d85b2eeaa58a5b99fb864cb9f9d3f3602f1610b7ea4c7e9007e2ce3" \ + CHECKSUM="eec29c217b423618d3ec2be597ce34667c285363373b58783b77fa34a59a8ef1" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 68d870d186..9cc9d8403b 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.15.0 +ENV NODE_VERSION 14.15.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="452b407a2d85b2eeaa58a5b99fb864cb9f9d3f3602f1610b7ea4c7e9007e2ce3" \ + CHECKSUM="eec29c217b423618d3ec2be597ce34667c285363373b58783b77fa34a59a8ef1" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index ed31a2edbf..79901d3f70 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.15.0 +ENV NODE_VERSION 14.15.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="452b407a2d85b2eeaa58a5b99fb864cb9f9d3f3602f1610b7ea4c7e9007e2ce3" \ + CHECKSUM="eec29c217b423618d3ec2be597ce34667c285363373b58783b77fa34a59a8ef1" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 338573fab6..4082cfd385 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.2.0 +ENV NODE_VERSION 15.2.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="240895f1ac8983aea1c845dfee00938c5fced6235102e5f313277627fad36da2" \ + CHECKSUM="808018fd315bbe795c9507059654c87e33d7bcd32e2a2c1eca7eccda0a6146c7" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 8c6ac113eb..8c45f80e38 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.2.0 +ENV NODE_VERSION 15.2.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="240895f1ac8983aea1c845dfee00938c5fced6235102e5f313277627fad36da2" \ + CHECKSUM="808018fd315bbe795c9507059654c87e33d7bcd32e2a2c1eca7eccda0a6146c7" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index d7a2b3b639..a9516d9161 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.2.0 +ENV NODE_VERSION 15.2.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="240895f1ac8983aea1c845dfee00938c5fced6235102e5f313277627fad36da2" \ + CHECKSUM="808018fd315bbe795c9507059654c87e33d7bcd32e2a2c1eca7eccda0a6146c7" \ ;; \ *) ;; \ esac \ From ecab21f67543ce370cca404b925b21fdc35ea0b2 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Nov 2020 04:09:34 +0800 Subject: [PATCH 425/818] Update node.js v12 from v12.19.1 to v12.20.0 Reference: - https://nodejs.org/en/blog/release/v12.20.0/ - https://github.com/nodejs/node/releases/tag/v12.20.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.20.0 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 900a249a10..87402b062f 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.19.1 +ENV NODE_VERSION 12.20.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="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ + CHECKSUM="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 8f37816eed..0701debf2f 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.19.1 +ENV NODE_VERSION 12.20.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="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ + CHECKSUM="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index ac8481ff99..b346742287 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.19.1 +ENV NODE_VERSION 12.20.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="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ + CHECKSUM="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index c3517fd821..49c3af858a 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.19.1 +ENV NODE_VERSION 12.20.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="eaf8642a5577bb91daf22ce37281d10ac381eee678bc15b0f1501deeb52b84d5" \ + CHECKSUM="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index dcc9b3f8c8..2a38b5046f 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.19.1 +ENV NODE_VERSION 12.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index f6867c3e50..d33afea1e6 100644 --- a/12/buster/Dockerfile +++ b/12/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.19.1 +ENV NODE_VERSION 12.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index aa3cd0344b..6880dd13c5 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.19.1 +ENV NODE_VERSION 12.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index d7e283f66c..28876a2a2a 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.19.1 +ENV NODE_VERSION 12.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 36c93521a25730e203a55b18c4ad73f980874a0a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 25 Nov 2020 04:11:16 +0800 Subject: [PATCH 426/818] Update node.js v15 from v15.2.1 to v15.3.0 Reference: - https://nodejs.org/en/blog/release/v15.3.0/ - https://github.com/nodejs/node/releases/tag/v15.3.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V15.md#15.3.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 4082cfd385..80971e65ce 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.2.1 +ENV NODE_VERSION 15.3.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="808018fd315bbe795c9507059654c87e33d7bcd32e2a2c1eca7eccda0a6146c7" \ + CHECKSUM="6ba70dba85f12505767eb84c8a563ac198f33867a7beb26786357ec15e732a05" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 8c45f80e38..f5a6ae46a0 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.2.1 +ENV NODE_VERSION 15.3.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="808018fd315bbe795c9507059654c87e33d7bcd32e2a2c1eca7eccda0a6146c7" \ + CHECKSUM="6ba70dba85f12505767eb84c8a563ac198f33867a7beb26786357ec15e732a05" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index a9516d9161..4ddb0edea5 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.2.1 +ENV NODE_VERSION 15.3.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="808018fd315bbe795c9507059654c87e33d7bcd32e2a2c1eca7eccda0a6146c7" \ + CHECKSUM="6ba70dba85f12505767eb84c8a563ac198f33867a7beb26786357ec15e732a05" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 166045bd93..1b9c7d1b07 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.2.1 +ENV NODE_VERSION 15.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 8b8f44d773..830c101024 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.2.1 +ENV NODE_VERSION 15.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index fc7c18446b..1d0022fbfc 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.2.1 +ENV NODE_VERSION 15.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 94e4c32463..550101cfd8 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.2.1 +ENV NODE_VERSION 15.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From dd05dd89c6e158a4893109e42d51cd0f5065d631 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 10 Dec 2020 01:14:30 +0800 Subject: [PATCH 427/818] Update node.js v15 from v15.3.0 to v15.4.0 Reference: - https://nodejs.org/en/blog/release/v15.4.0/ - https://github.com/nodejs/node/releases/tag/v15.4.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V15.md#15.4.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 80971e65ce..8c68f8ecd0 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.3.0 +ENV NODE_VERSION 15.4.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="6ba70dba85f12505767eb84c8a563ac198f33867a7beb26786357ec15e732a05" \ + CHECKSUM="ecc96ecf8e1f54a4dbf145f5513bd14810b0161e56b50076c4dbfaf827e6ff8f" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index f5a6ae46a0..2082c64dfe 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.3.0 +ENV NODE_VERSION 15.4.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="6ba70dba85f12505767eb84c8a563ac198f33867a7beb26786357ec15e732a05" \ + CHECKSUM="ecc96ecf8e1f54a4dbf145f5513bd14810b0161e56b50076c4dbfaf827e6ff8f" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 4ddb0edea5..b5f2c8bd8e 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.3.0 +ENV NODE_VERSION 15.4.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="6ba70dba85f12505767eb84c8a563ac198f33867a7beb26786357ec15e732a05" \ + CHECKSUM="ecc96ecf8e1f54a4dbf145f5513bd14810b0161e56b50076c4dbfaf827e6ff8f" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 1b9c7d1b07..55e8dc82e2 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.3.0 +ENV NODE_VERSION 15.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 830c101024..ee578c73fe 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.3.0 +ENV NODE_VERSION 15.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 1d0022fbfc..0499a021b4 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.3.0 +ENV NODE_VERSION 15.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 550101cfd8..82bde2a34c 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.3.0 +ENV NODE_VERSION 15.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From edf9dad19fc75e3781d0cda0fe84c7495fa1a940 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 8 Dec 2020 01:20:34 +0800 Subject: [PATCH 428/818] Update PR template for regular updates PRs --- .github/PULL_REQUEST_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 431978e4d1..f81627638d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -31,6 +31,8 @@ affects other areas of the code, etc. What types of changes does your code introduce? Put an `x` in all the boxes that apply. --> +- [ ] Version change (Update, remove or add more Node.js versions) +- [ ] Variant change (Update, remove or add more variants, or versions of variants) - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) From 4fcf506f887cc88b7773b50cdd73643991c14bd4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 8 Dec 2020 01:23:20 +0800 Subject: [PATCH 429/818] Add more type of changes in the PR template --- .github/PULL_REQUEST_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f81627638d..3c2c1b3e6a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -31,11 +31,13 @@ affects other areas of the code, etc. What types of changes does your code introduce? Put an `x` in all the boxes that apply. --> +- [ ] Documentation - [ ] Version change (Update, remove or add more Node.js versions) - [ ] Variant change (Update, remove or add more variants, or versions of variants) - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) +- [ ] Others (non of above) ## Checklist From 2926f59ea77be341b15e0f6f243c6d3c53803b6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 06:14:46 +0000 Subject: [PATCH 430/818] chore(deps): bump actions/setup-node from v2.1.2 to v2.1.3 Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.2 to v2.1.3. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.2...27082cecf3ff7a1742dbd5e12605f0cb59dce2d9) Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 417b12ac1f..05fa62f1cf 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.2 + - uses: actions/setup-node@v2.1.3 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 25af6af86c..4880a42442 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.2 + - uses: actions/setup-node@v2.1.3 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 792d338699..b014d077bc 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.2 + - uses: actions/setup-node@v2.1.3 with: node-version: '12.x' - name: Install markdown-link-check From e966aef2a6c5113ec53a37edab70ee556543b20b Mon Sep 17 00:00:00 2001 From: Peter Petrov Date: Sun, 13 Dec 2020 03:50:34 +0200 Subject: [PATCH 431/818] Remove Peter Petrov from Working Group --- .github/workflows/official-pr.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 74c6809eff..2eb2bea574 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -50,7 +50,7 @@ jobs: title: "Node: ${{ github.event.pull_request.title }}" body: | Pull Request: ${{ github.event.pull_request.html_url }} - @LaurentGoderre @pesho @PeterDaveHello @SimenB @Starefossen @nschonni @ttshivers + @LaurentGoderre @PeterDaveHello @SimenB @Starefossen @nschonni @ttshivers - name: PR details run: | diff --git a/README.md b/README.md index 072637a460..082d1895a7 100644 --- a/README.md +++ b/README.md @@ -231,7 +231,6 @@ about the expectations for all contributors to this project. - Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) - Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) - John Mitchell ([jlmitch5](https://github.com/jlmitch5)) -- Peter Petrov ([pesho](https://github.com/pesho)) ### Docker Working Group Collaborators @@ -245,3 +244,4 @@ about the expectations for all contributors to this project. #### Docker Working Group Members - Christopher Horrell ([chorrell](https://github.com/chorrell)) +- Peter Petrov ([pesho](https://github.com/pesho)) From 9a348664d89b7701f60b5285b6d77be23a1f7257 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 16 Dec 2020 16:26:07 +0800 Subject: [PATCH 432/818] Update node.js v14 from 14.15.1 to 14.15.2 - https://nodejs.org/en/blog/release/v14.15.2/ - https://github.com/nodejs/node/releases/tag/v14.15.2 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.15.2 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 45836d3d14..6b2a596177 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.15.1 +ENV NODE_VERSION 14.15.2 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="eec29c217b423618d3ec2be597ce34667c285363373b58783b77fa34a59a8ef1" \ + CHECKSUM="3374bd5e1c7c0f5bace082258b42a451cebffb103c1af1888fdf2d7edae85cb5" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 9cc9d8403b..a29ba81dc1 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.15.1 +ENV NODE_VERSION 14.15.2 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="eec29c217b423618d3ec2be597ce34667c285363373b58783b77fa34a59a8ef1" \ + CHECKSUM="3374bd5e1c7c0f5bace082258b42a451cebffb103c1af1888fdf2d7edae85cb5" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 79901d3f70..06e5c999dd 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.15.1 +ENV NODE_VERSION 14.15.2 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="eec29c217b423618d3ec2be597ce34667c285363373b58783b77fa34a59a8ef1" \ + CHECKSUM="3374bd5e1c7c0f5bace082258b42a451cebffb103c1af1888fdf2d7edae85cb5" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 772cc57727..c8a3163e2e 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.15.1 +ENV NODE_VERSION 14.15.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 3e23c3c3a9..c0d5b8c491 100644 --- a/14/buster/Dockerfile +++ b/14/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.15.1 +ENV NODE_VERSION 14.15.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index c19c6ef91c..546627d80f 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.15.1 +ENV NODE_VERSION 14.15.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index dbeb84c5a5..afc944b493 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.15.1 +ENV NODE_VERSION 14.15.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 7cb07a2ec7a8f403c5df441871a7d895a4a97e47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Dec 2020 06:27:04 +0000 Subject: [PATCH 433/818] chore(deps): bump actions/setup-node from v2.1.3 to v2.1.4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.3 to v2.1.4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.3...c46424eee26de4078d34105d3de3cc4992202b1e) Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 05fa62f1cf..d7fc5fb5a3 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.3 + - uses: actions/setup-node@v2.1.4 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 4880a42442..de86e681ff 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.3 + - uses: actions/setup-node@v2.1.4 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index b014d077bc..237388fec5 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.3 + - uses: actions/setup-node@v2.1.4 with: node-version: '12.x' - name: Install markdown-link-check From a876b9aa22cb77bc219ec8e14b6bd5a03ad5db6d Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 18 Dec 2020 10:02:30 +0100 Subject: [PATCH 434/818] chore: update to 14.15.3 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 6b2a596177..97932c4294 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.15.2 +ENV NODE_VERSION 14.15.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="3374bd5e1c7c0f5bace082258b42a451cebffb103c1af1888fdf2d7edae85cb5" \ + CHECKSUM="5095903a37ecef4aedeaf5230f8043ec78ed5f5cca635bbb5a4a7908bd2e459f" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index a29ba81dc1..0e74e75b94 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.15.2 +ENV NODE_VERSION 14.15.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="3374bd5e1c7c0f5bace082258b42a451cebffb103c1af1888fdf2d7edae85cb5" \ + CHECKSUM="5095903a37ecef4aedeaf5230f8043ec78ed5f5cca635bbb5a4a7908bd2e459f" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 06e5c999dd..32f46e7327 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.15.2 +ENV NODE_VERSION 14.15.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="3374bd5e1c7c0f5bace082258b42a451cebffb103c1af1888fdf2d7edae85cb5" \ + CHECKSUM="5095903a37ecef4aedeaf5230f8043ec78ed5f5cca635bbb5a4a7908bd2e459f" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index c8a3163e2e..6a7647d319 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.15.2 +ENV NODE_VERSION 14.15.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index c0d5b8c491..2b3afe5368 100644 --- a/14/buster/Dockerfile +++ b/14/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.15.2 +ENV NODE_VERSION 14.15.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 546627d80f..c6a15f6472 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.15.2 +ENV NODE_VERSION 14.15.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index afc944b493..fd3c0699dd 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.15.2 +ENV NODE_VERSION 14.15.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c68a7f121b7c51ba6a1902540fb4a5546ca8553b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 23 Dec 2020 12:14:53 +0800 Subject: [PATCH 435/818] Update node.js v15 from v15.4.0 to v15.5.0 Reference: - https://nodejs.org/en/blog/release/v15.5.0/ - https://github.com/nodejs/node/releases/tag/v15.5.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V15.md#15.5.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 8c68f8ecd0..34732fdf2b 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.4.0 +ENV NODE_VERSION 15.5.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="ecc96ecf8e1f54a4dbf145f5513bd14810b0161e56b50076c4dbfaf827e6ff8f" \ + CHECKSUM="2dae9e85dc69c7d7bb423ed87e9933c0b3a34c4ef5333753c7c8bb05f92f544c" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 2082c64dfe..9511a521ef 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.4.0 +ENV NODE_VERSION 15.5.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="ecc96ecf8e1f54a4dbf145f5513bd14810b0161e56b50076c4dbfaf827e6ff8f" \ + CHECKSUM="2dae9e85dc69c7d7bb423ed87e9933c0b3a34c4ef5333753c7c8bb05f92f544c" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index b5f2c8bd8e..2d026447ff 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.4.0 +ENV NODE_VERSION 15.5.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="ecc96ecf8e1f54a4dbf145f5513bd14810b0161e56b50076c4dbfaf827e6ff8f" \ + CHECKSUM="2dae9e85dc69c7d7bb423ed87e9933c0b3a34c4ef5333753c7c8bb05f92f544c" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 55e8dc82e2..5e460207af 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.4.0 +ENV NODE_VERSION 15.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index ee578c73fe..63906ea103 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.4.0 +ENV NODE_VERSION 15.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 0499a021b4..dd901ff6e0 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.4.0 +ENV NODE_VERSION 15.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 82bde2a34c..adeeef1073 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.4.0 +ENV NODE_VERSION 15.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From ad676318f09f9dee821ac6704340000d75fe31bc Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 4 Jan 2021 19:22:26 -0500 Subject: [PATCH 436/818] fix: January 2021 Node 10, 12, 14, 15 release --- 10/alpine3.10/Dockerfile | 4 ++-- 10/alpine3.11/Dockerfile | 4 ++-- 10/alpine3.9/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/alpine3.9/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 773abb4958..fde8f8efc5 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.23.0 +ENV NODE_VERSION 10.23.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="149ab80ab7e618acd7b8402dbb86ff13d89cd4a0b39d45ee9b735944e1b89737" \ + CHECKSUM="a1a0fb3b20b495d806556caaf66c828b4e9b0f01ea004a8432a0c42cbbe5481b" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 6b355bc51a..1b8fee9e85 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.23.0 +ENV NODE_VERSION 10.23.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="149ab80ab7e618acd7b8402dbb86ff13d89cd4a0b39d45ee9b735944e1b89737" \ + CHECKSUM="a1a0fb3b20b495d806556caaf66c828b4e9b0f01ea004a8432a0c42cbbe5481b" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile index adb513e0b0..f139dc49d9 100644 --- a/10/alpine3.9/Dockerfile +++ b/10/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 10.23.0 +ENV NODE_VERSION 10.23.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="149ab80ab7e618acd7b8402dbb86ff13d89cd4a0b39d45ee9b735944e1b89737" \ + CHECKSUM="a1a0fb3b20b495d806556caaf66c828b4e9b0f01ea004a8432a0c42cbbe5481b" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 77deadc62f..2d36d2ee52 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.23.0 +ENV NODE_VERSION 10.23.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 184d58de6f..2471c07769 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.23.0 +ENV NODE_VERSION 10.23.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index c6eb006522..dbf5c78848 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.23.0 +ENV NODE_VERSION 10.23.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index c494aa4ecd..be7cc93afe 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.23.0 +ENV NODE_VERSION 10.23.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 87402b062f..19be10144f 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.20.0 +ENV NODE_VERSION 12.20.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="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ + CHECKSUM="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 0701debf2f..33c824e03d 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.20.0 +ENV NODE_VERSION 12.20.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="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ + CHECKSUM="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index b346742287..5227db8c63 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.20.0 +ENV NODE_VERSION 12.20.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="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ + CHECKSUM="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile index 49c3af858a..aca541f4a9 100644 --- a/12/alpine3.9/Dockerfile +++ b/12/alpine3.9/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.9 -ENV NODE_VERSION 12.20.0 +ENV NODE_VERSION 12.20.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="9a25589439ebec4e74fc2652893b5887b33130c0dd7dad2daa1d200024fa676c" \ + CHECKSUM="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 2a38b5046f..66fabe41f5 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.20.0 +ENV NODE_VERSION 12.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index d33afea1e6..4f617b8142 100644 --- a/12/buster/Dockerfile +++ b/12/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.20.0 +ENV NODE_VERSION 12.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 6880dd13c5..6bb2bc83de 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.20.0 +ENV NODE_VERSION 12.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 28876a2a2a..faa0619436 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.20.0 +ENV NODE_VERSION 12.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 97932c4294..a5d5342213 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.15.3 +ENV NODE_VERSION 14.15.4 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="5095903a37ecef4aedeaf5230f8043ec78ed5f5cca635bbb5a4a7908bd2e459f" \ + CHECKSUM="dd4f335ff962a0ca5bd80b536a54f4844cb820bff3aa24cfd7e2edb00385b625" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 0e74e75b94..37687d05bc 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.15.3 +ENV NODE_VERSION 14.15.4 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="5095903a37ecef4aedeaf5230f8043ec78ed5f5cca635bbb5a4a7908bd2e459f" \ + CHECKSUM="dd4f335ff962a0ca5bd80b536a54f4844cb820bff3aa24cfd7e2edb00385b625" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 32f46e7327..3bd123ce4a 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.15.3 +ENV NODE_VERSION 14.15.4 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="5095903a37ecef4aedeaf5230f8043ec78ed5f5cca635bbb5a4a7908bd2e459f" \ + CHECKSUM="dd4f335ff962a0ca5bd80b536a54f4844cb820bff3aa24cfd7e2edb00385b625" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 6a7647d319..a75e49211a 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.15.3 +ENV NODE_VERSION 14.15.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 2b3afe5368..c58c3b464b 100644 --- a/14/buster/Dockerfile +++ b/14/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.15.3 +ENV NODE_VERSION 14.15.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index c6a15f6472..bf70455757 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.15.3 +ENV NODE_VERSION 14.15.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index fd3c0699dd..1e3b1aa1c1 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.15.3 +ENV NODE_VERSION 14.15.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 34732fdf2b..92c94e022f 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.5.0 +ENV NODE_VERSION 15.5.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="2dae9e85dc69c7d7bb423ed87e9933c0b3a34c4ef5333753c7c8bb05f92f544c" \ + CHECKSUM="838db1c71ce88a3f2335ba7fbbcb1a633ff53d7826511d5e1aebbc47e0a32326" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 9511a521ef..2154ac255f 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.5.0 +ENV NODE_VERSION 15.5.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="2dae9e85dc69c7d7bb423ed87e9933c0b3a34c4ef5333753c7c8bb05f92f544c" \ + CHECKSUM="838db1c71ce88a3f2335ba7fbbcb1a633ff53d7826511d5e1aebbc47e0a32326" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 2d026447ff..3857f80744 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.5.0 +ENV NODE_VERSION 15.5.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="2dae9e85dc69c7d7bb423ed87e9933c0b3a34c4ef5333753c7c8bb05f92f544c" \ + CHECKSUM="838db1c71ce88a3f2335ba7fbbcb1a633ff53d7826511d5e1aebbc47e0a32326" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 5e460207af..8e82db4c6e 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.5.0 +ENV NODE_VERSION 15.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 63906ea103..509d70055b 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.5.0 +ENV NODE_VERSION 15.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index dd901ff6e0..3b04a278b4 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.5.0 +ENV NODE_VERSION 15.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index adeeef1073..0115e7f4cf 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.5.0 +ENV NODE_VERSION 15.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f80df5cf216f9cb37b2f93c10bf3f510549fbf3d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 4 Jan 2021 20:03:07 -0500 Subject: [PATCH 437/818] chore: Update official image fork to nodejs --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 2eb2bea574..a9b6ef128a 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -43,7 +43,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: token: ${{ secrets.GH_API_TOKEN }} - push-to-fork: nodejs-github-bot/official-images + push-to-fork: nodejs/official-images path: official-images branch: node commit-message: "Node: ${{ github.event.pull_request.title }}" From 4b88d3191e9eb53329a205c38727354a5ce4b7bf Mon Sep 17 00:00:00 2001 From: Danielle Adams Date: Thu, 14 Jan 2021 10:27:54 -0500 Subject: [PATCH 438/818] keys: update key for @danielleadams --- keys/node.keys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keys/node.keys b/keys/node.keys index 661ec2c80d..d6d3c68b79 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,6 +1,6 @@ 4ED778F539E3634C779C87C6D7062848A1AB005C 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 -1C050899334244A8AF75E53792EF661D867B9DFA +74F12602B6F1C4E913FAA37AD3A89613643B6201 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 From f14cf35127b04cec97f01e473d59a0df03ac00d1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 14 Jan 2021 23:30:13 -0500 Subject: [PATCH 439/818] feat: Node v15.6.0 --- 15/alpine3.10/Dockerfile | 6 +++--- 15/alpine3.11/Dockerfile | 6 +++--- 15/alpine3.12/Dockerfile | 6 +++--- 15/buster-slim/Dockerfile | 4 ++-- 15/buster/Dockerfile | 4 ++-- 15/stretch-slim/Dockerfile | 4 ++-- 15/stretch/Dockerfile | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 92c94e022f..88b2ee8d76 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.5.1 +ENV NODE_VERSION 15.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="838db1c71ce88a3f2335ba7fbbcb1a633ff53d7826511d5e1aebbc47e0a32326" \ + CHECKSUM="0b8b2487249605f5f9d7e0c5bfcf1892299493e6af7129bc1eda14d3b0025a0a" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 2154ac255f..526f4bf579 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.5.1 +ENV NODE_VERSION 15.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="838db1c71ce88a3f2335ba7fbbcb1a633ff53d7826511d5e1aebbc47e0a32326" \ + CHECKSUM="0b8b2487249605f5f9d7e0c5bfcf1892299493e6af7129bc1eda14d3b0025a0a" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 3857f80744..de957f7c58 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.5.1 +ENV NODE_VERSION 15.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="838db1c71ce88a3f2335ba7fbbcb1a633ff53d7826511d5e1aebbc47e0a32326" \ + CHECKSUM="0b8b2487249605f5f9d7e0c5bfcf1892299493e6af7129bc1eda14d3b0025a0a" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 8e82db4c6e..b07dfe5457 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.5.1 +ENV NODE_VERSION 15.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 509d70055b..a7759597ca 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.5.1 +ENV NODE_VERSION 15.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 3b04a278b4..d793417779 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.5.1 +ENV NODE_VERSION 15.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 0115e7f4cf..5f58cf9913 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.5.1 +ENV NODE_VERSION 15.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ From ea541c27c478df8b466ca47bd5b6e966a6598701 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 15 Jan 2021 11:58:19 -0500 Subject: [PATCH 440/818] chore: Drop EOL Apline 3.9 Closes #1423 --- 10/alpine3.9/Dockerfile | 100 ------------------------------ 10/alpine3.9/docker-entrypoint.sh | 8 --- 10/architectures | 14 ++--- 12/alpine3.9/Dockerfile | 100 ------------------------------ 12/alpine3.9/docker-entrypoint.sh | 8 --- 12/architectures | 12 ++-- architectures | 14 ++--- 7 files changed, 20 insertions(+), 236 deletions(-) delete mode 100644 10/alpine3.9/Dockerfile delete mode 100755 10/alpine3.9/docker-entrypoint.sh delete mode 100644 12/alpine3.9/Dockerfile delete mode 100755 12/alpine3.9/docker-entrypoint.sh diff --git a/10/alpine3.9/Dockerfile b/10/alpine3.9/Dockerfile deleted file mode 100644 index f139dc49d9..0000000000 --- a/10/alpine3.9/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.9 - -ENV NODE_VERSION 10.23.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="a1a0fb3b20b495d806556caaf66c828b4e9b0f01ea004a8432a0c42cbbe5481b" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/alpine3.9/docker-entrypoint.sh b/10/alpine3.9/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/alpine3.9/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/10/architectures b/10/architectures index d31c0c2518..c178997a03 100644 --- a/10/architectures +++ b/10/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.9,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.9 -arm32v7 alpine3.10,alpine3.11,alpine3.9,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.9,buster,buster-slim,stretch,stretch-slim -i386 alpine3.10,alpine3.11,alpine3.9 -ppc64le alpine3.10,alpine3.11,alpine3.9,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.9,buster,buster-slim +amd64 alpine3.10,alpine3.11,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11 +arm32v7 alpine3.10,alpine3.11,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,buster,buster-slim,stretch,stretch-slim +i386 alpine3.10,alpine3.11 +ppc64le alpine3.10,alpine3.11,buster,buster-slim +s390x alpine3.10,alpine3.11,buster,buster-slim diff --git a/12/alpine3.9/Dockerfile b/12/alpine3.9/Dockerfile deleted file mode 100644 index aca541f4a9..0000000000 --- a/12/alpine3.9/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.9 - -ENV NODE_VERSION 12.20.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/alpine3.9/docker-entrypoint.sh b/12/alpine3.9/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/12/alpine3.9/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/architectures b/12/architectures index 5b2820969c..e596715982 100644 --- a/12/architectures +++ b/12/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.9 -arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim -ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim +amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12 +arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim diff --git a/architectures b/architectures index 2d5e52a630..09ace846d3 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.9 -arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim,stretch,stretch-slim -i386 alpine3.10,alpine3.11,alpine3.12,alpine3.9 -ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,alpine3.9,buster,buster-slim +amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12 +arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim +i386 alpine3.10,alpine3.11,alpine3.12 +ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim From fdf244039755aead02405a0c27336f225d402d1f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 27 Jan 2021 02:16:16 -0500 Subject: [PATCH 441/818] feat: Node v10.23.2 and v15.7.0 --- 10/alpine3.10/Dockerfile | 6 +++--- 10/alpine3.11/Dockerfile | 6 +++--- 10/buster-slim/Dockerfile | 4 ++-- 10/buster/Dockerfile | 4 ++-- 10/stretch-slim/Dockerfile | 4 ++-- 10/stretch/Dockerfile | 4 ++-- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index fde8f8efc5..6f9e6c68a4 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.23.1 +ENV NODE_VERSION 10.23.2 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="a1a0fb3b20b495d806556caaf66c828b4e9b0f01ea004a8432a0c42cbbe5481b" \ + CHECKSUM="b3ae42c904bfda144df81275fbc8ef89baab0babca0f95a1e06f4b4064f3f8ee" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 1b8fee9e85..53484f659e 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.23.1 +ENV NODE_VERSION 10.23.2 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="a1a0fb3b20b495d806556caaf66c828b4e9b0f01ea004a8432a0c42cbbe5481b" \ + CHECKSUM="b3ae42c904bfda144df81275fbc8ef89baab0babca0f95a1e06f4b4064f3f8ee" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 2d36d2ee52..56d8afac6e 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.23.1 +ENV NODE_VERSION 10.23.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index 2471c07769..ace5355292 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.23.1 +ENV NODE_VERSION 10.23.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index dbf5c78848..f7daecc54c 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.23.1 +ENV NODE_VERSION 10.23.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index be7cc93afe..daa2a99232 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.23.1 +ENV NODE_VERSION 10.23.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 88b2ee8d76..07e72d512a 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.6.0 +ENV NODE_VERSION 15.7.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="0b8b2487249605f5f9d7e0c5bfcf1892299493e6af7129bc1eda14d3b0025a0a" \ + CHECKSUM="b2d2524977aff3a282434a67c019ab8bb5095e01f83f8128006604038a091783" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 526f4bf579..4ef07ce480 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.6.0 +ENV NODE_VERSION 15.7.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="0b8b2487249605f5f9d7e0c5bfcf1892299493e6af7129bc1eda14d3b0025a0a" \ + CHECKSUM="b2d2524977aff3a282434a67c019ab8bb5095e01f83f8128006604038a091783" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index de957f7c58..d96cce50a9 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.6.0 +ENV NODE_VERSION 15.7.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="0b8b2487249605f5f9d7e0c5bfcf1892299493e6af7129bc1eda14d3b0025a0a" \ + CHECKSUM="b2d2524977aff3a282434a67c019ab8bb5095e01f83f8128006604038a091783" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index b07dfe5457..c97a9acc70 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.6.0 +ENV NODE_VERSION 15.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index a7759597ca..92ca791dc0 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.6.0 +ENV NODE_VERSION 15.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index d793417779..dc0ded78b2 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.6.0 +ENV NODE_VERSION 15.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 5f58cf9913..2f863fc7d9 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.6.0 +ENV NODE_VERSION 15.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 4ab6ab7d06845aa950054ec5522fe8b81927bf05 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 3 Feb 2021 02:08:27 -0500 Subject: [PATCH 442/818] feat: Node v15.8.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 07e72d512a..cf6430a336 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.7.0 +ENV NODE_VERSION 15.8.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="b2d2524977aff3a282434a67c019ab8bb5095e01f83f8128006604038a091783" \ + CHECKSUM="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 4ef07ce480..5045e7b4f8 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.7.0 +ENV NODE_VERSION 15.8.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="b2d2524977aff3a282434a67c019ab8bb5095e01f83f8128006604038a091783" \ + CHECKSUM="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index d96cce50a9..c02ac79e18 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.7.0 +ENV NODE_VERSION 15.8.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="b2d2524977aff3a282434a67c019ab8bb5095e01f83f8128006604038a091783" \ + CHECKSUM="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index c97a9acc70..94660e2947 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.7.0 +ENV NODE_VERSION 15.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 92ca791dc0..dda628e21b 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.7.0 +ENV NODE_VERSION 15.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index dc0ded78b2..8dac5a013f 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.7.0 +ENV NODE_VERSION 15.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 2f863fc7d9..1abac3aa28 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.7.0 +ENV NODE_VERSION 15.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 884bf23823005e9fba035ae34184222e030189db Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 9 Feb 2021 20:34:47 +0100 Subject: [PATCH 443/818] chore: update to v14.15.5 --- 14/alpine3.10/Dockerfile | 6 +++--- 14/alpine3.11/Dockerfile | 6 +++--- 14/alpine3.12/Dockerfile | 6 +++--- 14/buster-slim/Dockerfile | 4 ++-- 14/buster/Dockerfile | 4 ++-- 14/stretch-slim/Dockerfile | 4 ++-- 14/stretch/Dockerfile | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index a5d5342213..2a3ffa6fba 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.15.4 +ENV NODE_VERSION 14.15.5 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="dd4f335ff962a0ca5bd80b536a54f4844cb820bff3aa24cfd7e2edb00385b625" \ + CHECKSUM="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 37687d05bc..931bf93f14 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.15.4 +ENV NODE_VERSION 14.15.5 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="dd4f335ff962a0ca5bd80b536a54f4844cb820bff3aa24cfd7e2edb00385b625" \ + CHECKSUM="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 3bd123ce4a..7403e30df9 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.15.4 +ENV NODE_VERSION 14.15.5 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="dd4f335ff962a0ca5bd80b536a54f4844cb820bff3aa24cfd7e2edb00385b625" \ + CHECKSUM="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index a75e49211a..0f9029a6cb 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.15.4 +ENV NODE_VERSION 14.15.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index c58c3b464b..93d53f6840 100644 --- a/14/buster/Dockerfile +++ b/14/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.15.4 +ENV NODE_VERSION 14.15.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index bf70455757..744dd59255 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.15.4 +ENV NODE_VERSION 14.15.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 1e3b1aa1c1..632951aaf2 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.15.4 +ENV NODE_VERSION 14.15.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ From dbee85cde7c9d11d9df2d9305df4039942fc1ba9 Mon Sep 17 00:00:00 2001 From: Vincent Composieux Date: Fri, 12 Feb 2021 22:45:56 +0100 Subject: [PATCH 444/818] Added alpine 3.13 base distrib for node.js v14 and v15 Alpine just released its v3.13 version with some performances improvements in the way on how NodeJS is built. For more information, see release blog post: https://alpinelinux.org/posts/Alpine-3.13.0-released.html --- 10/alpine3.10/Dockerfile | 4 +- 10/alpine3.11/Dockerfile | 4 +- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 12/alpine3.10/Dockerfile | 6 +- 12/alpine3.11/Dockerfile | 6 +- 12/alpine3.12/Dockerfile | 6 +- 12/buster-slim/Dockerfile | 4 +- 12/buster/Dockerfile | 4 +- 12/stretch-slim/Dockerfile | 4 +- 12/stretch/Dockerfile | 4 +- 14/alpine3.13/Dockerfile | 100 +++++++++++++++++++++++++++++ 14/alpine3.13/docker-entrypoint.sh | 8 +++ 14/architectures | 12 ++-- 15/alpine3.13/Dockerfile | 100 +++++++++++++++++++++++++++++ 15/alpine3.13/docker-entrypoint.sh | 8 +++ 15/architectures | 12 ++-- architectures | 14 ++-- 20 files changed, 260 insertions(+), 44 deletions(-) create mode 100644 14/alpine3.13/Dockerfile create mode 100755 14/alpine3.13/docker-entrypoint.sh create mode 100644 15/alpine3.13/Dockerfile create mode 100755 15/alpine3.13/docker-entrypoint.sh diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 6f9e6c68a4..865817334d 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.23.2 +ENV NODE_VERSION 10.23.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="b3ae42c904bfda144df81275fbc8ef89baab0babca0f95a1e06f4b4064f3f8ee" \ + CHECKSUM="0f7cfb9c2b3f2f53d307756a6f824013b5c5f1cba503f55e3ecbc1653786e7b9" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 53484f659e..82b0ca5f74 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.23.2 +ENV NODE_VERSION 10.23.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="b3ae42c904bfda144df81275fbc8ef89baab0babca0f95a1e06f4b4064f3f8ee" \ + CHECKSUM="0f7cfb9c2b3f2f53d307756a6f824013b5c5f1cba503f55e3ecbc1653786e7b9" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 56d8afac6e..e07e4ca3d5 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.23.2 +ENV NODE_VERSION 10.23.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index ace5355292..bd3a7fca1e 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.23.2 +ENV NODE_VERSION 10.23.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index f7daecc54c..a6109bce33 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.23.2 +ENV NODE_VERSION 10.23.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index daa2a99232..17f35af0e6 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.23.2 +ENV NODE_VERSION 10.23.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 19be10144f..d4ed67f0cb 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.20.1 +ENV NODE_VERSION 12.20.2 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="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ + CHECKSUM="89854b77656f0f7f89e5d1e68c5a2aa6f32d534e9c1646146346a76d4364d1e5" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 33c824e03d..6ccc3f579a 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.20.1 +ENV NODE_VERSION 12.20.2 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="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ + CHECKSUM="89854b77656f0f7f89e5d1e68c5a2aa6f32d534e9c1646146346a76d4364d1e5" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 5227db8c63..e33e1d76c7 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.20.1 +ENV NODE_VERSION 12.20.2 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="783fbfc85228418d0630b778214bdcea3a82d5c3ac13aefcc14e4a81e977d9c9" \ + CHECKSUM="89854b77656f0f7f89e5d1e68c5a2aa6f32d534e9c1646146346a76d4364d1e5" \ ;; \ *) ;; \ esac \ @@ -38,7 +38,7 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 66fabe41f5..77b14a4425 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.20.1 +ENV NODE_VERSION 12.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 4f617b8142..a0a5cd7c48 100644 --- a/12/buster/Dockerfile +++ b/12/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.20.1 +ENV NODE_VERSION 12.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 6bb2bc83de..2c30bfaca0 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.20.1 +ENV NODE_VERSION 12.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,7 +22,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index faa0619436..af87aeeae4 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.20.1 +ENV NODE_VERSION 12.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,7 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 1C050899334244A8AF75E53792EF661D867B9DFA \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile new file mode 100644 index 0000000000..1e1d5a4ac9 --- /dev/null +++ b/14/alpine3.13/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.13 + +ENV NODE_VERSION 14.15.5 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/alpine3.13/docker-entrypoint.sh b/14/alpine3.13/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/alpine3.13/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/architectures b/14/architectures index e596715982..253f4aa761 100644 --- a/14/architectures +++ b/14/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12 -arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim +amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.13 +arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile new file mode 100644 index 0000000000..081d521caf --- /dev/null +++ b/15/alpine3.13/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.13 + +ENV NODE_VERSION 15.8.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/15/alpine3.13/docker-entrypoint.sh b/15/alpine3.13/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/15/alpine3.13/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/15/architectures b/15/architectures index e596715982..253f4aa761 100644 --- a/15/architectures +++ b/15/architectures @@ -1,7 +1,7 @@ bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12 -arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim +amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.13 +arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim diff --git a/architectures b/architectures index 09ace846d3..9c2484dd05 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12 -arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -i386 alpine3.10,alpine3.11,alpine3.12 -ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim +amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.13 +arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +i386 alpine3.10,alpine3.11,alpine3.12,alpine3.13 +ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim +s390x alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim From f0ee14fac7ee37f694baa9dabfeb0a3dd1cc3a93 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 18 Feb 2021 01:43:47 -0500 Subject: [PATCH 445/818] feat: Update to Node 15.9.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/alpine3.13/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index cf6430a336..99a53ed0c0 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.8.0 +ENV NODE_VERSION 15.9.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="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ + CHECKSUM="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 5045e7b4f8..b9cb279110 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.8.0 +ENV NODE_VERSION 15.9.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="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ + CHECKSUM="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index c02ac79e18..71b68d89a9 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.8.0 +ENV NODE_VERSION 15.9.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="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ + CHECKSUM="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile index 081d521caf..55f384a298 100644 --- a/15/alpine3.13/Dockerfile +++ b/15/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 15.8.0 +ENV NODE_VERSION 15.9.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="88143a3be735d35e43191f0757ac1279fd11d39ff7373579eb4a7f677875ec1a" \ + CHECKSUM="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 94660e2947..ca4b2812db 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.8.0 +ENV NODE_VERSION 15.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index dda628e21b..3ced5530cf 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.8.0 +ENV NODE_VERSION 15.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 8dac5a013f..e77dcddf8d 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.8.0 +ENV NODE_VERSION 15.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 1abac3aa28..7d0a2eb501 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.8.0 +ENV NODE_VERSION 15.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9b75c3751265afa665dd0725b113ac5c294ed13c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 06:05:16 +0000 Subject: [PATCH 446/818] chore(deps): bump actions/setup-node from v2.1.4 to v2.1.5 Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.4...46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea) Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index d7fc5fb5a3..65f55b1287 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.4 + - uses: actions/setup-node@v2.1.5 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index de86e681ff..5bb5a6e514 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.4 + - uses: actions/setup-node@v2.1.5 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 237388fec5..82d2be879c 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.4 + - uses: actions/setup-node@v2.1.5 with: node-version: '12.x' - name: Install markdown-link-check From 6e7d6511aba22da645ec21bd157a369a78794e6c Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 23 Feb 2021 15:51:03 -0500 Subject: [PATCH 447/818] [security]: Node.js February 23 release for v10-15 - v10.24.0 - v12.21.0 - v14.16.0 - v15.10.0 --- 10/alpine3.10/Dockerfile | 4 ++-- 10/alpine3.11/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/alpine3.13/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index 865817334d..e300792f21 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.23.3 +ENV NODE_VERSION 10.24.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="0f7cfb9c2b3f2f53d307756a6f824013b5c5f1cba503f55e3ecbc1653786e7b9" \ + CHECKSUM="5603560113fe549eeba455cef8bffc5a857ec969b5bdd6faa85a17a654a1bf59" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 82b0ca5f74..60dc18efff 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.23.3 +ENV NODE_VERSION 10.24.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="0f7cfb9c2b3f2f53d307756a6f824013b5c5f1cba503f55e3ecbc1653786e7b9" \ + CHECKSUM="5603560113fe549eeba455cef8bffc5a857ec969b5bdd6faa85a17a654a1bf59" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index e07e4ca3d5..4e3950a2b7 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.23.3 +ENV NODE_VERSION 10.24.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index bd3a7fca1e..b0b80be71a 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.23.3 +ENV NODE_VERSION 10.24.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index a6109bce33..7f9d90a1b1 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.23.3 +ENV NODE_VERSION 10.24.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 17f35af0e6..8be56b418b 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.23.3 +ENV NODE_VERSION 10.24.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index d4ed67f0cb..db92f11343 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.20.2 +ENV NODE_VERSION 12.21.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="89854b77656f0f7f89e5d1e68c5a2aa6f32d534e9c1646146346a76d4364d1e5" \ + CHECKSUM="9b9e23770e8ba923bd66dbab1ddf22f28cd415184315457f50ab6f6a16dcc463" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 6ccc3f579a..70faf0e0f0 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.20.2 +ENV NODE_VERSION 12.21.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="89854b77656f0f7f89e5d1e68c5a2aa6f32d534e9c1646146346a76d4364d1e5" \ + CHECKSUM="9b9e23770e8ba923bd66dbab1ddf22f28cd415184315457f50ab6f6a16dcc463" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index e33e1d76c7..937f003a1b 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.20.2 +ENV NODE_VERSION 12.21.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="89854b77656f0f7f89e5d1e68c5a2aa6f32d534e9c1646146346a76d4364d1e5" \ + CHECKSUM="9b9e23770e8ba923bd66dbab1ddf22f28cd415184315457f50ab6f6a16dcc463" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 77b14a4425..eb41b2c5c0 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.20.2 +ENV NODE_VERSION 12.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index a0a5cd7c48..c4ae66c29f 100644 --- a/12/buster/Dockerfile +++ b/12/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.20.2 +ENV NODE_VERSION 12.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 2c30bfaca0..762d424503 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.20.2 +ENV NODE_VERSION 12.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index af87aeeae4..25a7fd3bb2 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.20.2 +ENV NODE_VERSION 12.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 2a3ffa6fba..47e24898e6 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.15.5 +ENV NODE_VERSION 14.16.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="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ + CHECKSUM="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 931bf93f14..53de65ed05 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.15.5 +ENV NODE_VERSION 14.16.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="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ + CHECKSUM="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 7403e30df9..a218ce62a3 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.15.5 +ENV NODE_VERSION 14.16.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="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ + CHECKSUM="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 1e1d5a4ac9..83cbb5ce96 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.15.5 +ENV NODE_VERSION 14.16.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="e7ca0569963c3155d86c51b3855469c3496f0c8d2fce080480d92de5a6287977" \ + CHECKSUM="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 0f9029a6cb..6a8e86bb7b 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.15.5 +ENV NODE_VERSION 14.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 93d53f6840..2f979605c7 100644 --- a/14/buster/Dockerfile +++ b/14/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.15.5 +ENV NODE_VERSION 14.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 744dd59255..15379a0c56 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.15.5 +ENV NODE_VERSION 14.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 632951aaf2..e0c44d5736 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.15.5 +ENV NODE_VERSION 14.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 99a53ed0c0..6e00262c91 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.9.0 +ENV NODE_VERSION 15.10.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="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ + CHECKSUM="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index b9cb279110..0a84afe521 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.9.0 +ENV NODE_VERSION 15.10.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="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ + CHECKSUM="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 71b68d89a9..8223fbd80a 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.9.0 +ENV NODE_VERSION 15.10.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="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ + CHECKSUM="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile index 55f384a298..15e97dbb74 100644 --- a/15/alpine3.13/Dockerfile +++ b/15/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 15.9.0 +ENV NODE_VERSION 15.10.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="22933447b8fadeab8b5bbcf54753a52102d9de90a71ebca1386331a02a3661ef" \ + CHECKSUM="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index ca4b2812db..f11f3399b0 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.9.0 +ENV NODE_VERSION 15.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 3ced5530cf..79863bb8a7 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.9.0 +ENV NODE_VERSION 15.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index e77dcddf8d..a64309aaa3 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.9.0 +ENV NODE_VERSION 15.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 7d0a2eb501..ffda1ec4b5 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.9.0 +ENV NODE_VERSION 15.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8577344c3cf64d2e1a22cd6680491f7f14bc0fdc Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 3 Mar 2021 15:42:32 -0500 Subject: [PATCH 448/818] feat: Node.js 15.11.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/alpine3.13/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 6e00262c91..4f76b0e28d 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.10.0 +ENV NODE_VERSION 15.11.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="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ + CHECKSUM="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 0a84afe521..e0f023422d 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.10.0 +ENV NODE_VERSION 15.11.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="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ + CHECKSUM="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 8223fbd80a..f0077d025a 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.10.0 +ENV NODE_VERSION 15.11.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="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ + CHECKSUM="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile index 15e97dbb74..d097eb7449 100644 --- a/15/alpine3.13/Dockerfile +++ b/15/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 15.10.0 +ENV NODE_VERSION 15.11.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="b9eaae77f5efbc1e0804557dbc8025b355cf083b1830da6becbf92f8bb43afc5" \ + CHECKSUM="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index f11f3399b0..f7563b00d5 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.10.0 +ENV NODE_VERSION 15.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 79863bb8a7..88b27398ee 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.10.0 +ENV NODE_VERSION 15.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index a64309aaa3..3a71a34e63 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.10.0 +ENV NODE_VERSION 15.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index ffda1ec4b5..86e5d0a52c 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.10.0 +ENV NODE_VERSION 15.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 4113acde9f736a3cbb544692f59c08cc4bd009d7 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 3 Mar 2021 15:46:54 -0500 Subject: [PATCH 449/818] chore: Update master -> main --- CONTRIBUTING.md | 4 ++-- README.md | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff4153391f..6952d37890 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,10 +16,10 @@ If you'd like to help us by submitting a PR for a version update, please do the 1. [Fork this project.](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) 1. [Clone the forked repository.](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) -1. Create a branch for the update PR. For example, `git checkout master; git checkout -b version-update`. +1. Create a branch for the update PR. For example, `git checkout main; git checkout -b version-update`. 1. Run `./update.sh`. You can see additional options by using accessing the built-in help documentation with `./update.sh -h`. This script will automatically update the appropriate files with the latest versions and checksums. 1. Commit the modified files to the `version-update` branch and push the branch to your fork. -1. [Create a PR to merge the branch from your fork into this project's master branch.](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork). +1. [Create a PR to merge the branch from your fork into this project's default branch.](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork). ## Adding dependencies to the base images diff --git a/README.md b/README.md index ebf59936f9..8cced25f24 100644 --- a/README.md +++ b/README.md @@ -213,8 +213,7 @@ repository. ## License [License information](https://github.com/nodejs/node/blob/master/LICENSE) for -the software contained in this image. [License -information](https://github.com/nodejs/docker-node/blob/master/LICENSE) for the +the software contained in this image. [License information](LICENSE) for the Node.js Docker project. ## Supported Docker versions @@ -234,7 +233,7 @@ This project will support Node.js versions as still under active support as per ## Governance and Current Members The Node.js Docker Image is governed by the Docker Working Group. See -[GOVERNANCE.md](https://github.com/nodejs/docker-node/blob/master/GOVERNANCE.md) +[GOVERNANCE.md](GOVERNANCE.md) to learn more about the group's structure and [CONTRIBUTING.md](CONTRIBUTING.md) for guidance about the expectations for all contributors to this project. From 7cca35468c8e5ce002a9bd3b5cdf53d89bff23e7 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 3 Mar 2021 15:57:32 -0500 Subject: [PATCH 450/818] chore: Add GitFetch to stackbrew --- generate-stackbrew-library.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index aafe46b419..5137d5bc75 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -36,6 +36,7 @@ echo "# this file is generated via ${url}/blob/$(fileCommit "${self}")/${self}" echo echo "Maintainers: The Node.js Docker Team <${url}> (@nodejs)" echo "GitRepo: ${url}.git" +echo "GitFetch: refs/heads/main" echo # prints "$2$1$3$1...$N" From 769695552abd81267f562517b40407c64039e36a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 18 Mar 2021 11:33:54 +0800 Subject: [PATCH 451/818] Update node.js v15 from v15.11.0 to v15.12.0 Reference: - https://nodejs.org/en/blog/release/v15.12.0/ - https://github.com/nodejs/node/releases/tag/v15.12.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V15.md#15.12.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/alpine3.13/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index 4f76b0e28d..ed975afee3 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.11.0 +ENV NODE_VERSION 15.12.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="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ + CHECKSUM="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index e0f023422d..b6e09f7958 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.11.0 +ENV NODE_VERSION 15.12.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="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ + CHECKSUM="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index f0077d025a..4fc29bdcdd 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.11.0 +ENV NODE_VERSION 15.12.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="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ + CHECKSUM="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile index d097eb7449..d0f558cc56 100644 --- a/15/alpine3.13/Dockerfile +++ b/15/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 15.11.0 +ENV NODE_VERSION 15.12.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="cacc00cd313a28e586fe41c76059c3834206014fba3baf5f5ec39ce1c9aaec70" \ + CHECKSUM="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index f7563b00d5..7241b4639a 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.11.0 +ENV NODE_VERSION 15.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 88b27398ee..0266cd2639 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.11.0 +ENV NODE_VERSION 15.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index 3a71a34e63..cced898759 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.11.0 +ENV NODE_VERSION 15.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 86e5d0a52c..33eb58c9fd 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.11.0 +ENV NODE_VERSION 15.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From a7fad0c1bee6a47790e38c0e398972edc6fd63c0 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 31 Mar 2021 00:34:14 +0800 Subject: [PATCH 452/818] Update node.js v12 from v12.21.0 to v12.22.0 Reference: - https://nodejs.org/en/blog/release/v12.22.0/ - https://github.com/nodejs/node/releases/tag/v12.22.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.22.0 --- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index db92f11343..45877ff512 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.21.0 +ENV NODE_VERSION 12.22.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="9b9e23770e8ba923bd66dbab1ddf22f28cd415184315457f50ab6f6a16dcc463" \ + CHECKSUM="9805fb554de70c7920aaa19b6eed9e464cd5b2b0b9d6e3f1cf6d7cb30fbb3baa" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 70faf0e0f0..3840104b54 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.21.0 +ENV NODE_VERSION 12.22.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="9b9e23770e8ba923bd66dbab1ddf22f28cd415184315457f50ab6f6a16dcc463" \ + CHECKSUM="9805fb554de70c7920aaa19b6eed9e464cd5b2b0b9d6e3f1cf6d7cb30fbb3baa" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 937f003a1b..9e284e55f9 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.21.0 +ENV NODE_VERSION 12.22.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="9b9e23770e8ba923bd66dbab1ddf22f28cd415184315457f50ab6f6a16dcc463" \ + CHECKSUM="9805fb554de70c7920aaa19b6eed9e464cd5b2b0b9d6e3f1cf6d7cb30fbb3baa" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index eb41b2c5c0..5f91a13d5e 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.21.0 +ENV NODE_VERSION 12.22.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index c4ae66c29f..ec2b56d25a 100644 --- a/12/buster/Dockerfile +++ b/12/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.21.0 +ENV NODE_VERSION 12.22.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 762d424503..d30f8ccf96 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.21.0 +ENV NODE_VERSION 12.22.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 25a7fd3bb2..4567f7a7e7 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.21.0 +ENV NODE_VERSION 12.22.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b925ed311c67ab62092961340ead49a2cb29e479 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 1 Apr 2021 16:38:00 -0400 Subject: [PATCH 453/818] feat: Node 15.13.0 --- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/alpine3.13/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index ed975afee3..ecedc81247 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.12.0 +ENV NODE_VERSION 15.13.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="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ + CHECKSUM="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index b6e09f7958..8a023360c3 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.12.0 +ENV NODE_VERSION 15.13.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="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ + CHECKSUM="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 4fc29bdcdd..8a46ec4448 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.12.0 +ENV NODE_VERSION 15.13.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="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ + CHECKSUM="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile index d0f558cc56..58933567a7 100644 --- a/15/alpine3.13/Dockerfile +++ b/15/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 15.12.0 +ENV NODE_VERSION 15.13.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="15e808c523cfaef5da89e36e49afa66077dc3fe91e8e0d374c83ea1ab0f28aee" \ + CHECKSUM="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index 7241b4639a..b40d049054 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.12.0 +ENV NODE_VERSION 15.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 0266cd2639..0265acf947 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.12.0 +ENV NODE_VERSION 15.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index cced898759..c3383d1fa0 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.12.0 +ENV NODE_VERSION 15.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 33eb58c9fd..3d67e87093 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.12.0 +ENV NODE_VERSION 15.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 31246f5f779cafa0930a1db04bd00d875d6a940d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 7 Apr 2021 00:25:09 -0400 Subject: [PATCH 454/818] [Security]: Node.js April 2021 patch --- 10/alpine3.10/Dockerfile | 4 ++-- 10/alpine3.11/Dockerfile | 4 ++-- 10/buster-slim/Dockerfile | 2 +- 10/buster/Dockerfile | 2 +- 10/stretch-slim/Dockerfile | 2 +- 10/stretch/Dockerfile | 2 +- 12/alpine3.10/Dockerfile | 4 ++-- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 15/alpine3.10/Dockerfile | 4 ++-- 15/alpine3.11/Dockerfile | 4 ++-- 15/alpine3.12/Dockerfile | 4 ++-- 15/alpine3.13/Dockerfile | 4 ++-- 15/buster-slim/Dockerfile | 2 +- 15/buster/Dockerfile | 2 +- 15/stretch-slim/Dockerfile | 2 +- 15/stretch/Dockerfile | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile index e300792f21..4612519486 100644 --- a/10/alpine3.10/Dockerfile +++ b/10/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 10.24.0 +ENV NODE_VERSION 10.24.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="5603560113fe549eeba455cef8bffc5a857ec969b5bdd6faa85a17a654a1bf59" \ + CHECKSUM="138eed35daca02bbc01cae161e13604b1b71139e9552d4cb9fe3aad742ce94ec" \ ;; \ *) ;; \ esac \ diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile index 60dc18efff..ec4e870a2c 100644 --- a/10/alpine3.11/Dockerfile +++ b/10/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 10.24.0 +ENV NODE_VERSION 10.24.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="5603560113fe549eeba455cef8bffc5a857ec969b5bdd6faa85a17a654a1bf59" \ + CHECKSUM="138eed35daca02bbc01cae161e13604b1b71139e9552d4cb9fe3aad742ce94ec" \ ;; \ *) ;; \ esac \ diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile index 4e3950a2b7..c7be943fa6 100644 --- a/10/buster-slim/Dockerfile +++ b/10/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 10.24.0 +ENV NODE_VERSION 10.24.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile index b0b80be71a..e766fbca8e 100644 --- a/10/buster/Dockerfile +++ b/10/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 10.24.0 +ENV NODE_VERSION 10.24.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile index 7f9d90a1b1..28d9a165d4 100644 --- a/10/stretch-slim/Dockerfile +++ b/10/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 10.24.0 +ENV NODE_VERSION 10.24.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile index 8be56b418b..db5643cacd 100644 --- a/10/stretch/Dockerfile +++ b/10/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 10.24.0 +ENV NODE_VERSION 10.24.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile index 45877ff512..76cfafdb40 100644 --- a/12/alpine3.10/Dockerfile +++ b/12/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 12.22.0 +ENV NODE_VERSION 12.22.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="9805fb554de70c7920aaa19b6eed9e464cd5b2b0b9d6e3f1cf6d7cb30fbb3baa" \ + CHECKSUM="b7c8a2cb26790b4cc21a69ea5896ecb3e88712a35dcd5f3ef1c799214ad1f5da" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 3840104b54..97532e4541 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.22.0 +ENV NODE_VERSION 12.22.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="9805fb554de70c7920aaa19b6eed9e464cd5b2b0b9d6e3f1cf6d7cb30fbb3baa" \ + CHECKSUM="b7c8a2cb26790b4cc21a69ea5896ecb3e88712a35dcd5f3ef1c799214ad1f5da" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 9e284e55f9..f8cc9a741c 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.0 +ENV NODE_VERSION 12.22.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="9805fb554de70c7920aaa19b6eed9e464cd5b2b0b9d6e3f1cf6d7cb30fbb3baa" \ + CHECKSUM="b7c8a2cb26790b4cc21a69ea5896ecb3e88712a35dcd5f3ef1c799214ad1f5da" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 5f91a13d5e..12a11a54a1 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.0 +ENV NODE_VERSION 12.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index ec2b56d25a..8a35049d54 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.0 +ENV NODE_VERSION 12.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index d30f8ccf96..c91acdca26 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.0 +ENV NODE_VERSION 12.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 4567f7a7e7..269e8a077e 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.0 +ENV NODE_VERSION 12.22.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index 47e24898e6..f8aad1e37a 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.16.0 +ENV NODE_VERSION 14.16.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="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ + CHECKSUM="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 53de65ed05..334456b610 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.16.0 +ENV NODE_VERSION 14.16.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="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ + CHECKSUM="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index a218ce62a3..2a504ddb17 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.16.0 +ENV NODE_VERSION 14.16.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="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ + CHECKSUM="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 83cbb5ce96..07e139c70e 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.16.0 +ENV NODE_VERSION 14.16.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="53cd618bd0cd387d79e954383d67b540ebfbefee9e261800eefff60e1bf38644" \ + CHECKSUM="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 6a8e86bb7b..a1f688957b 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.16.0 +ENV NODE_VERSION 14.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 2f979605c7..6d88cf4f9f 100644 --- a/14/buster/Dockerfile +++ b/14/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.16.0 +ENV NODE_VERSION 14.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 15379a0c56..077c27d20d 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.16.0 +ENV NODE_VERSION 14.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index e0c44d5736..98d06169c7 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.16.0 +ENV NODE_VERSION 14.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile index ecedc81247..4ffadc6c7f 100644 --- a/15/alpine3.10/Dockerfile +++ b/15/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 15.13.0 +ENV NODE_VERSION 15.14.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="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ + CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile index 8a023360c3..070470cbd7 100644 --- a/15/alpine3.11/Dockerfile +++ b/15/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 15.13.0 +ENV NODE_VERSION 15.14.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="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ + CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile index 8a46ec4448..e6f60718ad 100644 --- a/15/alpine3.12/Dockerfile +++ b/15/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 15.13.0 +ENV NODE_VERSION 15.14.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="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ + CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ ;; \ *) ;; \ esac \ diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile index 58933567a7..1f9742e1df 100644 --- a/15/alpine3.13/Dockerfile +++ b/15/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 15.13.0 +ENV NODE_VERSION 15.14.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="560135ba0340dfc70051e8e6342d72ac1544260c2cb1747a0674b63974cca0a3" \ + CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ ;; \ *) ;; \ esac \ diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile index b40d049054..5a2d7ef33a 100644 --- a/15/buster-slim/Dockerfile +++ b/15/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 15.13.0 +ENV NODE_VERSION 15.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile index 0265acf947..bc9ce3ee0a 100644 --- a/15/buster/Dockerfile +++ b/15/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 15.13.0 +ENV NODE_VERSION 15.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile index c3383d1fa0..31963ef055 100644 --- a/15/stretch-slim/Dockerfile +++ b/15/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 15.13.0 +ENV NODE_VERSION 15.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile index 3d67e87093..d7bc213481 100644 --- a/15/stretch/Dockerfile +++ b/15/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 15.13.0 +ENV NODE_VERSION 15.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 2438859c181e4e9e5c4a7ad8e4a54ef69aeefbf3 Mon Sep 17 00:00:00 2001 From: Daniel Nalborczyk Date: Tue, 20 Apr 2021 19:26:24 -0400 Subject: [PATCH 455/818] feat: node.js v16.0.0 --- 16/alpine3.11/Dockerfile | 100 +++++++++++++++++++++++++++ 16/alpine3.11/docker-entrypoint.sh | 8 +++ 16/alpine3.12/Dockerfile | 100 +++++++++++++++++++++++++++ 16/alpine3.12/docker-entrypoint.sh | 8 +++ 16/alpine3.13/Dockerfile | 100 +++++++++++++++++++++++++++ 16/alpine3.13/docker-entrypoint.sh | 8 +++ 16/architectures | 7 ++ 16/buster-slim/Dockerfile | 96 +++++++++++++++++++++++++ 16/buster-slim/docker-entrypoint.sh | 8 +++ 16/buster/Dockerfile | 72 +++++++++++++++++++ 16/buster/docker-entrypoint.sh | 8 +++ 16/stretch-slim/Dockerfile | 96 +++++++++++++++++++++++++ 16/stretch-slim/docker-entrypoint.sh | 8 +++ 16/stretch/Dockerfile | 72 +++++++++++++++++++ 16/stretch/docker-entrypoint.sh | 8 +++ 15 files changed, 699 insertions(+) create mode 100644 16/alpine3.11/Dockerfile create mode 100755 16/alpine3.11/docker-entrypoint.sh create mode 100644 16/alpine3.12/Dockerfile create mode 100755 16/alpine3.12/docker-entrypoint.sh create mode 100644 16/alpine3.13/Dockerfile create mode 100755 16/alpine3.13/docker-entrypoint.sh create mode 100644 16/architectures create mode 100644 16/buster-slim/Dockerfile create mode 100755 16/buster-slim/docker-entrypoint.sh create mode 100644 16/buster/Dockerfile create mode 100755 16/buster/docker-entrypoint.sh create mode 100644 16/stretch-slim/Dockerfile create mode 100755 16/stretch-slim/docker-entrypoint.sh create mode 100644 16/stretch/Dockerfile create mode 100755 16/stretch/docker-entrypoint.sh diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile new file mode 100644 index 0000000000..c1bae9316e --- /dev/null +++ b/16/alpine3.11/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.11 + +ENV NODE_VERSION 16.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/alpine3.11/docker-entrypoint.sh b/16/alpine3.11/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/alpine3.11/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile new file mode 100644 index 0000000000..03130f2814 --- /dev/null +++ b/16/alpine3.12/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.12 + +ENV NODE_VERSION 16.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/alpine3.12/docker-entrypoint.sh b/16/alpine3.12/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/alpine3.12/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile new file mode 100644 index 0000000000..67ad51a0a5 --- /dev/null +++ b/16/alpine3.13/Dockerfile @@ -0,0 +1,100 @@ +FROM alpine:3.13 + +ENV NODE_VERSION 16.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/alpine3.13/docker-entrypoint.sh b/16/alpine3.13/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/alpine3.13/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/architectures b/16/architectures new file mode 100644 index 0000000000..e2f96e58aa --- /dev/null +++ b/16/architectures @@ -0,0 +1,7 @@ +bashbrew-arch variants +amd64 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.11,alpine3.12,alpine3.13 +arm32v7 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +ppc64le alpine3.11,alpine3.12,alpine3.13,buster,buster-slim +s390x alpine3.11,alpine3.12,alpine3.13,buster,buster-slim diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile new file mode 100644 index 0000000000..8b986df658 --- /dev/null +++ b/16/buster-slim/Dockerfile @@ -0,0 +1,96 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/buster-slim/docker-entrypoint.sh b/16/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile new file mode 100644 index 0000000000..e3b1868b70 --- /dev/null +++ b/16/buster/Dockerfile @@ -0,0 +1,72 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/buster/docker-entrypoint.sh b/16/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile new file mode 100644 index 0000000000..a75f72d9db --- /dev/null +++ b/16/stretch-slim/Dockerfile @@ -0,0 +1,96 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/stretch-slim/docker-entrypoint.sh b/16/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile new file mode 100644 index 0000000000..f51f7471ab --- /dev/null +++ b/16/stretch/Dockerfile @@ -0,0 +1,72 @@ +FROM buildpack-deps:stretch + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; 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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; 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://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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/stretch/docker-entrypoint.sh b/16/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" From 6d1e9aecced2720af9447de5879c48685c126170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 06:01:25 +0000 Subject: [PATCH 456/818] chore(deps): bump actions/github-script from v3 to v4.0.1 Bumps [actions/github-script](https://github.com/actions/github-script) from v3 to v4.0.1. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v3...85e88a66eaa831097093a3d278536947f2984d20) Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 16483a9a32..0abd426fa0 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v2 - name: Generate testing matrix - uses: actions/github-script@v3 + uses: actions/github-script@v4.0.1 id: generator with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: steps: - name: Get short node version - uses: actions/github-script@v3 + uses: actions/github-script@v4.0.1 id: short-version with: result-encoding: string From f0551c9eb5e0dbb853eda4266bc0964e5989bda1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 22 Apr 2021 07:52:48 -0400 Subject: [PATCH 457/818] fix: Add Node 16 Apline binaries --- 16/alpine3.11/Dockerfile | 2 +- 16/alpine3.12/Dockerfile | 2 +- 16/alpine3.13/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index c1bae9316e..5e8fd6c58c 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="" \ + CHECKSUM="edd34953d60a191af7a0675c64dacf6ab1db5fe4c5bb89ffa53e4b4036866499" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 03130f2814..79d87607b6 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="" \ + CHECKSUM="edd34953d60a191af7a0675c64dacf6ab1db5fe4c5bb89ffa53e4b4036866499" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 67ad51a0a5..e13aa028c2 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="" \ + CHECKSUM="edd34953d60a191af7a0675c64dacf6ab1db5fe4c5bb89ffa53e4b4036866499" \ ;; \ *) ;; \ esac \ From 9970bdc645e6688f4b5a4cf5558782e6ec590b91 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 22 Apr 2021 17:53:55 -0400 Subject: [PATCH 458/818] fix: Add 16 to stackbrew --- generate-stackbrew-library.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 5137d5bc75..764919fcbd 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -13,7 +13,9 @@ array_12='12 erbium' # shellcheck disable=SC2034 array_14='14 fermium lts' # shellcheck disable=SC2034 -array_15='15 latest current' +array_15='15' +# shellcheck disable=SC2034 +array_16='16 latest current' default_variant=$(get_config "./" "default_variant") From 106a81baa0f1fc796ba5274c372fde53f894c4ed Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 24 Apr 2021 15:26:50 -0400 Subject: [PATCH 459/818] chore: Migrate to JS based stackbrew --- .github/workflows/official-pr.yml | 5 +- 10/architectures | 8 - 12/architectures | 7 - 14/architectures | 7 - 15/architectures | 7 - 16/architectures | 7 - generate-stackbrew-library.sh | 114 ----------- stackbrew.js | 152 +++++++++++++++ versions.json | 305 ++++++++++++++++++++++++++++++ 9 files changed, 459 insertions(+), 153 deletions(-) delete mode 100644 10/architectures delete mode 100644 12/architectures delete mode 100644 14/architectures delete mode 100644 15/architectures delete mode 100644 16/architectures delete mode 100755 generate-stackbrew-library.sh create mode 100644 stackbrew.js create mode 100644 versions.json diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index a9b6ef128a..b57f32def7 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -10,8 +10,7 @@ on: - "**/Dockerfile" - "**/architectures" - "**/docker-entrypoint.sh" - - "generate-stackbrew-library.sh" - - "functions.sh" + - "stackbrew.js" - "config" jobs: @@ -36,7 +35,7 @@ jobs: - name: Generate Stackbrew for diff run: | cd docker-node - ./generate-stackbrew-library.sh > ../official-images/library/node + ./stackbrew.js > ../official-images/library/node - name: Create PR in official-images id: create-pr diff --git a/10/architectures b/10/architectures deleted file mode 100644 index c178997a03..0000000000 --- a/10/architectures +++ /dev/null @@ -1,8 +0,0 @@ -bashbrew-arch variants -amd64 alpine3.10,alpine3.11,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11 -arm32v7 alpine3.10,alpine3.11,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,buster,buster-slim,stretch,stretch-slim -i386 alpine3.10,alpine3.11 -ppc64le alpine3.10,alpine3.11,buster,buster-slim -s390x alpine3.10,alpine3.11,buster,buster-slim diff --git a/12/architectures b/12/architectures deleted file mode 100644 index e596715982..0000000000 --- a/12/architectures +++ /dev/null @@ -1,7 +0,0 @@ -bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12 -arm32v7 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,buster,buster-slim,stretch,stretch-slim -ppc64le alpine3.10,alpine3.11,alpine3.12,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,buster,buster-slim diff --git a/14/architectures b/14/architectures deleted file mode 100644 index 253f4aa761..0000000000 --- a/14/architectures +++ /dev/null @@ -1,7 +0,0 @@ -bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.13 -arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim diff --git a/15/architectures b/15/architectures deleted file mode 100644 index 253f4aa761..0000000000 --- a/15/architectures +++ /dev/null @@ -1,7 +0,0 @@ -bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.13 -arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim diff --git a/16/architectures b/16/architectures deleted file mode 100644 index e2f96e58aa..0000000000 --- a/16/architectures +++ /dev/null @@ -1,7 +0,0 @@ -bashbrew-arch variants -amd64 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.11,alpine3.12,alpine3.13 -arm32v7 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -ppc64le alpine3.11,alpine3.12,alpine3.13,buster,buster-slim -s390x alpine3.11,alpine3.12,alpine3.13,buster,buster-slim diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh deleted file mode 100755 index 764919fcbd..0000000000 --- a/generate-stackbrew-library.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/env bash - -set -e -. functions.sh - -hash git 2> /dev/null || { echo >&2 "git not found, exiting."; } - -# Used dynamically: print "$array_" $1 -# shellcheck disable=SC2034 -array_10='10 dubnium' -# shellcheck disable=SC2034 -array_12='12 erbium' -# shellcheck disable=SC2034 -array_14='14 fermium lts' -# shellcheck disable=SC2034 -array_15='15' -# shellcheck disable=SC2034 -array_16='16 latest current' - -default_variant=$(get_config "./" "default_variant") - -default_alpine=$(get_config "./" "alpine_version") - -cd "$(cd "${0%/*}" && pwd -P)" - -self="$(basename "${BASH_SOURCE[0]}")" - -IFS=' ' read -ra versions <<< "$(get_versions)" -IFS=' ' read -ra versions <<< "$(sort_versions "${versions[@]}")" -url='https://github.com/nodejs/docker-node' - -# get the most recent commit which modified any of "$@" -fileCommit() { - git log -1 --format='format:%H' HEAD -- "$@" -} - -echo "# this file is generated via ${url}/blob/$(fileCommit "${self}")/${self}" -echo -echo "Maintainers: The Node.js Docker Team <${url}> (@nodejs)" -echo "GitRepo: ${url}.git" -echo "GitFetch: refs/heads/main" -echo - -# prints "$2$1$3$1...$N" -join() { - local sep="$1" - shift - local out - printf -v out "${sep//%/%%}%s" "$@" - echo "${out#$sep}" -} - -get_stub() { - local version="${1}" - shift - IFS='/' read -ra versionparts <<< "${version}" - local stub - eval stub="$(join '_' "${versionparts[@]}" | awk -F. '{ print "$array_" $1 }')" - echo "${stub}" -} - -for version in "${versions[@]}"; do - # Skip "docs" and other non-docker directories - [ -f "${version}/Dockerfile" ] || [ -f "${version}/${default_variant}/Dockerfile" ] || continue - - stub=$(get_stub "${version}") - commit="$(fileCommit "${version}")" - fullVersion="$(get_tag "${version}" full)" - majorMinorVersion="$(get_tag "${version}" majorminor)" - - IFS=' ' read -ra versionAliases <<< "$fullVersion $majorMinorVersion $stub" - - if [ -f "${version}/Dockerfile" ]; then - # Get supported architectures for a specific version. See details in function.sh - IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "${version}" "default")" - - echo "Tags: $(join ', ' "${versionAliases[@]}")" - echo "Architectures: $(join ', ' "${supportedArches[@]}")" - echo "GitCommit: ${commit}" - echo "Directory: ${version}" - echo - fi - - # Get supported variants according to the target architecture. - # See details in function.sh - IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "${version}")")" - for variant in "${variants[@]}"; do - # Skip non-docker directories - [ -f "${version}/${variant}/Dockerfile" ] || continue - - commit="$(fileCommit "${version}/${variant}")" - - slash='/' - variantAliases=("${versionAliases[@]/%/-${variant//${slash}/-}}") - if [ "${variant}" = "${default_variant}-slim" ]; then - variantAliases+=("${versionAliases[@]/%/-slim}") - elif [ "${variant}" = "alpine${default_alpine}" ]; then - variantAliases+=("${versionAliases[@]/%/-alpine}") - elif [ "${variant}" = "${default_variant}" ]; then - variantAliases+=("${versionAliases[@]}") - fi - variantAliases=("${variantAliases[@]//latest-/}") - - # Get supported architectures for a specific version and variant. - # See details in function.sh - IFS=' ' read -ra supportedArches <<< "$(get_supported_arches "${version}" "${variant}")" - - echo "Tags: $(join ', ' "${variantAliases[@]}")" - echo "Architectures: $(join ', ' "${supportedArches[@]}")" - echo "GitCommit: ${commit}" - echo "Directory: ${version}/${variant}" - echo - done -done diff --git a/stackbrew.js b/stackbrew.js new file mode 100644 index 0000000000..8b6f55404d --- /dev/null +++ b/stackbrew.js @@ -0,0 +1,152 @@ +#!/usr/bin/env node + +const fs = require('fs'); +const path = require('path'); + +// Grab last git commit +function getCommitHasForPath(path) { + return require('child_process') + .execSync(`git log -1 --format=%H HEAD -- ${path}`) + .toString().trim() +} + +const stackbrewPath = path.basename(__filename); + +// Header +let stackbrew = `# this file is generated via https://github.com/nodejs/docker-node/blob/${getCommitHasForPath(stackbrewPath)}/${stackbrewPath} + +Maintainers: The Node.js Docker Team (@nodejs) +GitRepo: https://github.com/nodejs/docker-node.git +GitFetch: refs/heads/main\n`; + +// Loop versions + +const config = require('./versions.json'); + +const versions = Object.keys(config).reverse() + +const now = new Date().getTime() +const aplineRE = new RegExp(/alpine*/); +const slimRE = new RegExp(/\*-slim/); + +for(version of versions) { + let lts = new Date(config[version].lts).getTime(); + let maintenance = new Date(config[version].maintenance).getTime(); + let isCurrent = lts > now; + let isLTS = (maintenance > now) && (now > lts); + let codename = config[version].codename + let defaultAlpine = config[version]['alpine-default'] + let defaultDebian = config[version]['debian-default'] + let variants = config[version].variants + let fullversion; + for(variant in variants) { + let dockerfilePath = path.join(version, variant, 'Dockerfile'); + let isAlpine = aplineRE.test(variant) + let isSlim = slimRE.test(variant) + let isDefaultSlim = new RegExp(`${defaultDebian}-slim`).test(variant) + + // Get full version from the first Dockerfile + if (!fullversion) { + let dockerfile = fs.readFileSync(dockerfilePath, 'utf-8') + fullversion = dockerfile.match(/ENV NODE_VERSION (?\d+)\.(?\d+)\.(?\d+)/) + } + let tags = [ + `${fullversion.groups.major}.${fullversion.groups.minor}.${fullversion.groups.patch}-${variant}`, + `${fullversion.groups.major}.${fullversion.groups.minor}-${variant}`, + `${fullversion.groups.major}-${variant}`, + ] + + if (codename) { + tags.push(`${codename}-${variant}`) + } + + if (variant === defaultAlpine) { + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}.${fullversion.groups.patch}-alpine`) + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}-alpine`) + tags.push(`${fullversion.groups.major}-alpine`) + if (codename) { + tags.push(`${codename}-alpine`) + } + } + + if (variant === defaultDebian) { + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}.${fullversion.groups.patch}`) + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}`) + tags.push(`${fullversion.groups.major}`) + if (isSlim) { + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}.${fullversion.groups.patch}-slim`) + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}-slim`) + tags.push(`${fullversion.groups.major}-slim`) + } + if (codename) { + tags.push(`${codename}`) + } + } + if (isDefaultSlim) { + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}.${fullversion.groups.patch}-slim`) + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}-slim`) + tags.push(`${fullversion.groups.major}-slim`) + if (codename) { + tags.push(`${codename}-slim`) + } + } + + if (isCurrent) { + if (variant === defaultAlpine) { + tags.push(variant) + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}.${fullversion.groups.patch}-alpine`) + tags.push(`${fullversion.groups.major}.${fullversion.groups.minor}-alpine`) + tags.push(`${fullversion.groups.major}-alpine`) + tags.push('alpine') + tags.push('current-alpine') + } + if (variant === defaultDebian) { + tags.push(variant) + tags.push('latest') + tags.push('current') + } + if (isAlpine) { + tags.push(`${variant}`) + tags.push(`current-${variant}`) + } + if (!isAlpine) { + tags.push(`${variant}`) + tags.push(`current-${variant}`) + } + if (isDefaultSlim) { + tags.push('slim') + tags.push('current-slim') + } + } + + if (isLTS) { + tags.push(`lts-${variant}`) + if (variant === defaultAlpine) { + } + if (variant === defaultDebian) { + tags.push('lts') + if (codename) { + tags.push(`lts-${codename}`) + } + } + if (isDefaultSlim) { + tags.push(`lts-slim`) + } + if (variant === defaultAlpine) { + tags.push(`lts-alpine`) + } + } + + // remove duplicates + tags = tags.filter((x, i, a) => a.indexOf(x) == i) + tags = tags.sort() + + stackbrew += `\nTags: ${tags.join(', ')}\n` + stackbrew += `Architectures: ${config[version].variants[variant].join(', ')}\n` + stackbrew += `GitCommit: ${getCommitHasForPath(dockerfilePath)}\n` + stackbrew += `Directory: ${version}/${variant}\n` + } +} + +// output +console.log(stackbrew) diff --git a/versions.json b/versions.json new file mode 100644 index 0000000000..ac9a5e94d9 --- /dev/null +++ b/versions.json @@ -0,0 +1,305 @@ +{ + "16": { + "start": "2021-04-20", + "lts": "2021-10-26", + "maintenance": "2022-10-18", + "end": "2024-04-30", + "codename": "", + "alpine-default": "alpine3.13", + "debian-default": "buster", + "variants": { + "alpine3.11": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.12": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.13": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "stretch": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "stretch-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, + "15": { + "start": "2020-10-20", + "maintenance": "2021-04-01", + "end": "2021-06-01", + "alpine-default": "alpine3.11", + "debian-default": "stretch", + "variants": { + "alpine3.10": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.11": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.12": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.13": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "stretch": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "stretch-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, + "14": { + "start": "2020-04-21", + "lts": "2020-10-27", + "maintenance": "2021-10-19", + "end": "2023-04-30", + "codename": "fermium", + "alpine-default": "alpine3.11", + "debian-default": "stretch", + "variants": { + "alpine3.10": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.11": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.12": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.13": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "stretch": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "stretch-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, + "12": { + "start": "2019-04-23", + "lts": "2019-10-21", + "maintenance": "2020-11-30", + "end": "2022-04-30", + "codename": "erbium", + "alpine-default": "alpine3.11", + "debian-default": "stretch", + "variants": { + "alpine3.10": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.11": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.12": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "stretch": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "stretch-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, + "10": { + "start": "2018-04-24", + "lts": "2018-10-30", + "maintenance": "2020-05-19", + "end": "2021-04-30", + "codename": "dubnium", + "alpine-default": "alpine3.11", + "debian-default": "stretch", + "variants": { + "alpine3.10": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "i386", + "ppc64le", + "s390x" + ], + "alpine3.11": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "i386", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "stretch": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "stretch-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + } +} From 464476a1e78bc643e0729f9d9d288b9d72cd3d16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Apr 2021 07:13:57 +0000 Subject: [PATCH 460/818] chore(deps): bump actions/github-script from v4.0.1 to v4.0.2 Bumps [actions/github-script](https://github.com/actions/github-script) from v4.0.1 to v4.0.2. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4.0.1...a3e7071a34d7e1f219a8a4de9a5e0a34d1ee1293) Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 0abd426fa0..abd62793ed 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v2 - name: Generate testing matrix - uses: actions/github-script@v4.0.1 + uses: actions/github-script@v4.0.2 id: generator with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: steps: - name: Get short node version - uses: actions/github-script@v4.0.1 + uses: actions/github-script@v4.0.2 id: short-version with: result-encoding: string From 3700bf53fd842fafeef29cf37ae16e1da05eb5ba Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 26 Apr 2021 09:18:19 -0400 Subject: [PATCH 461/818] chore: Update official images workflow --- .github/workflows/official-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index b57f32def7..f2268290ab 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -11,7 +11,6 @@ on: - "**/architectures" - "**/docker-entrypoint.sh" - "stackbrew.js" - - "config" jobs: pr: From 8caf95d4ad8e658ba5a15bdaa20cdb8a4e12a962 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 26 Apr 2021 10:28:55 -0400 Subject: [PATCH 462/818] chore: Add execute bit to stackbrew.js --- stackbrew.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 stackbrew.js diff --git a/stackbrew.js b/stackbrew.js old mode 100644 new mode 100755 From 2b4633a8267ce1060eb0535c2e83f06a5980048c Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 30 Apr 2021 18:33:09 -0400 Subject: [PATCH 463/818] chore: Drop Node 10 for EOL --- 10/alpine3.10/Dockerfile | 100 --------------------------- 10/alpine3.10/docker-entrypoint.sh | 8 --- 10/alpine3.11/Dockerfile | 100 --------------------------- 10/alpine3.11/docker-entrypoint.sh | 8 --- 10/buster-slim/Dockerfile | 96 ------------------------- 10/buster-slim/docker-entrypoint.sh | 8 --- 10/buster/Dockerfile | 72 ------------------- 10/buster/docker-entrypoint.sh | 8 --- 10/stretch-slim/Dockerfile | 96 ------------------------- 10/stretch-slim/docker-entrypoint.sh | 8 --- 10/stretch/Dockerfile | 72 ------------------- 10/stretch/docker-entrypoint.sh | 8 --- versions.json | 53 -------------- 13 files changed, 637 deletions(-) delete mode 100644 10/alpine3.10/Dockerfile delete mode 100755 10/alpine3.10/docker-entrypoint.sh delete mode 100644 10/alpine3.11/Dockerfile delete mode 100755 10/alpine3.11/docker-entrypoint.sh delete mode 100644 10/buster-slim/Dockerfile delete mode 100755 10/buster-slim/docker-entrypoint.sh delete mode 100644 10/buster/Dockerfile delete mode 100755 10/buster/docker-entrypoint.sh delete mode 100644 10/stretch-slim/Dockerfile delete mode 100755 10/stretch-slim/docker-entrypoint.sh delete mode 100644 10/stretch/Dockerfile delete mode 100755 10/stretch/docker-entrypoint.sh diff --git a/10/alpine3.10/Dockerfile b/10/alpine3.10/Dockerfile deleted file mode 100644 index 4612519486..0000000000 --- a/10/alpine3.10/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.10 - -ENV NODE_VERSION 10.24.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="138eed35daca02bbc01cae161e13604b1b71139e9552d4cb9fe3aad742ce94ec" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/alpine3.10/docker-entrypoint.sh b/10/alpine3.10/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/alpine3.10/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/10/alpine3.11/Dockerfile b/10/alpine3.11/Dockerfile deleted file mode 100644 index ec4e870a2c..0000000000 --- a/10/alpine3.11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.11 - -ENV NODE_VERSION 10.24.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="138eed35daca02bbc01cae161e13604b1b71139e9552d4cb9fe3aad742ce94ec" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/alpine3.11/docker-entrypoint.sh b/10/alpine3.11/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/alpine3.11/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/10/buster-slim/Dockerfile b/10/buster-slim/Dockerfile deleted file mode 100644 index c7be943fa6..0000000000 --- a/10/buster-slim/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 10.24.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/buster-slim/docker-entrypoint.sh b/10/buster-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/10/buster/Dockerfile b/10/buster/Dockerfile deleted file mode 100644 index e766fbca8e..0000000000 --- a/10/buster/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 10.24.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/buster/docker-entrypoint.sh b/10/buster/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/buster/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/10/stretch-slim/Dockerfile b/10/stretch-slim/Dockerfile deleted file mode 100644 index 28d9a165d4..0000000000 --- a/10/stretch-slim/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 10.24.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/stretch-slim/docker-entrypoint.sh b/10/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/10/stretch/Dockerfile b/10/stretch/Dockerfile deleted file mode 100644 index db5643cacd..0000000000 --- a/10/stretch/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 10.24.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/10/stretch/docker-entrypoint.sh b/10/stretch/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/10/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index ac9a5e94d9..ec3bcfc030 100644 --- a/versions.json +++ b/versions.json @@ -248,58 +248,5 @@ "arm64v8" ] } - }, - "10": { - "start": "2018-04-24", - "lts": "2018-10-30", - "maintenance": "2020-05-19", - "end": "2021-04-30", - "codename": "dubnium", - "alpine-default": "alpine3.11", - "debian-default": "stretch", - "variants": { - "alpine3.10": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "i386", - "ppc64le", - "s390x" - ], - "alpine3.11": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "i386", - "ppc64le", - "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "stretch": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "stretch-slim": [ - "amd64", - "arm32v7", - "arm64v8" - ] - } } } From 0da5cb265cb54c91f07aaac1ef607313500dc8f1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 30 Apr 2021 18:34:13 -0400 Subject: [PATCH 464/818] chore: Trigger official images on version.json --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index f2268290ab..6e1dea6f43 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -8,8 +8,8 @@ on: paths: - ".github/workflows/official-pr.yml" - "**/Dockerfile" - - "**/architectures" - "**/docker-entrypoint.sh" + - "versions.json" - "stackbrew.js" jobs: From b88e1dd1de12d8017e73e4647533336501bd91ba Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 30 Apr 2021 18:36:00 -0400 Subject: [PATCH 465/818] chore: Update docs to point to versions.json --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cced25f24..7f792ae297 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ The `node` images come in many flavors, each designed for a specific use case. All of the images contain pre-installed versions of `node`, [`npm`](https://www.npmjs.com/), and [`yarn`](https://yarnpkg.com). For each supported architecture, the supported variants are different. In the file: -[architectures](./architectures), it lists all supported variants for all of +[versions.json](./versions.json), it lists all supported variants for all of the architectures that we support now. ### `node:` From 8b68fca7a5089bd8795ae85b55617314e966487b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 5 May 2021 11:10:53 -0400 Subject: [PATCH 466/818] feat: Node 16.1.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 5e8fd6c58c..11391310c8 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.0.0 +ENV NODE_VERSION 16.1.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="edd34953d60a191af7a0675c64dacf6ab1db5fe4c5bb89ffa53e4b4036866499" \ + CHECKSUM="b9c75b4d47e573f77c6d0d8e8af3ecfdf365edbc41d86196897ddb630bd16c7e" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 79d87607b6..76e49a7a10 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.0.0 +ENV NODE_VERSION 16.1.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="edd34953d60a191af7a0675c64dacf6ab1db5fe4c5bb89ffa53e4b4036866499" \ + CHECKSUM="b9c75b4d47e573f77c6d0d8e8af3ecfdf365edbc41d86196897ddb630bd16c7e" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index e13aa028c2..712ff7f69b 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.0.0 +ENV NODE_VERSION 16.1.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="edd34953d60a191af7a0675c64dacf6ab1db5fe4c5bb89ffa53e4b4036866499" \ + CHECKSUM="b9c75b4d47e573f77c6d0d8e8af3ecfdf365edbc41d86196897ddb630bd16c7e" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 8b986df658..b69e16b01c 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.0.0 +ENV NODE_VERSION 16.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index e3b1868b70..9a5402577a 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.0.0 +ENV NODE_VERSION 16.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index a75f72d9db..132b3aa8a7 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.0.0 +ENV NODE_VERSION 16.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index f51f7471ab..5d3b894bcc 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.0.0 +ENV NODE_VERSION 16.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b1035ac19bad5a92e9bc48c1b53ea37572c88cfc Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 12 May 2021 08:12:49 +0200 Subject: [PATCH 467/818] chore: update to node 14.17.0 --- 14/alpine3.10/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile index f8aad1e37a..8489e43cb9 100644 --- a/14/alpine3.10/Dockerfile +++ b/14/alpine3.10/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.10 -ENV NODE_VERSION 14.16.1 +ENV NODE_VERSION 14.17.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="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ + CHECKSUM="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 334456b610..3d44260f05 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.16.1 +ENV NODE_VERSION 14.17.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="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ + CHECKSUM="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 2a504ddb17..9c755fb939 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.16.1 +ENV NODE_VERSION 14.17.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="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ + CHECKSUM="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 07e139c70e..74cc5fe8c3 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.16.1 +ENV NODE_VERSION 14.17.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="39fbbd09668472f1105bdb5a7c20675bd91649543d2bc25b6edc1293835661f1" \ + CHECKSUM="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index a1f688957b..a78d3c7200 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.16.1 +ENV NODE_VERSION 14.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 6d88cf4f9f..2e706aa812 100644 --- a/14/buster/Dockerfile +++ b/14/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.16.1 +ENV NODE_VERSION 14.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 077c27d20d..fb5151e700 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.16.1 +ENV NODE_VERSION 14.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 98d06169c7..702a6d4f65 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.16.1 +ENV NODE_VERSION 14.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5e83de3df9b640770e700b85241570dd5a78253e Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 19 May 2021 22:08:45 +0800 Subject: [PATCH 468/818] Update node.js v16 from 16.1.0 to 16.2.0 - https://nodejs.org/en/blog/release/v16.2.0/ - https://github.com/nodejs/node/releases/tag/v16.2.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V16.md#16.2.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 11391310c8..7223bf3c18 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.1.0 +ENV NODE_VERSION 16.2.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="b9c75b4d47e573f77c6d0d8e8af3ecfdf365edbc41d86196897ddb630bd16c7e" \ + CHECKSUM="ac3cb1aa724b2db17f5be9463b08b6c1b5cb281c660e6a4526ee67e1dd4ba24b" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 76e49a7a10..d246e9bedf 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.1.0 +ENV NODE_VERSION 16.2.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="b9c75b4d47e573f77c6d0d8e8af3ecfdf365edbc41d86196897ddb630bd16c7e" \ + CHECKSUM="ac3cb1aa724b2db17f5be9463b08b6c1b5cb281c660e6a4526ee67e1dd4ba24b" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 712ff7f69b..2fb7713196 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.1.0 +ENV NODE_VERSION 16.2.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="b9c75b4d47e573f77c6d0d8e8af3ecfdf365edbc41d86196897ddb630bd16c7e" \ + CHECKSUM="ac3cb1aa724b2db17f5be9463b08b6c1b5cb281c660e6a4526ee67e1dd4ba24b" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index b69e16b01c..addb020c77 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.1.0 +ENV NODE_VERSION 16.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 9a5402577a..856917c1b0 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.1.0 +ENV NODE_VERSION 16.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 132b3aa8a7..32aa0971cc 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.1.0 +ENV NODE_VERSION 16.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 5d3b894bcc..cb0009fe26 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.1.0 +ENV NODE_VERSION 16.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From a95b461c4cd2d38f12da6b3c3dff8a1b897a92ab Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 31 May 2021 10:26:20 -0400 Subject: [PATCH 469/818] chore: Drop EOL Apline 3.10 --- 12/alpine3.10/Dockerfile | 100 ----------------------------- 12/alpine3.10/docker-entrypoint.sh | 8 --- 14/alpine3.10/Dockerfile | 100 ----------------------------- 14/alpine3.10/docker-entrypoint.sh | 8 --- 15/alpine3.10/Dockerfile | 100 ----------------------------- 15/alpine3.10/docker-entrypoint.sh | 8 --- versions.json | 24 ------- 7 files changed, 348 deletions(-) delete mode 100644 12/alpine3.10/Dockerfile delete mode 100755 12/alpine3.10/docker-entrypoint.sh delete mode 100644 14/alpine3.10/Dockerfile delete mode 100755 14/alpine3.10/docker-entrypoint.sh delete mode 100644 15/alpine3.10/Dockerfile delete mode 100755 15/alpine3.10/docker-entrypoint.sh diff --git a/12/alpine3.10/Dockerfile b/12/alpine3.10/Dockerfile deleted file mode 100644 index 76cfafdb40..0000000000 --- a/12/alpine3.10/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.10 - -ENV NODE_VERSION 12.22.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="b7c8a2cb26790b4cc21a69ea5896ecb3e88712a35dcd5f3ef1c799214ad1f5da" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/alpine3.10/docker-entrypoint.sh b/12/alpine3.10/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/12/alpine3.10/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/alpine3.10/Dockerfile b/14/alpine3.10/Dockerfile deleted file mode 100644 index 8489e43cb9..0000000000 --- a/14/alpine3.10/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.10 - -ENV NODE_VERSION 14.17.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/alpine3.10/docker-entrypoint.sh b/14/alpine3.10/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/14/alpine3.10/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/15/alpine3.10/Dockerfile b/15/alpine3.10/Dockerfile deleted file mode 100644 index 4ffadc6c7f..0000000000 --- a/15/alpine3.10/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.10 - -ENV NODE_VERSION 15.14.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/alpine3.10/docker-entrypoint.sh b/15/alpine3.10/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/alpine3.10/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index ec3bcfc030..b6bb9e2a63 100644 --- a/versions.json +++ b/versions.json @@ -65,14 +65,6 @@ "alpine-default": "alpine3.11", "debian-default": "stretch", "variants": { - "alpine3.10": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], "alpine3.11": [ "amd64", "arm32v6", @@ -132,14 +124,6 @@ "alpine-default": "alpine3.11", "debian-default": "stretch", "variants": { - "alpine3.10": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], "alpine3.11": [ "amd64", "arm32v6", @@ -199,14 +183,6 @@ "alpine-default": "alpine3.11", "debian-default": "stretch", "variants": { - "alpine3.10": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], "alpine3.11": [ "amd64", "arm32v6", From 0a17168c467701f6ddc9c01867f752095cc463e2 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 1 Jun 2021 11:34:28 -0400 Subject: [PATCH 470/818] chore: Drop EOL Node 15 --- 15/alpine3.11/Dockerfile | 100 --------------------------- 15/alpine3.11/docker-entrypoint.sh | 8 --- 15/alpine3.12/Dockerfile | 100 --------------------------- 15/alpine3.12/docker-entrypoint.sh | 8 --- 15/alpine3.13/Dockerfile | 100 --------------------------- 15/alpine3.13/docker-entrypoint.sh | 8 --- 15/buster-slim/Dockerfile | 96 ------------------------- 15/buster-slim/docker-entrypoint.sh | 8 --- 15/buster/Dockerfile | 72 ------------------- 15/buster/docker-entrypoint.sh | 8 --- 15/stretch-slim/Dockerfile | 96 ------------------------- 15/stretch-slim/docker-entrypoint.sh | 8 --- 15/stretch/Dockerfile | 72 ------------------- 15/stretch/docker-entrypoint.sh | 8 --- versions.json | 57 --------------- 15 files changed, 749 deletions(-) delete mode 100644 15/alpine3.11/Dockerfile delete mode 100755 15/alpine3.11/docker-entrypoint.sh delete mode 100644 15/alpine3.12/Dockerfile delete mode 100755 15/alpine3.12/docker-entrypoint.sh delete mode 100644 15/alpine3.13/Dockerfile delete mode 100755 15/alpine3.13/docker-entrypoint.sh delete mode 100644 15/buster-slim/Dockerfile delete mode 100755 15/buster-slim/docker-entrypoint.sh delete mode 100644 15/buster/Dockerfile delete mode 100755 15/buster/docker-entrypoint.sh delete mode 100644 15/stretch-slim/Dockerfile delete mode 100755 15/stretch-slim/docker-entrypoint.sh delete mode 100644 15/stretch/Dockerfile delete mode 100755 15/stretch/docker-entrypoint.sh diff --git a/15/alpine3.11/Dockerfile b/15/alpine3.11/Dockerfile deleted file mode 100644 index 070470cbd7..0000000000 --- a/15/alpine3.11/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.11 - -ENV NODE_VERSION 15.14.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/alpine3.11/docker-entrypoint.sh b/15/alpine3.11/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/alpine3.11/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/15/alpine3.12/Dockerfile b/15/alpine3.12/Dockerfile deleted file mode 100644 index e6f60718ad..0000000000 --- a/15/alpine3.12/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.12 - -ENV NODE_VERSION 15.14.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/alpine3.12/docker-entrypoint.sh b/15/alpine3.12/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/alpine3.12/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/15/alpine3.13/Dockerfile b/15/alpine3.13/Dockerfile deleted file mode 100644 index 1f9742e1df..0000000000 --- a/15/alpine3.13/Dockerfile +++ /dev/null @@ -1,100 +0,0 @@ -FROM alpine:3.13 - -ENV NODE_VERSION 15.14.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="5aefd9f12592e6ed7e7a1fe2696576cf3e19d42c6103abcc3347cab2e54b7fb3" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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.tar.xz" \ - && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/alpine3.13/docker-entrypoint.sh b/15/alpine3.13/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/alpine3.13/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/15/buster-slim/Dockerfile b/15/buster-slim/Dockerfile deleted file mode 100644 index 5a2d7ef33a..0000000000 --- a/15/buster-slim/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 15.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/buster-slim/docker-entrypoint.sh b/15/buster-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/15/buster/Dockerfile b/15/buster/Dockerfile deleted file mode 100644 index bc9ce3ee0a..0000000000 --- a/15/buster/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 15.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/buster/docker-entrypoint.sh b/15/buster/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/buster/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/15/stretch-slim/Dockerfile b/15/stretch-slim/Dockerfile deleted file mode 100644 index 31963ef055..0000000000 --- a/15/stretch-slim/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 15.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/stretch-slim/docker-entrypoint.sh b/15/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/15/stretch/Dockerfile b/15/stretch/Dockerfile deleted file mode 100644 index d7bc213481..0000000000 --- a/15/stretch/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 15.14.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; 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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.5 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; 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://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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/15/stretch/docker-entrypoint.sh b/15/stretch/docker-entrypoint.sh deleted file mode 100755 index de6fa8a9ad..0000000000 --- a/15/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index b6bb9e2a63..c6b6031149 100644 --- a/versions.json +++ b/versions.json @@ -58,63 +58,6 @@ ] } }, - "15": { - "start": "2020-10-20", - "maintenance": "2021-04-01", - "end": "2021-06-01", - "alpine-default": "alpine3.11", - "debian-default": "stretch", - "variants": { - "alpine3.11": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.12": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.13": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "stretch": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "stretch-slim": [ - "amd64", - "arm32v7", - "arm64v8" - ] - } - }, "14": { "start": "2020-04-21", "lts": "2020-10-27", From 8d77359e4f20c45829f7d7399b76a5eb99eff4da Mon Sep 17 00:00:00 2001 From: Ben Limmer Date: Thu, 3 Jun 2021 11:03:33 -0600 Subject: [PATCH 471/818] Update node.js v16 from 16.2.0 to 16.3.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 7223bf3c18..8cb312bdee 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.2.0 +ENV NODE_VERSION 16.3.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="ac3cb1aa724b2db17f5be9463b08b6c1b5cb281c660e6a4526ee67e1dd4ba24b" \ + CHECKSUM="d73505cf34e881703324265ef9d7a753b1db2d62ab326be01d1ea73c858d4ca7" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index d246e9bedf..56fe4e6260 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.2.0 +ENV NODE_VERSION 16.3.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="ac3cb1aa724b2db17f5be9463b08b6c1b5cb281c660e6a4526ee67e1dd4ba24b" \ + CHECKSUM="d73505cf34e881703324265ef9d7a753b1db2d62ab326be01d1ea73c858d4ca7" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 2fb7713196..dc20ece789 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.2.0 +ENV NODE_VERSION 16.3.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="ac3cb1aa724b2db17f5be9463b08b6c1b5cb281c660e6a4526ee67e1dd4ba24b" \ + CHECKSUM="d73505cf34e881703324265ef9d7a753b1db2d62ab326be01d1ea73c858d4ca7" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index addb020c77..0a34a08065 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.2.0 +ENV NODE_VERSION 16.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 856917c1b0..8a7a63dc9a 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.2.0 +ENV NODE_VERSION 16.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 32aa0971cc..e70447430a 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.2.0 +ENV NODE_VERSION 16.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index cb0009fe26..9f1821fc82 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.2.0 +ENV NODE_VERSION 16.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1d04d72efc47227406ba321479eef0e58484f80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Maciejewski?= Date: Tue, 15 Jun 2021 18:12:56 +0200 Subject: [PATCH 472/818] chore: update to node 14.17.1 --- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 3d44260f05..42617d861f 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.17.0 +ENV NODE_VERSION 14.17.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="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ + CHECKSUM="c23931be1470e454ae062d53ffbabd12b8578a3fd23b6575433a220af0b431a9" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 9c755fb939..1a92b93798 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.17.0 +ENV NODE_VERSION 14.17.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="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ + CHECKSUM="c23931be1470e454ae062d53ffbabd12b8578a3fd23b6575433a220af0b431a9" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 74cc5fe8c3..aa1964e9ad 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.17.0 +ENV NODE_VERSION 14.17.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="019a8cae26a0ab9a8dc1264c2e1f11ad659e2093716263bb470f02189856b0a4" \ + CHECKSUM="c23931be1470e454ae062d53ffbabd12b8578a3fd23b6575433a220af0b431a9" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index a78d3c7200..44b675e7cf 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.17.0 +ENV NODE_VERSION 14.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 2e706aa812..ceb6b5b053 100644 --- a/14/buster/Dockerfile +++ b/14/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.17.0 +ENV NODE_VERSION 14.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index fb5151e700..9726e5c05d 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.17.0 +ENV NODE_VERSION 14.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 702a6d4f65..41023679d9 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.17.0 +ENV NODE_VERSION 14.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6d6260d48ad67ca1907fc9a9853974e43c6d6fe8 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 16 Jun 2021 20:44:02 +0800 Subject: [PATCH 473/818] Clean up Alpine 3.10 in architectures file, cc #1490 --- architectures | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/architectures b/architectures index 9c2484dd05..07096dc5b8 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.10,alpine3.11,alpine3.12,alpine3.13 -arm32v7 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -i386 alpine3.10,alpine3.11,alpine3.12,alpine3.13 -ppc64le alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim -s390x alpine3.10,alpine3.11,alpine3.12,alpine3.13,buster,buster-slim +amd64 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.11,alpine3.12,alpine3.13 +arm32v7 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim +i386 alpine3.11,alpine3.12,alpine3.13 +ppc64le alpine3.11,alpine3.12,alpine3.13,buster,buster-slim +s390x alpine3.11,alpine3.12,alpine3.13,buster,buster-slim From 3eb5ad46defffa859f099aed26547b7a6597720f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 07:04:00 +0000 Subject: [PATCH 474/818] chore(deps): bump actions/setup-node from 2.1.5 to 2.2.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 2.2.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v2.2.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 65f55b1287..97c0d980fe 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.2.0 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 5bb5a6e514..a20f0923b3 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.2.0 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 82d2be879c..a6b568d09c 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.2.0 with: node-version: '12.x' - name: Install markdown-link-check From 66b46292a6e5dd5856b1d5204dc51547c80eb17a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 1 Jul 2021 15:12:18 -0400 Subject: [PATCH 475/818] chore: Use openpgp and Ubuntu keyservers --- 12/alpine3.11/Dockerfile | 10 ++++------ 12/alpine3.12/Dockerfile | 10 ++++------ 12/buster-slim/Dockerfile | 10 ++++------ 12/buster/Dockerfile | 10 ++++------ 12/stretch-slim/Dockerfile | 10 ++++------ 12/stretch/Dockerfile | 10 ++++------ 14/alpine3.11/Dockerfile | 10 ++++------ 14/alpine3.12/Dockerfile | 10 ++++------ 14/alpine3.13/Dockerfile | 10 ++++------ 14/buster-slim/Dockerfile | 10 ++++------ 14/buster/Dockerfile | 10 ++++------ 14/stretch-slim/Dockerfile | 10 ++++------ 14/stretch/Dockerfile | 10 ++++------ 16/alpine3.11/Dockerfile | 10 ++++------ 16/alpine3.12/Dockerfile | 10 ++++------ 16/alpine3.13/Dockerfile | 10 ++++------ 16/buster-slim/Dockerfile | 10 ++++------ 16/buster/Dockerfile | 10 ++++------ 16/stretch-slim/Dockerfile | 10 ++++------ 16/stretch/Dockerfile | 10 ++++------ Dockerfile-alpine.template | 10 ++++------ Dockerfile-debian.template | 10 ++++------ Dockerfile-slim.template | 10 ++++------ update-keys.sh | 2 +- 24 files changed, 93 insertions(+), 139 deletions(-) diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 97532e4541..749777f3f5 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index f8cc9a741c..b4e692af7f 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 12a11a54a1..0bad418300 100644 --- a/12/buster-slim/Dockerfile +++ b/12/buster-slim/Dockerfile @@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -65,9 +64,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/12/buster/Dockerfile b/12/buster/Dockerfile index 8a35049d54..8fdaeb231e 100644 --- a/12/buster/Dockerfile +++ b/12/buster/Dockerfile @@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -51,9 +50,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index c91acdca26..fbb8d11be3 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/stretch-slim/Dockerfile @@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -65,9 +64,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/12/stretch/Dockerfile b/12/stretch/Dockerfile index 269e8a077e..1458f695c3 100644 --- a/12/stretch/Dockerfile +++ b/12/stretch/Dockerfile @@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -51,9 +50,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 42617d861f..9614caebf0 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 1a92b93798..1369bb6664 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index aa1964e9ad..438f297823 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 44b675e7cf..b66fb1aec5 100644 --- a/14/buster-slim/Dockerfile +++ b/14/buster-slim/Dockerfile @@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -65,9 +64,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/14/buster/Dockerfile b/14/buster/Dockerfile index ceb6b5b053..da19709777 100644 --- a/14/buster/Dockerfile +++ b/14/buster/Dockerfile @@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -51,9 +50,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 9726e5c05d..df30e8602d 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/stretch-slim/Dockerfile @@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -65,9 +64,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/14/stretch/Dockerfile b/14/stretch/Dockerfile index 41023679d9..d95f2f45b4 100644 --- a/14/stretch/Dockerfile +++ b/14/stretch/Dockerfile @@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -51,9 +50,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 8cb312bdee..da7e159be0 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 56fe4e6260..1c4dfd4f00 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index dc20ece789..78c8a2464c 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -48,9 +48,8 @@ RUN addgroup -g 1000 node \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -78,9 +77,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 0a34a08065..0649472f6a 100644 --- a/16/buster-slim/Dockerfile +++ b/16/buster-slim/Dockerfile @@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -65,9 +64,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/16/buster/Dockerfile b/16/buster/Dockerfile index 8a7a63dc9a..c77c3962a6 100644 --- a/16/buster/Dockerfile +++ b/16/buster/Dockerfile @@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -51,9 +50,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index e70447430a..896c13fbb4 100644 --- a/16/stretch-slim/Dockerfile +++ b/16/stretch-slim/Dockerfile @@ -32,9 +32,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -65,9 +64,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/16/stretch/Dockerfile b/16/stretch/Dockerfile index 9f1821fc82..ecfe4ae178 100644 --- a/16/stretch/Dockerfile +++ b/16/stretch/Dockerfile @@ -30,9 +30,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -51,9 +50,8 @@ RUN set -ex \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/Dockerfile-alpine.template b/Dockerfile-alpine.template index f5c4c949f7..bcfa119958 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -38,9 +38,8 @@ RUN addgroup -g 1000 node \ && for key in \ "${NODE_KEYS[@]}" ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -68,9 +67,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ "${YARN_KEYS[@]}" ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/Dockerfile-debian.template b/Dockerfile-debian.template index 1c3dcf4acf..17962567fa 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -20,9 +20,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ "${NODE_KEYS[@]}" ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -41,9 +40,8 @@ RUN set -ex \ && for key in \ "${YARN_KEYS[@]}" ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/Dockerfile-slim.template b/Dockerfile-slim.template index 0056b4a97e..aa7816d963 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -22,9 +22,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ "${NODE_KEYS[@]}" ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ @@ -55,9 +54,8 @@ RUN set -ex \ && for key in \ "${YARN_KEYS[@]}" ; 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" ; \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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/update-keys.sh b/update-keys.sh index 31b8b63f54..f8e70d8b1a 100755 --- a/update-keys.sh +++ b/update-keys.sh @@ -1,3 +1,3 @@ #!/bin/sh -ex -curl -fsSLo- --compressed https://github.com/nodejs/node/raw/master/README.md | awk '/^gpg --keyserver pool.sks-keyservers.net --recv-keys/ {print $NF}' > keys/node.keys +curl -fsSLo- --compressed https://github.com/nodejs/node/raw/master/README.md | awk '/^gpg --keyserver hkps://keys.openpgp.org --recv-keys/ {print $NF}' > keys/node.keys From fe99ef04dc64df51749ff9120794b3b949d56ee5 Mon Sep 17 00:00:00 2001 From: Benjamin DANIEL Date: Thu, 24 Jun 2021 11:10:58 +0200 Subject: [PATCH 476/818] Update node.js v16 from 16.3.0 to 16.4.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index da7e159be0..cfe1284adb 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.3.0 +ENV NODE_VERSION 16.4.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="d73505cf34e881703324265ef9d7a753b1db2d62ab326be01d1ea73c858d4ca7" \ + CHECKSUM="3e96787fbd6fe103bf506289558f053e6f28dbbce362498d41c0c9d7b7859017" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 1c4dfd4f00..7162fce861 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.3.0 +ENV NODE_VERSION 16.4.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="d73505cf34e881703324265ef9d7a753b1db2d62ab326be01d1ea73c858d4ca7" \ + CHECKSUM="3e96787fbd6fe103bf506289558f053e6f28dbbce362498d41c0c9d7b7859017" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 78c8a2464c..99d5125882 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.3.0 +ENV NODE_VERSION 16.4.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="d73505cf34e881703324265ef9d7a753b1db2d62ab326be01d1ea73c858d4ca7" \ + CHECKSUM="3e96787fbd6fe103bf506289558f053e6f28dbbce362498d41c0c9d7b7859017" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 0649472f6a..47021e28d7 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.3.0 +ENV NODE_VERSION 16.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index c77c3962a6..5d3d50a949 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.3.0 +ENV NODE_VERSION 16.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 896c13fbb4..7e098639e4 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.3.0 +ENV NODE_VERSION 16.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index ecfe4ae178..aa23f53b2d 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.3.0 +ENV NODE_VERSION 16.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 71f47ea79d8d947dda14f8f18f4c93be66054229 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 6 Jul 2021 13:11:16 -0400 Subject: [PATCH 477/818] feat: July 2021 Security 12, 14, 16 releases --- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 749777f3f5..ad7650ad7e 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.22.1 +ENV NODE_VERSION 12.22.2 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="b7c8a2cb26790b4cc21a69ea5896ecb3e88712a35dcd5f3ef1c799214ad1f5da" \ + CHECKSUM="242bc6f948186d64be162ea7fd5c64fe15d5863100db0d0478ae8853533859c2" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index b4e692af7f..d91f0dfd83 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.1 +ENV NODE_VERSION 12.22.2 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="b7c8a2cb26790b4cc21a69ea5896ecb3e88712a35dcd5f3ef1c799214ad1f5da" \ + CHECKSUM="242bc6f948186d64be162ea7fd5c64fe15d5863100db0d0478ae8853533859c2" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 0bad418300..2f43b94167 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.1 +ENV NODE_VERSION 12.22.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 8fdaeb231e..ea792fdb5c 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.1 +ENV NODE_VERSION 12.22.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index fbb8d11be3..6473be2a28 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.1 +ENV NODE_VERSION 12.22.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 1458f695c3..4482b58123 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.1 +ENV NODE_VERSION 12.22.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 9614caebf0..3472d92820 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.17.1 +ENV NODE_VERSION 14.17.2 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="c23931be1470e454ae062d53ffbabd12b8578a3fd23b6575433a220af0b431a9" \ + CHECKSUM="3b3eace287399aa298983d40ecb0ae3736da0baa65246f436b9edab8a9fa28a0" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 1369bb6664..880610e61e 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.17.1 +ENV NODE_VERSION 14.17.2 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="c23931be1470e454ae062d53ffbabd12b8578a3fd23b6575433a220af0b431a9" \ + CHECKSUM="3b3eace287399aa298983d40ecb0ae3736da0baa65246f436b9edab8a9fa28a0" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 438f297823..571d9864f7 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.17.1 +ENV NODE_VERSION 14.17.2 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="c23931be1470e454ae062d53ffbabd12b8578a3fd23b6575433a220af0b431a9" \ + CHECKSUM="3b3eace287399aa298983d40ecb0ae3736da0baa65246f436b9edab8a9fa28a0" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index b66fb1aec5..91c15ce99c 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.17.1 +ENV NODE_VERSION 14.17.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index da19709777..a74b646db5 100644 --- a/14/buster/Dockerfile +++ b/14/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.17.1 +ENV NODE_VERSION 14.17.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index df30e8602d..8bf4b9f99f 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.17.1 +ENV NODE_VERSION 14.17.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index d95f2f45b4..4fdc442fed 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.17.1 +ENV NODE_VERSION 14.17.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index cfe1284adb..6609b657a9 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.4.0 +ENV NODE_VERSION 16.4.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="3e96787fbd6fe103bf506289558f053e6f28dbbce362498d41c0c9d7b7859017" \ + CHECKSUM="f947aac71a1a49506e5097ab007a8fae3d2b14fb2372c674f417fb6170e0f5d0" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 7162fce861..4220c1e463 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.4.0 +ENV NODE_VERSION 16.4.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="3e96787fbd6fe103bf506289558f053e6f28dbbce362498d41c0c9d7b7859017" \ + CHECKSUM="f947aac71a1a49506e5097ab007a8fae3d2b14fb2372c674f417fb6170e0f5d0" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 99d5125882..aca5b50b0d 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.4.0 +ENV NODE_VERSION 16.4.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="3e96787fbd6fe103bf506289558f053e6f28dbbce362498d41c0c9d7b7859017" \ + CHECKSUM="f947aac71a1a49506e5097ab007a8fae3d2b14fb2372c674f417fb6170e0f5d0" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 47021e28d7..4424b56e2a 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.4.0 +ENV NODE_VERSION 16.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 5d3d50a949..0c5898b6f2 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.4.0 +ENV NODE_VERSION 16.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 7e098639e4..abc595d2db 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.4.0 +ENV NODE_VERSION 16.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index aa23f53b2d..0fb8bf8959 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.4.0 +ENV NODE_VERSION 16.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From fd130acf063b312355a5d88d51716db3ff34ae49 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 7 Jul 2021 00:23:57 -0400 Subject: [PATCH 478/818] chore: July Security Windows Installer fix --- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index ad7650ad7e..440e1be25a 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.22.2 +ENV NODE_VERSION 12.22.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="242bc6f948186d64be162ea7fd5c64fe15d5863100db0d0478ae8853533859c2" \ + CHECKSUM="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index d91f0dfd83..9afacbeca3 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.2 +ENV NODE_VERSION 12.22.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="242bc6f948186d64be162ea7fd5c64fe15d5863100db0d0478ae8853533859c2" \ + CHECKSUM="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 2f43b94167..d663320863 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.2 +ENV NODE_VERSION 12.22.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index ea792fdb5c..da73d8fcbe 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.2 +ENV NODE_VERSION 12.22.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 6473be2a28..1a9919eed1 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.2 +ENV NODE_VERSION 12.22.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 4482b58123..042f955459 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.2 +ENV NODE_VERSION 12.22.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 3472d92820..6dfd045828 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.17.2 +ENV NODE_VERSION 14.17.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="3b3eace287399aa298983d40ecb0ae3736da0baa65246f436b9edab8a9fa28a0" \ + CHECKSUM="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 880610e61e..334416d0db 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.17.2 +ENV NODE_VERSION 14.17.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="3b3eace287399aa298983d40ecb0ae3736da0baa65246f436b9edab8a9fa28a0" \ + CHECKSUM="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 571d9864f7..bf7ad57bce 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.17.2 +ENV NODE_VERSION 14.17.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="3b3eace287399aa298983d40ecb0ae3736da0baa65246f436b9edab8a9fa28a0" \ + CHECKSUM="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 91c15ce99c..cbc78b8e73 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.17.2 +ENV NODE_VERSION 14.17.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index a74b646db5..6cea94da12 100644 --- a/14/buster/Dockerfile +++ b/14/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.17.2 +ENV NODE_VERSION 14.17.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 8bf4b9f99f..28f260501e 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.17.2 +ENV NODE_VERSION 14.17.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 4fdc442fed..e4f53a1ffd 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.17.2 +ENV NODE_VERSION 14.17.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 6609b657a9..2b85d151f6 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.4.1 +ENV NODE_VERSION 16.4.2 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="f947aac71a1a49506e5097ab007a8fae3d2b14fb2372c674f417fb6170e0f5d0" \ + CHECKSUM="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 4220c1e463..29da2400a8 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.4.1 +ENV NODE_VERSION 16.4.2 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="f947aac71a1a49506e5097ab007a8fae3d2b14fb2372c674f417fb6170e0f5d0" \ + CHECKSUM="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index aca5b50b0d..b566e85d42 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.4.1 +ENV NODE_VERSION 16.4.2 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="f947aac71a1a49506e5097ab007a8fae3d2b14fb2372c674f417fb6170e0f5d0" \ + CHECKSUM="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 4424b56e2a..c273dede65 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.4.1 +ENV NODE_VERSION 16.4.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 0c5898b6f2..bcf080d636 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.4.1 +ENV NODE_VERSION 16.4.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index abc595d2db..dc1a74b755 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.4.1 +ENV NODE_VERSION 16.4.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 0fb8bf8959..e27eac9492 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.4.1 +ENV NODE_VERSION 16.4.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 26a3ec0d3afc3f9ca70d874be3f644fbdd719e2d Mon Sep 17 00:00:00 2001 From: Petr Mikusek Date: Thu, 8 Jul 2021 12:51:36 +0200 Subject: [PATCH 479/818] Added Alpine 3.14 --- 14/alpine3.14/Dockerfile | 98 ++++++++++++++++++++++++++++++ 14/alpine3.14/docker-entrypoint.sh | 8 +++ 16/alpine3.14/Dockerfile | 98 ++++++++++++++++++++++++++++++ 16/alpine3.14/docker-entrypoint.sh | 8 +++ architectures | 14 ++--- versions.json | 16 +++++ 6 files changed, 235 insertions(+), 7 deletions(-) create mode 100644 14/alpine3.14/Dockerfile create mode 100755 14/alpine3.14/docker-entrypoint.sh create mode 100644 16/alpine3.14/Dockerfile create mode 100755 16/alpine3.14/docker-entrypoint.sh diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile new file mode 100644 index 0000000000..f766198a54 --- /dev/null +++ b/14/alpine3.14/Dockerfile @@ -0,0 +1,98 @@ +FROM alpine:3.14 + +ENV NODE_VERSION 14.17.3 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/alpine3.14/docker-entrypoint.sh b/14/alpine3.14/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/alpine3.14/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile new file mode 100644 index 0000000000..b7d5e1d19f --- /dev/null +++ b/16/alpine3.14/Dockerfile @@ -0,0 +1,98 @@ +FROM alpine:3.14 + +ENV NODE_VERSION 16.4.2 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/alpine3.14/docker-entrypoint.sh b/16/alpine3.14/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/alpine3.14/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/architectures b/architectures index 07096dc5b8..54e18fed3b 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.11,alpine3.12,alpine3.13 -arm32v7 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.11,alpine3.12,alpine3.13,buster,buster-slim,stretch,stretch-slim -i386 alpine3.11,alpine3.12,alpine3.13 -ppc64le alpine3.11,alpine3.12,alpine3.13,buster,buster-slim -s390x alpine3.11,alpine3.12,alpine3.13,buster,buster-slim +amd64 alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.11,alpine3.12,alpine3.13,alpine3.14 +arm32v7 alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim,stretch,stretch-slim +i386 alpine3.11,alpine3.12,alpine3.13,alpine3.14 +ppc64le alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim +s390x alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim diff --git a/versions.json b/versions.json index c6b6031149..f281a8e348 100644 --- a/versions.json +++ b/versions.json @@ -32,6 +32,14 @@ "ppc64le", "s390x" ], + "alpine3.14": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "buster": [ "amd64", "arm32v7", @@ -91,6 +99,14 @@ "ppc64le", "s390x" ], + "alpine3.14": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "buster": [ "amd64", "arm32v7", From ce3bb541693325ee21e38184873ceb4364b3e6f4 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 14 Jul 2021 14:37:28 +0200 Subject: [PATCH 480/818] chore: update to v16.5.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 2b85d151f6..35b30447e8 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.4.2 +ENV NODE_VERSION 16.5.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="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ + CHECKSUM="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 29da2400a8..6d2ed01168 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.4.2 +ENV NODE_VERSION 16.5.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="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ + CHECKSUM="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index b566e85d42..788fa18aa0 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.4.2 +ENV NODE_VERSION 16.5.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="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ + CHECKSUM="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index b7d5e1d19f..2fbfd77d85 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.4.2 +ENV NODE_VERSION 16.5.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="b680a1b1a9455eddb3f788a8c17c6c0ed12a4e1ccfc7fabf87a3237f30804f66" \ + CHECKSUM="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index c273dede65..93440605ba 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.4.2 +ENV NODE_VERSION 16.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index bcf080d636..87122c691a 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.4.2 +ENV NODE_VERSION 16.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index dc1a74b755..60b4dab546 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.4.2 +ENV NODE_VERSION 16.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index e27eac9492..01f33d7057 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.4.2 +ENV NODE_VERSION 16.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9b07b1ef8ad103bfca0b2341d2d061f7f5fcd6af Mon Sep 17 00:00:00 2001 From: Mike Kazmier Date: Fri, 12 Feb 2021 17:12:58 -0500 Subject: [PATCH 481/818] Add node.js v12 on Alpine v3.13/v3.14 --- 12/alpine3.13/Dockerfile | 98 ++++++++++++++++++++++++++++++ 12/alpine3.13/docker-entrypoint.sh | 8 +++ 12/alpine3.14/Dockerfile | 98 ++++++++++++++++++++++++++++++ 12/alpine3.14/docker-entrypoint.sh | 8 +++ versions.json | 16 +++++ 5 files changed, 228 insertions(+) create mode 100644 12/alpine3.13/Dockerfile create mode 100755 12/alpine3.13/docker-entrypoint.sh create mode 100644 12/alpine3.14/Dockerfile create mode 100755 12/alpine3.14/docker-entrypoint.sh diff --git a/12/alpine3.13/Dockerfile b/12/alpine3.13/Dockerfile new file mode 100644 index 0000000000..2ceee71ce5 --- /dev/null +++ b/12/alpine3.13/Dockerfile @@ -0,0 +1,98 @@ +FROM alpine:3.13 + +ENV NODE_VERSION 12.22.3 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python2 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/alpine3.13/docker-entrypoint.sh b/12/alpine3.13/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/alpine3.13/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile new file mode 100644 index 0000000000..e15c416a99 --- /dev/null +++ b/12/alpine3.14/Dockerfile @@ -0,0 +1,98 @@ +FROM alpine:3.14 + +ENV NODE_VERSION 12.22.3 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python2 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/alpine3.14/docker-entrypoint.sh b/12/alpine3.14/docker-entrypoint.sh new file mode 100755 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/alpine3.14/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index f281a8e348..0dffce81aa 100644 --- a/versions.json +++ b/versions.json @@ -158,6 +158,22 @@ "ppc64le", "s390x" ], + "alpine3.13": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.14": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "buster": [ "amd64", "arm32v7", From ad0e7cec04d936c72d7113a01b966b2218ff511d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jul 2021 07:02:52 +0000 Subject: [PATCH 482/818] chore(deps): bump actions/setup-node from 2.2.0 to 2.3.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.2.0...v2.3.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 97c0d980fe..a6e1e0a103 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.2.0 + - uses: actions/setup-node@v2.3.0 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index a20f0923b3..837fb87dc8 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.2.0 + - uses: actions/setup-node@v2.3.0 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index a6b568d09c..9b6f93fecd 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.2.0 + - uses: actions/setup-node@v2.3.0 with: node-version: '12.x' - name: Install markdown-link-check From d1fe16fecfbedc89ad3325021898117bb3031a83 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 30 Jul 2021 00:41:34 -0400 Subject: [PATCH 483/818] feat: Second July Node security release --- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/alpine3.13/Dockerfile | 4 ++-- 12/alpine3.14/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/alpine3.14/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 24 files changed, 36 insertions(+), 36 deletions(-) diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 440e1be25a..643ef53593 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.22.3 +ENV NODE_VERSION 12.22.4 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="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ + CHECKSUM="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 9afacbeca3..0287a1bbb1 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.3 +ENV NODE_VERSION 12.22.4 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="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ + CHECKSUM="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.13/Dockerfile b/12/alpine3.13/Dockerfile index 2ceee71ce5..25820ec0cc 100644 --- a/12/alpine3.13/Dockerfile +++ b/12/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 12.22.3 +ENV NODE_VERSION 12.22.4 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="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ + CHECKSUM="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index e15c416a99..bdb95b4c98 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.3 +ENV NODE_VERSION 12.22.4 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="8ed8e250b923427519fb15e2c451663c901d858388b644e1da58f55f878b361c" \ + CHECKSUM="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index d663320863..7a5539dcba 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.3 +ENV NODE_VERSION 12.22.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index da73d8fcbe..1b57b28bc5 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.3 +ENV NODE_VERSION 12.22.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 1a9919eed1..6c450f5cee 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.3 +ENV NODE_VERSION 12.22.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 042f955459..b87eb98e55 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.3 +ENV NODE_VERSION 12.22.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 6dfd045828..227ffd7ef3 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.17.3 +ENV NODE_VERSION 14.17.4 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="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ + CHECKSUM="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 334416d0db..89263a1604 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.17.3 +ENV NODE_VERSION 14.17.4 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="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ + CHECKSUM="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index bf7ad57bce..8b13dad7ba 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.17.3 +ENV NODE_VERSION 14.17.4 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="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ + CHECKSUM="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index f766198a54..108dff5e67 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.17.3 +ENV NODE_VERSION 14.17.4 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="58d33d68cf72b41044ea40cfb8ac39c64e3e537b8475426f33b5b54d5712c2b8" \ + CHECKSUM="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index cbc78b8e73..916138157c 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.17.3 +ENV NODE_VERSION 14.17.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 6cea94da12..181871ad73 100644 --- a/14/buster/Dockerfile +++ b/14/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.17.3 +ENV NODE_VERSION 14.17.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 28f260501e..dbc37efbb1 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.17.3 +ENV NODE_VERSION 14.17.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index e4f53a1ffd..20abb4c574 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.17.3 +ENV NODE_VERSION 14.17.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 35b30447e8..19618f0a4f 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.5.0 +ENV NODE_VERSION 16.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="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ + CHECKSUM="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 6d2ed01168..909e244eee 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.5.0 +ENV NODE_VERSION 16.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="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ + CHECKSUM="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 788fa18aa0..702a0c7fb3 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.5.0 +ENV NODE_VERSION 16.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="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ + CHECKSUM="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 2fbfd77d85..0216f60fb7 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.5.0 +ENV NODE_VERSION 16.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="64c1063a622e9620209b6081310036c7b48a4ee9a342dfbb9d015f1781f1444e" \ + CHECKSUM="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 93440605ba..6aac4b0d64 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.5.0 +ENV NODE_VERSION 16.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 87122c691a..809f7fce0a 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.5.0 +ENV NODE_VERSION 16.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 60b4dab546..4fa912cc53 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.5.0 +ENV NODE_VERSION 16.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 01f33d7057..a5ba4b205a 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.5.0 +ENV NODE_VERSION 16.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f52a9c90a41f916c213bfb6bad904928e9fdd3b3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 3 Aug 2021 08:25:14 -0400 Subject: [PATCH 484/818] feat: Node 16.6.1 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 19618f0a4f..4313b7a108 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.6.0 +ENV NODE_VERSION 16.6.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="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ + CHECKSUM="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 909e244eee..da1e212ec8 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.6.0 +ENV NODE_VERSION 16.6.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="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ + CHECKSUM="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 702a0c7fb3..db51e97052 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.6.0 +ENV NODE_VERSION 16.6.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="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ + CHECKSUM="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 0216f60fb7..1da2863a43 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.6.0 +ENV NODE_VERSION 16.6.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="e62e3d11d22e91d9ceb6302b2a9112f94d94f95020f73b5ecb7ad6889a813c32" \ + CHECKSUM="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 6aac4b0d64..73f9394102 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.6.0 +ENV NODE_VERSION 16.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 809f7fce0a..8d14c702e3 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.6.0 +ENV NODE_VERSION 16.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 4fa912cc53..7d0456f313 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.6.0 +ENV NODE_VERSION 16.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index a5ba4b205a..4760a54a59 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.6.0 +ENV NODE_VERSION 16.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 75fd827fecd89d842956a78da59400c32a14e1ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 17:08:07 +0000 Subject: [PATCH 485/818] chore(deps): bump actions/setup-node from 2.3.0 to 2.3.2 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.3.0 to 2.3.2. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.3.0...v2.3.2) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index a6e1e0a103..b5efe63dfc 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.3.0 + - uses: actions/setup-node@v2.3.2 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 837fb87dc8..12f52c5e4b 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.3.0 + - uses: actions/setup-node@v2.3.2 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 9b6f93fecd..fa552fbdcd 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.3.0 + - uses: actions/setup-node@v2.3.2 with: node-version: '12.x' - name: Install markdown-link-check From 960b9a32502c923d96fca0f131968cb2ee2f488f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Aug 2021 07:03:07 +0000 Subject: [PATCH 486/818] chore(deps): bump actions/setup-node from 2.3.2 to 2.4.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.3.2...v2.4.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index b5efe63dfc..8a9ba8ca78 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.3.2 + - uses: actions/setup-node@v2.4.0 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 12f52c5e4b..ab9cb4edda 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.3.2 + - uses: actions/setup-node@v2.4.0 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index fa552fbdcd..dedf86dca1 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.3.2 + - uses: actions/setup-node@v2.4.0 with: node-version: '12.x' - name: Install markdown-link-check From 907bba0153b7792ea976f498cd7d1858d000f93a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 11 Aug 2021 14:04:46 -0400 Subject: [PATCH 487/818] chore: Add gitattributes for Git Bash LF checkout --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..6313b56c57 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf From a16a841095bcefefaf0ec43ba39f91fc788b03d4 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 11 Aug 2021 17:20:08 -0400 Subject: [PATCH 488/818] feat: Node.js August 2021 security release --- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/alpine3.13/Dockerfile | 4 ++-- 12/alpine3.14/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/alpine3.14/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 16/stretch-slim/Dockerfile | 2 +- 16/stretch/Dockerfile | 2 +- 24 files changed, 36 insertions(+), 36 deletions(-) diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 643ef53593..de899509ec 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.22.4 +ENV NODE_VERSION 12.22.5 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="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ + CHECKSUM="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 0287a1bbb1..1757fb8be6 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.4 +ENV NODE_VERSION 12.22.5 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="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ + CHECKSUM="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.13/Dockerfile b/12/alpine3.13/Dockerfile index 25820ec0cc..3d1a470578 100644 --- a/12/alpine3.13/Dockerfile +++ b/12/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 12.22.4 +ENV NODE_VERSION 12.22.5 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="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ + CHECKSUM="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index bdb95b4c98..6de3db7ecd 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.4 +ENV NODE_VERSION 12.22.5 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="2fa5020bab6501cd3e6fb90dae0cd19a64df80bb8e8bf184af4f562df5a08b4f" \ + CHECKSUM="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ ;; \ *) ;; \ esac \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 7a5539dcba..4fe5a0e6b3 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.4 +ENV NODE_VERSION 12.22.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 1b57b28bc5..02084c27ce 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.4 +ENV NODE_VERSION 12.22.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 6c450f5cee..6eeb9771c7 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.4 +ENV NODE_VERSION 12.22.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index b87eb98e55..60f4b21a4a 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.4 +ENV NODE_VERSION 12.22.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 227ffd7ef3..53b7b62a9a 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.17.4 +ENV NODE_VERSION 14.17.5 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="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ + CHECKSUM="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 89263a1604..f855c72399 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.17.4 +ENV NODE_VERSION 14.17.5 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="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ + CHECKSUM="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 8b13dad7ba..68256516df 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.17.4 +ENV NODE_VERSION 14.17.5 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="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ + CHECKSUM="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index 108dff5e67..484c53f82f 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.17.4 +ENV NODE_VERSION 14.17.5 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="78f4b05466f4bc9e33e62e912724fc835f476cd2ae89fb909fd9eac64484e40a" \ + CHECKSUM="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ ;; \ *) ;; \ esac \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 916138157c..e7303b28b8 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.17.4 +ENV NODE_VERSION 14.17.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 181871ad73..dacc62ebfb 100644 --- a/14/buster/Dockerfile +++ b/14/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.17.4 +ENV NODE_VERSION 14.17.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index dbc37efbb1..ddbc348b9a 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.17.4 +ENV NODE_VERSION 14.17.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 20abb4c574..6ac6e6cc6a 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.17.4 +ENV NODE_VERSION 14.17.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 4313b7a108..8a8838bb27 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.6.1 +ENV NODE_VERSION 16.6.2 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="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ + CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index da1e212ec8..b1355ebd6a 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.6.1 +ENV NODE_VERSION 16.6.2 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="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ + CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index db51e97052..dd40e14ca2 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.6.1 +ENV NODE_VERSION 16.6.2 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="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ + CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 1da2863a43..a698cf5c5f 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.6.1 +ENV NODE_VERSION 16.6.2 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="9c8438a8d9a1e268153812d1d3f7f63b02283e2082dcd39274674f897496a22a" \ + CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ ;; \ *) ;; \ esac \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 73f9394102..ebef000280 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.6.1 +ENV NODE_VERSION 16.6.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 8d14c702e3..99fff750f5 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.6.1 +ENV NODE_VERSION 16.6.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 7d0456f313..71c04c4a67 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.6.1 +ENV NODE_VERSION 16.6.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 4760a54a59..731a91d095 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.6.1 +ENV NODE_VERSION 16.6.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From be6dead1eea26a9668413c3d0e2ec2bc90dc1eca Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 16 Aug 2021 16:07:46 -0400 Subject: [PATCH 489/818] feat: Updated 16.6.2 Alpine checksum Unoffical builds has recently made changes to the tooling, that appears to have changed the checksum --- 16/alpine3.11/Dockerfile | 2 +- 16/alpine3.12/Dockerfile | 2 +- 16/alpine3.13/Dockerfile | 2 +- 16/alpine3.14/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 8a8838bb27..5feb28fa08 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ + CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index b1355ebd6a..d03c1608ba 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ + CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index dd40e14ca2..06c7caad71 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ + CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index a698cf5c5f..7c57b2d7de 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="76e5c03480f4473049ab8ac9f986b8d4b8fd98ad69a8fe543a9af34cff320faa" \ + CHECKSUM="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ ;; \ *) ;; \ esac \ From 17466c81a5098624e46f9533436534729e3e4977 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 16 Aug 2021 16:38:13 -0400 Subject: [PATCH 490/818] feat: Add Debian Bullseye images Closes #1415 --- 12/bullseye-slim/Dockerfile | 94 +++++++++++++++++++++++++++ 12/bullseye-slim/docker-entrypoint.sh | 8 +++ 12/bullseye/Dockerfile | 70 ++++++++++++++++++++ 12/bullseye/docker-entrypoint.sh | 8 +++ 14/bullseye-slim/Dockerfile | 94 +++++++++++++++++++++++++++ 14/bullseye-slim/docker-entrypoint.sh | 8 +++ 14/bullseye/Dockerfile | 70 ++++++++++++++++++++ 14/bullseye/docker-entrypoint.sh | 8 +++ 16/bullseye-slim/Dockerfile | 94 +++++++++++++++++++++++++++ 16/bullseye-slim/docker-entrypoint.sh | 8 +++ 16/bullseye/Dockerfile | 70 ++++++++++++++++++++ 16/bullseye/docker-entrypoint.sh | 8 +++ SECURITY.md | 2 +- architectures | 10 +-- config | 2 +- versions.json | 42 ++++++++++++ 16 files changed, 589 insertions(+), 7 deletions(-) create mode 100644 12/bullseye-slim/Dockerfile create mode 100644 12/bullseye-slim/docker-entrypoint.sh create mode 100644 12/bullseye/Dockerfile create mode 100644 12/bullseye/docker-entrypoint.sh create mode 100644 14/bullseye-slim/Dockerfile create mode 100644 14/bullseye-slim/docker-entrypoint.sh create mode 100644 14/bullseye/Dockerfile create mode 100644 14/bullseye/docker-entrypoint.sh create mode 100644 16/bullseye-slim/Dockerfile create mode 100644 16/bullseye-slim/docker-entrypoint.sh create mode 100644 16/bullseye/Dockerfile create mode 100644 16/bullseye/docker-entrypoint.sh diff --git a/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..381e7b354e --- /dev/null +++ b/12/bullseye-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 12.22.5 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/bullseye-slim/docker-entrypoint.sh b/12/bullseye-slim/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile new file mode 100644 index 0000000000..3d3725e937 --- /dev/null +++ b/12/bullseye/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 12.22.5 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/12/bullseye/docker-entrypoint.sh b/12/bullseye/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/12/bullseye/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..1bead7ae56 --- /dev/null +++ b/14/bullseye-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 14.17.5 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/bullseye-slim/docker-entrypoint.sh b/14/bullseye-slim/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile new file mode 100644 index 0000000000..eed834bdc0 --- /dev/null +++ b/14/bullseye/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 14.17.5 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/14/bullseye/docker-entrypoint.sh b/14/bullseye/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/14/bullseye/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..5ec0d104ed --- /dev/null +++ b/16/bullseye-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.6.2 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/bullseye-slim/docker-entrypoint.sh b/16/bullseye-slim/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile new file mode 100644 index 0000000000..2b39d6c858 --- /dev/null +++ b/16/bullseye/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.6.2 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.5 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/bullseye/docker-entrypoint.sh b/16/bullseye/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/16/bullseye/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/SECURITY.md b/SECURITY.md index b6bd73dc9a..4200f99566 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,6 +7,6 @@ Security issues relating to Node.js project should follow the process documented CVEs for the base image packages should be reported to those repositories. Nothing to address those CVEs is in the hands of this repos. - [Alpine](https://github.com/alpinelinux/docker-alpine) -- [Debian (buster, stretch)](https://github.com/debuerreotype/docker-debian-artifacts) +- [Debian (buster, bullseye, stretch)](https://github.com/debuerreotype/docker-debian-artifacts) When base images are patched, the images are rebuilt and rolled out to the Docker hub without intervention by this repo. This process is explained in . diff --git a/architectures b/architectures index 54e18fed3b..6c9b43d109 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim,stretch,stretch-slim +amd64 alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim arm32v6 alpine3.11,alpine3.12,alpine3.13,alpine3.14 -arm32v7 alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim,stretch,stretch-slim +arm32v7 alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim i386 alpine3.11,alpine3.12,alpine3.13,alpine3.14 -ppc64le alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim -s390x alpine3.11,alpine3.12,alpine3.13,alpine3.14,buster,buster-slim +ppc64le alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index 101bfe76b1..a9c0c25416 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch alpine_version 3.11 -debian_versions stretch buster +debian_versions stretch bullseye buster diff --git a/versions.json b/versions.json index 0dffce81aa..b808cc4a6c 100644 --- a/versions.json +++ b/versions.json @@ -40,6 +40,20 @@ "ppc64le", "s390x" ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "buster": [ "amd64", "arm32v7", @@ -107,6 +121,20 @@ "ppc64le", "s390x" ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "buster": [ "amd64", "arm32v7", @@ -174,6 +202,20 @@ "ppc64le", "s390x" ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "buster": [ "amd64", "arm32v7", From ceafcc63d4dd5e03d8ab111639edf1ec7fcd45b6 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 16 Aug 2021 21:28:17 -0400 Subject: [PATCH 491/818] fix: chmod bullseye entrypoint script --- 12/bullseye-slim/docker-entrypoint.sh | 0 12/bullseye/docker-entrypoint.sh | 0 14/bullseye-slim/docker-entrypoint.sh | 0 14/bullseye/docker-entrypoint.sh | 0 16/bullseye-slim/docker-entrypoint.sh | 0 16/bullseye/docker-entrypoint.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 12/bullseye-slim/docker-entrypoint.sh mode change 100644 => 100755 12/bullseye/docker-entrypoint.sh mode change 100644 => 100755 14/bullseye-slim/docker-entrypoint.sh mode change 100644 => 100755 14/bullseye/docker-entrypoint.sh mode change 100644 => 100755 16/bullseye-slim/docker-entrypoint.sh mode change 100644 => 100755 16/bullseye/docker-entrypoint.sh diff --git a/12/bullseye-slim/docker-entrypoint.sh b/12/bullseye-slim/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/12/bullseye/docker-entrypoint.sh b/12/bullseye/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/14/bullseye-slim/docker-entrypoint.sh b/14/bullseye-slim/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/14/bullseye/docker-entrypoint.sh b/14/bullseye/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/16/bullseye-slim/docker-entrypoint.sh b/16/bullseye-slim/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/16/bullseye/docker-entrypoint.sh b/16/bullseye/docker-entrypoint.sh old mode 100644 new mode 100755 From 5f1570b634d461b3d780b8d69aad207e875c6810 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 17 Aug 2021 13:12:00 -0400 Subject: [PATCH 492/818] fix: Use folder commmit for Stackbrew --- stackbrew.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stackbrew.js b/stackbrew.js index 8b6f55404d..b183980403 100755 --- a/stackbrew.js +++ b/stackbrew.js @@ -140,11 +140,11 @@ for(version of versions) { // remove duplicates tags = tags.filter((x, i, a) => a.indexOf(x) == i) tags = tags.sort() - + let directory = `${version}/${variant}` stackbrew += `\nTags: ${tags.join(', ')}\n` stackbrew += `Architectures: ${config[version].variants[variant].join(', ')}\n` - stackbrew += `GitCommit: ${getCommitHasForPath(dockerfilePath)}\n` - stackbrew += `Directory: ${version}/${variant}\n` + stackbrew += `GitCommit: ${getCommitHasForPath(directory)}\n` + stackbrew += `Directory: ${directory}\n` } } From 706364e992c4bc7c390db61f39ac7985f23986d0 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 18 Aug 2021 15:15:43 +0200 Subject: [PATCH 493/818] chore: update to 16.7.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 5feb28fa08..8dae3f3d52 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.6.2 +ENV NODE_VERSION 16.7.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="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ + CHECKSUM="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index d03c1608ba..d38c4be99f 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.6.2 +ENV NODE_VERSION 16.7.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="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ + CHECKSUM="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 06c7caad71..62d4a0c798 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.6.2 +ENV NODE_VERSION 16.7.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="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ + CHECKSUM="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 7c57b2d7de..0f05f10714 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.6.2 +ENV NODE_VERSION 16.7.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="f77b8782059a4f614e8cd0437e7b4761039f93410388fe1d1f9c072de69e98de" \ + CHECKSUM="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 5ec0d104ed..6d09a77e3d 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.6.2 +ENV NODE_VERSION 16.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 2b39d6c858..8ed6ddb2a6 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.6.2 +ENV NODE_VERSION 16.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index ebef000280..eb3fb8fa32 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.6.2 +ENV NODE_VERSION 16.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 99fff750f5..8a2f137424 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.6.2 +ENV NODE_VERSION 16.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 71c04c4a67..5e359cd78b 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.6.2 +ENV NODE_VERSION 16.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 731a91d095..429320b693 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.6.2 +ENV NODE_VERSION 16.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8479accc0385b02eab2734850d32268827caf69a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 07:03:08 +0000 Subject: [PATCH 494/818] chore(deps): bump actions/github-script from 4.0.2 to 4.1 Bumps [actions/github-script](https://github.com/actions/github-script) from 4.0.2 to 4.1. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4.0.2...v4.1) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index abd62793ed..308371d633 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v2 - name: Generate testing matrix - uses: actions/github-script@v4.0.2 + uses: actions/github-script@v4.1 id: generator with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: steps: - name: Get short node version - uses: actions/github-script@v4.0.2 + uses: actions/github-script@v4.1 id: short-version with: result-encoding: string From 3047652162a4f83f68260aabfdbb688e58e7b152 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 25 Aug 2021 20:07:38 -0400 Subject: [PATCH 495/818] feat: Node.js 16.8.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 8dae3f3d52..50616aa994 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.7.0 +ENV NODE_VERSION 16.8.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="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ + CHECKSUM="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index d38c4be99f..cb88b403fc 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.7.0 +ENV NODE_VERSION 16.8.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="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ + CHECKSUM="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 62d4a0c798..7c37102b5f 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.7.0 +ENV NODE_VERSION 16.8.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="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ + CHECKSUM="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 0f05f10714..617eee57f7 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.7.0 +ENV NODE_VERSION 16.8.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="616e4cdf07aa64d2c4a4653b753a4ec9b2ee4febca8b195ebf82e8f22de67641" \ + CHECKSUM="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 6d09a77e3d..b5beb2a206 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.7.0 +ENV NODE_VERSION 16.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 8ed6ddb2a6..319176837b 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.7.0 +ENV NODE_VERSION 16.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index eb3fb8fa32..fd2aebdf91 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.7.0 +ENV NODE_VERSION 16.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 8a2f137424..1f74d16176 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.7.0 +ENV NODE_VERSION 16.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 5e359cd78b..30ca548f12 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.7.0 +ENV NODE_VERSION 16.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 429320b693..a6dde8b15c 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.7.0 +ENV NODE_VERSION 16.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From dc340d0bf2119dee534106ef012e85861cda8b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Maciejewski?= Date: Tue, 31 Aug 2021 18:57:15 +0200 Subject: [PATCH 496/818] feat: Node.js August 2021 security release --- 12/alpine3.11/Dockerfile | 4 ++-- 12/alpine3.12/Dockerfile | 4 ++-- 12/alpine3.13/Dockerfile | 4 ++-- 12/alpine3.14/Dockerfile | 4 ++-- 12/bullseye-slim/Dockerfile | 2 +- 12/bullseye/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/alpine3.14/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index de899509ec..4a8ce46dc6 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.22.5 +ENV NODE_VERSION 12.22.6 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="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ + CHECKSUM="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 1757fb8be6..d105d80bbb 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.5 +ENV NODE_VERSION 12.22.6 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="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ + CHECKSUM="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.13/Dockerfile b/12/alpine3.13/Dockerfile index 3d1a470578..00d86b61a1 100644 --- a/12/alpine3.13/Dockerfile +++ b/12/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 12.22.5 +ENV NODE_VERSION 12.22.6 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="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ + CHECKSUM="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index 6de3db7ecd..35cc2739e7 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.5 +ENV NODE_VERSION 12.22.6 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="1c8ce0d58828faff84486dc116ec817595841c8578ed01266eb69e5383c73201" \ + CHECKSUM="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ ;; \ *) ;; \ esac \ diff --git a/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile index 381e7b354e..beb872dca1 100644 --- a/12/bullseye-slim/Dockerfile +++ b/12/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 12.22.5 +ENV NODE_VERSION 12.22.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index 3d3725e937..f582949832 100644 --- a/12/bullseye/Dockerfile +++ b/12/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 12.22.5 +ENV NODE_VERSION 12.22.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 4fe5a0e6b3..df146bebb3 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.5 +ENV NODE_VERSION 12.22.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 02084c27ce..180b2d8d3d 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.5 +ENV NODE_VERSION 12.22.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 6eeb9771c7..ed212688d3 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.5 +ENV NODE_VERSION 12.22.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 60f4b21a4a..78ee170017 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.5 +ENV NODE_VERSION 12.22.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 53b7b62a9a..69c55eaa2f 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.17.5 +ENV NODE_VERSION 14.17.6 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="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ + CHECKSUM="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index f855c72399..307a12ed5f 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.17.5 +ENV NODE_VERSION 14.17.6 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="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ + CHECKSUM="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 68256516df..2f4bad90b6 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.17.5 +ENV NODE_VERSION 14.17.6 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="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ + CHECKSUM="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index 484c53f82f..b90d15e2ae 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.17.5 +ENV NODE_VERSION 14.17.6 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="8889a3ea0d0d8247132cf257ccd4828ddcd7e373f67c875878035b131e9fa1ac" \ + CHECKSUM="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 1bead7ae56..e5b3c6b5db 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.17.5 +ENV NODE_VERSION 14.17.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index eed834bdc0..2d5d80e956 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.17.5 +ENV NODE_VERSION 14.17.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index e7303b28b8..3dc075f3fb 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.17.5 +ENV NODE_VERSION 14.17.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index dacc62ebfb..bbe873bb6b 100644 --- a/14/buster/Dockerfile +++ b/14/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.17.5 +ENV NODE_VERSION 14.17.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index ddbc348b9a..93e2d1a5f4 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.17.5 +ENV NODE_VERSION 14.17.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 6ac6e6cc6a..11fe365d83 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.17.5 +ENV NODE_VERSION 14.17.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From efbd2fac720142152514b35efe49bda3402dba8c Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 8 Sep 2021 21:43:13 -0400 Subject: [PATCH 497/818] feat: Node 16.9.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 50616aa994..74a43c7b29 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.8.0 +ENV NODE_VERSION 16.9.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="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ + CHECKSUM="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index cb88b403fc..51194edf9f 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.8.0 +ENV NODE_VERSION 16.9.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="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ + CHECKSUM="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 7c37102b5f..43bee2bdfe 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.8.0 +ENV NODE_VERSION 16.9.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="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ + CHECKSUM="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 617eee57f7..9ab61fb968 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.8.0 +ENV NODE_VERSION 16.9.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="0db4ef6dad22a9758017dcac856024b665394688a6c582c604008abdb0c3cff6" \ + CHECKSUM="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index b5beb2a206..5fbf056172 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.8.0 +ENV NODE_VERSION 16.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 319176837b..c4e7d673ac 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.8.0 +ENV NODE_VERSION 16.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index fd2aebdf91..f78a98fd38 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.8.0 +ENV NODE_VERSION 16.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 1f74d16176..e05df68502 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.8.0 +ENV NODE_VERSION 16.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 30ca548f12..e4242a28b2 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.8.0 +ENV NODE_VERSION 16.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index a6dde8b15c..f43eaffbe7 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.8.0 +ENV NODE_VERSION 16.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From e7d1cdd4b992b55d35d04371529552110f09e739 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 11 Sep 2021 14:10:23 +0200 Subject: [PATCH 498/818] chore: update to v16.9.1 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 74a43c7b29..cb958495c2 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.9.0 +ENV NODE_VERSION 16.9.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="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ + CHECKSUM="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 51194edf9f..59d2af7cca 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.9.0 +ENV NODE_VERSION 16.9.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="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ + CHECKSUM="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 43bee2bdfe..1160b3e3f1 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.9.0 +ENV NODE_VERSION 16.9.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="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ + CHECKSUM="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 9ab61fb968..a63dc7d4a5 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.9.0 +ENV NODE_VERSION 16.9.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="0548ec9a9fea360ee838b38cba8275a5243322ac9acf46f374df573f8b44ebcd" \ + CHECKSUM="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 5fbf056172..eba738c716 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.9.0 +ENV NODE_VERSION 16.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index c4e7d673ac..c38b3ae873 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.9.0 +ENV NODE_VERSION 16.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index f78a98fd38..bc90ccaff0 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.9.0 +ENV NODE_VERSION 16.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index e05df68502..ee6be88127 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.9.0 +ENV NODE_VERSION 16.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index e4242a28b2..33459bdf3d 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.9.0 +ENV NODE_VERSION 16.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index f43eaffbe7..bb19c4c7bf 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.9.0 +ENV NODE_VERSION 16.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From e886c2c1d3a109ccfe169419f3b30f9794bacf61 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 23 Sep 2021 09:37:03 +0800 Subject: [PATCH 499/818] Update node.js v16 from 16.9.1 to 16.10.0 - https://nodejs.org/en/blog/release/v16.10.0/ - https://github.com/nodejs/node/releases/tag/v16.10.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V16.md#16.10.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index cb958495c2..b6220143ec 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.9.1 +ENV NODE_VERSION 16.10.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="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ + CHECKSUM="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 59d2af7cca..61ff43b326 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.9.1 +ENV NODE_VERSION 16.10.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="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ + CHECKSUM="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 1160b3e3f1..cd897c4d62 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.9.1 +ENV NODE_VERSION 16.10.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="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ + CHECKSUM="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index a63dc7d4a5..cef88056b9 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.9.1 +ENV NODE_VERSION 16.10.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="528061413f47f9cd87feb43941a74768cabcbb7a35395b3680a4b89efa1f7573" \ + CHECKSUM="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index eba738c716..74cd23cd0b 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.9.1 +ENV NODE_VERSION 16.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index c38b3ae873..636598f5d1 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.9.1 +ENV NODE_VERSION 16.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index bc90ccaff0..e0244d87ce 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.9.1 +ENV NODE_VERSION 16.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index ee6be88127..7523199f4e 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.9.1 +ENV NODE_VERSION 16.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 33459bdf3d..616912b2e0 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.9.1 +ENV NODE_VERSION 16.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index bb19c4c7bf..3e839385f5 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.9.1 +ENV NODE_VERSION 16.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f5e8240462a0984dcb6e0bc4bd05d8aeb62fa9d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 07:03:30 +0000 Subject: [PATCH 500/818] chore(deps): bump actions/github-script from 4.1 to 5 Bumps [actions/github-script](https://github.com/actions/github-script) from 4.1 to 5. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4.1...v5) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 308371d633..b2ff538b4e 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v2 - name: Generate testing matrix - uses: actions/github-script@v4.1 + uses: actions/github-script@v5 id: generator with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: steps: - name: Get short node version - uses: actions/github-script@v4.1 + uses: actions/github-script@v5 id: short-version with: result-encoding: string From 5dde251000774f3bd2195e47f9681f95879f5a42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 07:04:27 +0000 Subject: [PATCH 501/818] chore(deps): bump actions/setup-node from 2.4.0 to 2.4.1 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.4.0...v2.4.1) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 8a9ba8ca78..90c3126290 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.4.0 + - uses: actions/setup-node@v2.4.1 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index ab9cb4edda..e116bef208 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.4.0 + - uses: actions/setup-node@v2.4.1 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index dedf86dca1..d628478390 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.4.0 + - uses: actions/setup-node@v2.4.1 with: node-version: '12.x' - name: Install markdown-link-check From a049b4da06e758197e248eb9d5a895f804f4d2a0 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 28 Sep 2021 20:20:32 +0800 Subject: [PATCH 502/818] Update node.js v14 from 14.17.6 to 14.18.0 - https://nodejs.org/en/blog/release/v14.18.0/ - https://github.com/nodejs/node/releases/tag/v14.18.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.18.0 --- 14/alpine3.11/Dockerfile | 4 ++-- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/alpine3.14/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 69c55eaa2f..74215c9775 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.17.6 +ENV NODE_VERSION 14.18.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="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ + CHECKSUM="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 307a12ed5f..85a0daef4f 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.17.6 +ENV NODE_VERSION 14.18.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="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ + CHECKSUM="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 2f4bad90b6..19c23edb8a 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.17.6 +ENV NODE_VERSION 14.18.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="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ + CHECKSUM="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index b90d15e2ae..bb7d4e7562 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.17.6 +ENV NODE_VERSION 14.18.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="d9292c9fa9b4439f0d681110802d03750d34cc95a8b37a06314e5a228de827e7" \ + CHECKSUM="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index e5b3c6b5db..39aa412c29 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.17.6 +ENV NODE_VERSION 14.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 2d5d80e956..7e0752a0a6 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.17.6 +ENV NODE_VERSION 14.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 3dc075f3fb..b994ccbe30 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.17.6 +ENV NODE_VERSION 14.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index bbe873bb6b..2f3e1cd4b9 100644 --- a/14/buster/Dockerfile +++ b/14/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.17.6 +ENV NODE_VERSION 14.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 93e2d1a5f4..24911f180b 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.17.6 +ENV NODE_VERSION 14.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 11fe365d83..d10ed58e0e 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.17.6 +ENV NODE_VERSION 14.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From feeac50791351fb17686ea4cb34cabbb3e80227d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 11 Oct 2021 00:26:11 -0400 Subject: [PATCH 503/818] feat: NodeJS 16.11.0 --- 16/alpine3.11/Dockerfile | 6 +++--- 16/alpine3.12/Dockerfile | 6 +++--- 16/alpine3.13/Dockerfile | 6 +++--- 16/alpine3.14/Dockerfile | 6 +++--- 16/bullseye-slim/Dockerfile | 4 ++-- 16/bullseye/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 4 ++-- 16/buster/Dockerfile | 4 ++-- 16/stretch-slim/Dockerfile | 4 ++-- 16/stretch/Dockerfile | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index b6220143ec..a881df2473 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.10.0 +ENV NODE_VERSION 16.11.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="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ + CHECKSUM="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 61ff43b326..3fe3e746a7 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.10.0 +ENV NODE_VERSION 16.11.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="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ + CHECKSUM="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index cd897c4d62..8c83427240 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.10.0 +ENV NODE_VERSION 16.11.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="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ + CHECKSUM="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index cef88056b9..3556422f22 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.10.0 +ENV NODE_VERSION 16.11.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="b4b00b3e9545f449620df3480bfd4c00b31c81d57b632a6138184d6afd70f09b" \ + CHECKSUM="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 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 74cd23cd0b..cfb2033b17 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.10.0 +ENV NODE_VERSION 16.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 636598f5d1..bcd24405a7 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.10.0 +ENV NODE_VERSION 16.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index e0244d87ce..9a9832b8bf 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.10.0 +ENV NODE_VERSION 16.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 7523199f4e..82e5a40a14 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.10.0 +ENV NODE_VERSION 16.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 616912b2e0..6f40cf5624 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.10.0 +ENV NODE_VERSION 16.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 3e839385f5..52c4cf6ce7 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.10.0 +ENV NODE_VERSION 16.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ From a70c43d47528213ef0cd58af7c35edf4c1d3e990 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 12 Oct 2021 18:22:30 -0400 Subject: [PATCH 504/818] feat: NodeJS October 12 2021 Security Release --- 12/alpine3.11/Dockerfile | 6 +++--- 12/alpine3.12/Dockerfile | 6 +++--- 12/alpine3.13/Dockerfile | 6 +++--- 12/alpine3.14/Dockerfile | 6 +++--- 12/bullseye-slim/Dockerfile | 4 ++-- 12/bullseye/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 14/alpine3.11/Dockerfile | 6 +++--- 14/alpine3.12/Dockerfile | 6 +++--- 14/alpine3.13/Dockerfile | 6 +++--- 14/alpine3.14/Dockerfile | 6 +++--- 14/bullseye-slim/Dockerfile | 4 ++-- 14/bullseye/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 4 ++-- 14/buster/Dockerfile | 4 ++-- 14/stretch-slim/Dockerfile | 4 ++-- 14/stretch/Dockerfile | 4 ++-- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 30 files changed, 62 insertions(+), 62 deletions(-) diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile index 4a8ce46dc6..1540bc1955 100644 --- a/12/alpine3.11/Dockerfile +++ b/12/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 12.22.6 +ENV NODE_VERSION 12.22.7 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="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ + CHECKSUM="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index d105d80bbb..2395a4ae32 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.6 +ENV NODE_VERSION 12.22.7 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="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ + CHECKSUM="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.13/Dockerfile b/12/alpine3.13/Dockerfile index 00d86b61a1..e0ef3dea11 100644 --- a/12/alpine3.13/Dockerfile +++ b/12/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 12.22.6 +ENV NODE_VERSION 12.22.7 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="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ + CHECKSUM="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index 35cc2739e7..494c9d18f4 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.6 +ENV NODE_VERSION 12.22.7 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="0ce2b97ecbbd84f1a5ed13278ed6845d93c6454d8550730b247a990438dba322" \ + CHECKSUM="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile index beb872dca1..38ed78cfbe 100644 --- a/12/bullseye-slim/Dockerfile +++ b/12/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 12.22.6 +ENV NODE_VERSION 12.22.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index f582949832..85ce31ea26 100644 --- a/12/bullseye/Dockerfile +++ b/12/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 12.22.6 +ENV NODE_VERSION 12.22.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index df146bebb3..c30bf2ca5d 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.6 +ENV NODE_VERSION 12.22.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 180b2d8d3d..1e8bd85468 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.6 +ENV NODE_VERSION 12.22.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index ed212688d3..7cd28ff000 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.6 +ENV NODE_VERSION 12.22.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 78ee170017..61abc31f0e 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.6 +ENV NODE_VERSION 12.22.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile index 74215c9775..c6cc94548f 100644 --- a/14/alpine3.11/Dockerfile +++ b/14/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 14.18.0 +ENV NODE_VERSION 14.18.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="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ + CHECKSUM="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 85a0daef4f..75a9d3eb2a 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.18.0 +ENV NODE_VERSION 14.18.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="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ + CHECKSUM="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 19c23edb8a..7df0eb474a 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.18.0 +ENV NODE_VERSION 14.18.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="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ + CHECKSUM="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index bb7d4e7562..b04dc530e8 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.18.0 +ENV NODE_VERSION 14.18.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="3f6bdb98f5734e10bd190635b8688347c5ac794091a1f11cb1c7694b43a969b7" \ + CHECKSUM="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 39aa412c29..4e1d3dda2a 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.18.0 +ENV NODE_VERSION 14.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 7e0752a0a6..6ebba620c5 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.18.0 +ENV NODE_VERSION 14.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index b994ccbe30..92c5e8ef61 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.18.0 +ENV NODE_VERSION 14.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 2f3e1cd4b9..2198966d5f 100644 --- a/14/buster/Dockerfile +++ b/14/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.18.0 +ENV NODE_VERSION 14.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 24911f180b..c09e24c12c 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.18.0 +ENV NODE_VERSION 14.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index d10ed58e0e..9c3978446e 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.18.0 +ENV NODE_VERSION 14.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.5 +ENV YARN_VERSION 1.22.15 RUN set -ex \ && for key in \ diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index a881df2473..acadf729be 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.11.0 +ENV NODE_VERSION 16.11.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="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ + CHECKSUM="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 3fe3e746a7..812f043054 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.11.0 +ENV NODE_VERSION 16.11.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="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ + CHECKSUM="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index 8c83427240..d9b0063b87 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.11.0 +ENV NODE_VERSION 16.11.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="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ + CHECKSUM="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 3556422f22..cfe9b390c4 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.11.0 +ENV NODE_VERSION 16.11.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="2ac71f8137cab764f0f61e58c685f0885ae3c952ff045f4926983f9bd7f56e22" \ + CHECKSUM="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index cfb2033b17..f57f73ae42 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.11.0 +ENV NODE_VERSION 16.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index bcd24405a7..e5b7706990 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.11.0 +ENV NODE_VERSION 16.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 9a9832b8bf..5009fdd745 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.11.0 +ENV NODE_VERSION 16.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 82e5a40a14..5dcf1a936e 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.11.0 +ENV NODE_VERSION 16.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 6f40cf5624..1775b914d0 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.11.0 +ENV NODE_VERSION 16.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 52c4cf6ce7..b1ac359677 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.11.0 +ENV NODE_VERSION 16.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8261a0234e8f57e7a49163c872ec0067b24b0e81 Mon Sep 17 00:00:00 2001 From: Mason Malone Date: Tue, 12 Oct 2021 19:22:44 -0700 Subject: [PATCH 505/818] fix: Better error handling in update.sh This makes a couple tweaks to the error handling in update.sh: 1. If one of the background jobs exits with a non-zero exit status, the script will no longer exit with status 0. Closes #1269 2. For Alpine, immediately exit if checksum is zero length to avoid corrupting a Dockerfile. --- update.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/update.sh b/update.sh index 507af21a75..c3735f8d42 100755 --- a/update.sh +++ b/update.sh @@ -156,11 +156,14 @@ function update_node_version() { if is_alpine "${variant}"; then alpine_version="${variant#*alpine}" - checksum="\"$( + checksum=$( curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 - )\"" + ) + if [ -z "$checksum" ]; then + fatal "Failed to fetch checksum for version ${nodeVersion}" + fi sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" - sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=${checksum}/" "${dockerfile}-tmp" + sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${checksum}\"/" "${dockerfile}-tmp" # Use python2 for nodejs < 14 on alpine if [ "$version" -lt 14 ]; then @@ -203,9 +206,12 @@ for version in "${versions[@]}"; do # See details in function.sh IFS=' ' read -ra variants <<< "$(get_variants "${parentpath}")" + pids=() + if [ -f "${version}/Dockerfile" ]; then if [ "${update_version}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & + pids+=($!) fi fi @@ -227,9 +233,15 @@ for version in "${versions[@]}"; do cp "${parentpath}/docker-entrypoint.sh" "${version}/${variant}/docker-entrypoint.sh" if [ "${update_version}" -eq 0 ] && [ "${update_variant}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${template_file}" "${version}/${variant}/Dockerfile" "${variant}" & + pids+=($!) fi done done -wait +# The reason we explicitly wait on each pid is so the return status of this script is set properly +# if one of the jobs fails. If we just called "wait", the exit status would always be 0 +for pid in "${pids[@]}"; do + wait "$pid" +done + info "Done!" From 611f4b53721ae8f7a136acd07741033fbd54e560 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 20 Aug 2020 23:21:55 -0400 Subject: [PATCH 506/818] chore: Add check for missing Alpine CHECKSUM --- .github/workflows/missing-checksum.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/missing-checksum.yml diff --git a/.github/workflows/missing-checksum.yml b/.github/workflows/missing-checksum.yml new file mode 100644 index 0000000000..fcc3af02fd --- /dev/null +++ b/.github/workflows/missing-checksum.yml @@ -0,0 +1,22 @@ +name: Check Alpine CHECKSUM + +on: + pull_request: + paths: + - ".github/workflows/missing-checksum.yml" + - "**/alpine*/Dockerfile" + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Count number of Alpine Dockersfiles without CHECKSUM + run: | + if [ "$(find -path *alpine*/Dockerfile -exec grep -l CHECKSUM=\"\" {} \; | wc -l)" == 0 ]; then + exit 0 + else + # echo "::error file=FILENAME,line=15,col=22::Missing pre-built checksum" + exit 1 + fi From 73f32c4757b1bccc0411fe378a542e1d2dfb036d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 12 Oct 2021 23:36:54 -0400 Subject: [PATCH 507/818] Update .github/workflows/missing-checksum.yml Co-authored-by: Mason Malone --- .github/workflows/missing-checksum.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/missing-checksum.yml b/.github/workflows/missing-checksum.yml index fcc3af02fd..cbd870ccf0 100644 --- a/.github/workflows/missing-checksum.yml +++ b/.github/workflows/missing-checksum.yml @@ -14,9 +14,7 @@ jobs: - name: Count number of Alpine Dockersfiles without CHECKSUM run: | - if [ "$(find -path *alpine*/Dockerfile -exec grep -l CHECKSUM=\"\" {} \; | wc -l)" == 0 ]; then - exit 0 - else - # echo "::error file=FILENAME,line=15,col=22::Missing pre-built checksum" - exit 1 + git grep -n 'CHECKSUM=""' -- '*alpine*/Dockerfile' | sed -E 's/^([^:]+):([^:]+):\s*/::error file=\1,line=\2::Missing pre-built checksum/' + if [ "${PIPESTATUS[0]}" -eq 0 ]; then + exit 1 fi From 3101ce6b5b3a0308b58d464eef141e0043c3bf5b Mon Sep 17 00:00:00 2001 From: Mason Malone Date: Sun, 17 Oct 2021 14:24:59 -0700 Subject: [PATCH 508/818] fix: docker-entrypoint.sh file handling, closes #1456 The docker-entrypoint.sh script added in https://github.com/nodejs/docker-node/issues/1039 is intended to run the supplied command with "node" if it contains a "-" or doesn't correspond to a system command. In Alpine, this doesn't work if the supplied command corresponds to a regular, non-executable JS file. The root issue is a bug in ash/dash: its implementation of "command -v" incorrectly outputs the supplied command_name even for non-executable files. This is a violation of the POSIX standard and has been reported to the Debian team in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264, though there's been no activity in several years. As a workaround, this adds an additional check to docker-entrypoint.sh for regular files that aren't marked as executable. --- 12/alpine3.11/docker-entrypoint.sh | 5 ++++- 12/alpine3.12/docker-entrypoint.sh | 5 ++++- 12/alpine3.13/docker-entrypoint.sh | 5 ++++- 12/alpine3.14/docker-entrypoint.sh | 5 ++++- 12/bullseye-slim/docker-entrypoint.sh | 5 ++++- 12/bullseye/docker-entrypoint.sh | 5 ++++- 12/buster-slim/docker-entrypoint.sh | 5 ++++- 12/buster/docker-entrypoint.sh | 5 ++++- 12/stretch-slim/docker-entrypoint.sh | 5 ++++- 12/stretch/docker-entrypoint.sh | 5 ++++- 14/alpine3.11/docker-entrypoint.sh | 5 ++++- 14/alpine3.12/docker-entrypoint.sh | 5 ++++- 14/alpine3.13/docker-entrypoint.sh | 5 ++++- 14/alpine3.14/docker-entrypoint.sh | 5 ++++- 14/bullseye-slim/docker-entrypoint.sh | 5 ++++- 14/bullseye/docker-entrypoint.sh | 5 ++++- 14/buster-slim/docker-entrypoint.sh | 5 ++++- 14/buster/docker-entrypoint.sh | 5 ++++- 14/stretch-slim/docker-entrypoint.sh | 5 ++++- 14/stretch/docker-entrypoint.sh | 5 ++++- 16/alpine3.11/docker-entrypoint.sh | 5 ++++- 16/alpine3.12/docker-entrypoint.sh | 5 ++++- 16/alpine3.13/docker-entrypoint.sh | 5 ++++- 16/alpine3.14/docker-entrypoint.sh | 5 ++++- 16/bullseye-slim/docker-entrypoint.sh | 5 ++++- 16/bullseye/docker-entrypoint.sh | 5 ++++- 16/buster-slim/docker-entrypoint.sh | 5 ++++- 16/buster/docker-entrypoint.sh | 5 ++++- 16/stretch-slim/docker-entrypoint.sh | 5 ++++- 16/stretch/docker-entrypoint.sh | 5 ++++- docker-entrypoint.sh | 5 ++++- 31 files changed, 124 insertions(+), 31 deletions(-) diff --git a/12/alpine3.11/docker-entrypoint.sh b/12/alpine3.11/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/alpine3.11/docker-entrypoint.sh +++ b/12/alpine3.11/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/alpine3.12/docker-entrypoint.sh b/12/alpine3.12/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/alpine3.12/docker-entrypoint.sh +++ b/12/alpine3.12/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/alpine3.13/docker-entrypoint.sh b/12/alpine3.13/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/alpine3.13/docker-entrypoint.sh +++ b/12/alpine3.13/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/alpine3.14/docker-entrypoint.sh b/12/alpine3.14/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/alpine3.14/docker-entrypoint.sh +++ b/12/alpine3.14/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/bullseye-slim/docker-entrypoint.sh b/12/bullseye-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/bullseye-slim/docker-entrypoint.sh +++ b/12/bullseye-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/bullseye/docker-entrypoint.sh b/12/bullseye/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/bullseye/docker-entrypoint.sh +++ b/12/bullseye/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/buster-slim/docker-entrypoint.sh b/12/buster-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/buster-slim/docker-entrypoint.sh +++ b/12/buster-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/buster/docker-entrypoint.sh b/12/buster/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/buster/docker-entrypoint.sh +++ b/12/buster/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/stretch-slim/docker-entrypoint.sh b/12/stretch-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/stretch-slim/docker-entrypoint.sh +++ b/12/stretch-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/12/stretch/docker-entrypoint.sh b/12/stretch/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/12/stretch/docker-entrypoint.sh +++ b/12/stretch/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/alpine3.11/docker-entrypoint.sh b/14/alpine3.11/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/alpine3.11/docker-entrypoint.sh +++ b/14/alpine3.11/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/alpine3.12/docker-entrypoint.sh b/14/alpine3.12/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/alpine3.12/docker-entrypoint.sh +++ b/14/alpine3.12/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/alpine3.13/docker-entrypoint.sh b/14/alpine3.13/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/alpine3.13/docker-entrypoint.sh +++ b/14/alpine3.13/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/alpine3.14/docker-entrypoint.sh b/14/alpine3.14/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/alpine3.14/docker-entrypoint.sh +++ b/14/alpine3.14/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/bullseye-slim/docker-entrypoint.sh b/14/bullseye-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/bullseye-slim/docker-entrypoint.sh +++ b/14/bullseye-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/bullseye/docker-entrypoint.sh b/14/bullseye/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/bullseye/docker-entrypoint.sh +++ b/14/bullseye/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/buster-slim/docker-entrypoint.sh b/14/buster-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/buster-slim/docker-entrypoint.sh +++ b/14/buster-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/buster/docker-entrypoint.sh b/14/buster/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/buster/docker-entrypoint.sh +++ b/14/buster/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/stretch-slim/docker-entrypoint.sh b/14/stretch-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/stretch-slim/docker-entrypoint.sh +++ b/14/stretch-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/14/stretch/docker-entrypoint.sh b/14/stretch/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/14/stretch/docker-entrypoint.sh +++ b/14/stretch/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/alpine3.11/docker-entrypoint.sh b/16/alpine3.11/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/alpine3.11/docker-entrypoint.sh +++ b/16/alpine3.11/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/alpine3.12/docker-entrypoint.sh b/16/alpine3.12/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/alpine3.12/docker-entrypoint.sh +++ b/16/alpine3.12/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/alpine3.13/docker-entrypoint.sh b/16/alpine3.13/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/alpine3.13/docker-entrypoint.sh +++ b/16/alpine3.13/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/alpine3.14/docker-entrypoint.sh b/16/alpine3.14/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/alpine3.14/docker-entrypoint.sh +++ b/16/alpine3.14/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/bullseye-slim/docker-entrypoint.sh b/16/bullseye-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/bullseye-slim/docker-entrypoint.sh +++ b/16/bullseye-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/bullseye/docker-entrypoint.sh b/16/bullseye/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/bullseye/docker-entrypoint.sh +++ b/16/bullseye/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/buster-slim/docker-entrypoint.sh b/16/buster-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/buster-slim/docker-entrypoint.sh +++ b/16/buster-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/buster/docker-entrypoint.sh b/16/buster/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/buster/docker-entrypoint.sh +++ b/16/buster/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/stretch-slim/docker-entrypoint.sh b/16/stretch-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/stretch-slim/docker-entrypoint.sh +++ b/16/stretch-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/16/stretch/docker-entrypoint.sh b/16/stretch/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/16/stretch/docker-entrypoint.sh +++ b/16/stretch/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi From 609a4d2796a21e47ddef219e9af6cf7697eb352f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 19 Oct 2021 16:08:20 -0400 Subject: [PATCH 509/818] feat: NodeJS 17.0.0 --- 17/alpine3.12/Dockerfile | 98 +++++++++++++++++++++++++++ 17/alpine3.12/docker-entrypoint.sh | 8 +++ 17/alpine3.13/Dockerfile | 98 +++++++++++++++++++++++++++ 17/alpine3.13/docker-entrypoint.sh | 8 +++ 17/alpine3.14/Dockerfile | 98 +++++++++++++++++++++++++++ 17/alpine3.14/docker-entrypoint.sh | 8 +++ 17/bullseye-slim/Dockerfile | 94 +++++++++++++++++++++++++ 17/bullseye-slim/docker-entrypoint.sh | 8 +++ 17/bullseye/Dockerfile | 70 +++++++++++++++++++ 17/bullseye/docker-entrypoint.sh | 8 +++ 17/buster-slim/Dockerfile | 94 +++++++++++++++++++++++++ 17/buster-slim/docker-entrypoint.sh | 8 +++ 17/buster/Dockerfile | 70 +++++++++++++++++++ 17/buster/docker-entrypoint.sh | 8 +++ 17/stretch-slim/Dockerfile | 94 +++++++++++++++++++++++++ 17/stretch-slim/docker-entrypoint.sh | 8 +++ 17/stretch/Dockerfile | 70 +++++++++++++++++++ 17/stretch/docker-entrypoint.sh | 8 +++ versions.json | 73 ++++++++++++++++++++ 19 files changed, 931 insertions(+) create mode 100644 17/alpine3.12/Dockerfile create mode 100644 17/alpine3.12/docker-entrypoint.sh create mode 100644 17/alpine3.13/Dockerfile create mode 100644 17/alpine3.13/docker-entrypoint.sh create mode 100644 17/alpine3.14/Dockerfile create mode 100644 17/alpine3.14/docker-entrypoint.sh create mode 100644 17/bullseye-slim/Dockerfile create mode 100644 17/bullseye-slim/docker-entrypoint.sh create mode 100644 17/bullseye/Dockerfile create mode 100644 17/bullseye/docker-entrypoint.sh create mode 100644 17/buster-slim/Dockerfile create mode 100644 17/buster-slim/docker-entrypoint.sh create mode 100644 17/buster/Dockerfile create mode 100644 17/buster/docker-entrypoint.sh create mode 100644 17/stretch-slim/Dockerfile create mode 100644 17/stretch-slim/docker-entrypoint.sh create mode 100644 17/stretch/Dockerfile create mode 100644 17/stretch/docker-entrypoint.sh diff --git a/17/alpine3.12/Dockerfile b/17/alpine3.12/Dockerfile new file mode 100644 index 0000000000..30a77f7db2 --- /dev/null +++ b/17/alpine3.12/Dockerfile @@ -0,0 +1,98 @@ +FROM alpine:3.12 + +ENV NODE_VERSION 17.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="643dc2e3558198cdf9d63c9022856c3a391567b338adfd68973b4e822ef2da1b" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/alpine3.12/docker-entrypoint.sh b/17/alpine3.12/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/alpine3.12/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/alpine3.13/Dockerfile b/17/alpine3.13/Dockerfile new file mode 100644 index 0000000000..8b966d2e3e --- /dev/null +++ b/17/alpine3.13/Dockerfile @@ -0,0 +1,98 @@ +FROM alpine:3.13 + +ENV NODE_VERSION 17.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="643dc2e3558198cdf9d63c9022856c3a391567b338adfd68973b4e822ef2da1b" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/alpine3.13/docker-entrypoint.sh b/17/alpine3.13/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/alpine3.13/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile new file mode 100644 index 0000000000..c2a099175c --- /dev/null +++ b/17/alpine3.14/Dockerfile @@ -0,0 +1,98 @@ +FROM alpine:3.14 + +ENV NODE_VERSION 17.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="643dc2e3558198cdf9d63c9022856c3a391567b338adfd68973b4e822ef2da1b" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/alpine3.14/docker-entrypoint.sh b/17/alpine3.14/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/alpine3.14/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..e83d0a30c1 --- /dev/null +++ b/17/bullseye-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 17.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/bullseye-slim/docker-entrypoint.sh b/17/bullseye-slim/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile new file mode 100644 index 0000000000..68ec58ef8e --- /dev/null +++ b/17/bullseye/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 17.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/bullseye/docker-entrypoint.sh b/17/bullseye/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/bullseye/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile new file mode 100644 index 0000000000..d39aa10b30 --- /dev/null +++ b/17/buster-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 17.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/buster-slim/docker-entrypoint.sh b/17/buster-slim/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/buster-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile new file mode 100644 index 0000000000..96f47ce3f0 --- /dev/null +++ b/17/buster/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 17.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/buster/docker-entrypoint.sh b/17/buster/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/buster/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile new file mode 100644 index 0000000000..ba8cfe3162 --- /dev/null +++ b/17/stretch-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 17.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/stretch-slim/docker-entrypoint.sh b/17/stretch-slim/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile new file mode 100644 index 0000000000..639e93514b --- /dev/null +++ b/17/stretch/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:stretch + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 17.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.15 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/17/stretch/docker-entrypoint.sh b/17/stretch/docker-entrypoint.sh new file mode 100644 index 0000000000..de6fa8a9ad --- /dev/null +++ b/17/stretch/docker-entrypoint.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index b808cc4a6c..c893f9d6e9 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,77 @@ { + "17": { + "start": "2021-10-19", + "lts": "", + "maintenance": "2022-04-01", + "end": "2022-06-01", + "codename": "", + "alpine-default": "alpine3.14", + "debian-default": "bullseye", + "variants": { + "alpine3.12": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.13": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.14": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "stretch": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "stretch-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, "16": { "start": "2021-04-20", "lts": "2021-10-26", From d23d09bf6af047c0a9af3607526590b0aaf27cbf Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 19 Oct 2021 21:03:07 -0400 Subject: [PATCH 510/818] fix: Add execute bit to entrypoint.sh --- 17/alpine3.12/docker-entrypoint.sh | 0 17/alpine3.13/docker-entrypoint.sh | 0 17/alpine3.14/docker-entrypoint.sh | 0 17/bullseye-slim/docker-entrypoint.sh | 0 17/bullseye/docker-entrypoint.sh | 0 17/buster-slim/docker-entrypoint.sh | 0 17/buster/docker-entrypoint.sh | 0 17/stretch-slim/docker-entrypoint.sh | 0 17/stretch/docker-entrypoint.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 17/alpine3.12/docker-entrypoint.sh mode change 100644 => 100755 17/alpine3.13/docker-entrypoint.sh mode change 100644 => 100755 17/alpine3.14/docker-entrypoint.sh mode change 100644 => 100755 17/bullseye-slim/docker-entrypoint.sh mode change 100644 => 100755 17/bullseye/docker-entrypoint.sh mode change 100644 => 100755 17/buster-slim/docker-entrypoint.sh mode change 100644 => 100755 17/buster/docker-entrypoint.sh mode change 100644 => 100755 17/stretch-slim/docker-entrypoint.sh mode change 100644 => 100755 17/stretch/docker-entrypoint.sh diff --git a/17/alpine3.12/docker-entrypoint.sh b/17/alpine3.12/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/alpine3.13/docker-entrypoint.sh b/17/alpine3.13/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/alpine3.14/docker-entrypoint.sh b/17/alpine3.14/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/bullseye-slim/docker-entrypoint.sh b/17/bullseye-slim/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/bullseye/docker-entrypoint.sh b/17/bullseye/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/buster-slim/docker-entrypoint.sh b/17/buster-slim/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/buster/docker-entrypoint.sh b/17/buster/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/stretch-slim/docker-entrypoint.sh b/17/stretch-slim/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/17/stretch/docker-entrypoint.sh b/17/stretch/docker-entrypoint.sh old mode 100644 new mode 100755 From f89451f17b5f19a2908dedede39434f4f1b1baf0 Mon Sep 17 00:00:00 2001 From: Mason Malone Date: Mon, 18 Oct 2021 18:20:24 -0700 Subject: [PATCH 511/818] Add regression test --- .github/workflows/build-test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 308371d633..98a693b116 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -82,6 +82,13 @@ jobs: echo "Expected: \"${{ matrix.version }}\", Got: \"${image_node_version}\"" [ "${image_node_version}" == "${{ matrix.version }}" ] + - name: Verify entrypoint runs regular, non-executable files with node + run: | + tmp_file=$(mktemp) + echo 'console.log("success")' > "${tmp_file}" + output=$(docker run --rm -v "${tmp_file}:/app/index.js" node:${{ matrix.version }}-${{ matrix.variant }} app/index.js) + [ "${output}" = 'success' ] + - name: Test for npm run: docker run --rm node:${{ matrix.version }}-${{ matrix.variant }} npm --version From be42a31be48999703631ffc818d860d9c814cd98 Mon Sep 17 00:00:00 2001 From: Mason Malone Date: Tue, 19 Oct 2021 23:05:32 -0700 Subject: [PATCH 512/818] Update entrypoints for Node 17 --- 17/alpine3.12/docker-entrypoint.sh | 5 ++++- 17/alpine3.13/docker-entrypoint.sh | 5 ++++- 17/alpine3.14/docker-entrypoint.sh | 5 ++++- 17/bullseye-slim/docker-entrypoint.sh | 5 ++++- 17/bullseye/docker-entrypoint.sh | 5 ++++- 17/buster-slim/docker-entrypoint.sh | 5 ++++- 17/buster/docker-entrypoint.sh | 5 ++++- 17/stretch-slim/docker-entrypoint.sh | 5 ++++- 17/stretch/docker-entrypoint.sh | 5 ++++- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/17/alpine3.12/docker-entrypoint.sh b/17/alpine3.12/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/alpine3.12/docker-entrypoint.sh +++ b/17/alpine3.12/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/alpine3.13/docker-entrypoint.sh b/17/alpine3.13/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/alpine3.13/docker-entrypoint.sh +++ b/17/alpine3.13/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/alpine3.14/docker-entrypoint.sh b/17/alpine3.14/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/alpine3.14/docker-entrypoint.sh +++ b/17/alpine3.14/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/bullseye-slim/docker-entrypoint.sh b/17/bullseye-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/bullseye-slim/docker-entrypoint.sh +++ b/17/bullseye-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/bullseye/docker-entrypoint.sh b/17/bullseye/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/bullseye/docker-entrypoint.sh +++ b/17/bullseye/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/buster-slim/docker-entrypoint.sh b/17/buster-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/buster-slim/docker-entrypoint.sh +++ b/17/buster-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/buster/docker-entrypoint.sh b/17/buster/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/buster/docker-entrypoint.sh +++ b/17/buster/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/stretch-slim/docker-entrypoint.sh b/17/stretch-slim/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/stretch-slim/docker-entrypoint.sh +++ b/17/stretch-slim/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi diff --git a/17/stretch/docker-entrypoint.sh b/17/stretch/docker-entrypoint.sh index de6fa8a9ad..1b3116e53b 100755 --- a/17/stretch/docker-entrypoint.sh +++ b/17/stretch/docker-entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/sh set -e -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ]; then +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then set -- node "$@" fi From bd74e0ce211ff2b36e3401343a513cd798c6e232 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 20 Oct 2021 12:10:44 -0400 Subject: [PATCH 513/818] fix: change Node 14 maintenace date Temporary workaround for LTS tag generation on Docker Hub --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index c893f9d6e9..7e33e6e940 100644 --- a/versions.json +++ b/versions.json @@ -156,7 +156,7 @@ "14": { "start": "2020-04-21", "lts": "2020-10-27", - "maintenance": "2021-10-19", + "maintenance": "2021-10-25", "end": "2023-04-30", "codename": "fermium", "alpine-default": "alpine3.11", From 9dffc9162377d76ffd6c5b28b68b30c389fa15ab Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 21 Oct 2021 02:05:05 +0800 Subject: [PATCH 514/818] Update node.js v16 from 16.11.1 to 16.12.0 - https://nodejs.org/en/blog/release/v16.12.0/ - https://github.com/nodejs/node/releases/tag/v16.12.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V16.md#16.12.0 --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index acadf729be..2ebe48189a 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.11.1 +ENV NODE_VERSION 16.12.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="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ + CHECKSUM="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index 812f043054..f503d0c4f0 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.11.1 +ENV NODE_VERSION 16.12.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="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ + CHECKSUM="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index d9b0063b87..bd9b2a09f9 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.11.1 +ENV NODE_VERSION 16.12.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="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ + CHECKSUM="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index cfe9b390c4..284f015eb7 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.11.1 +ENV NODE_VERSION 16.12.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="f0e2e3b1fcbeb4e63b300d86cf4f22c43d466c700dc9f13e4d8fc573d0945b33" \ + CHECKSUM="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index f57f73ae42..96a56ce76d 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.11.1 +ENV NODE_VERSION 16.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index e5b7706990..febbe80665 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.11.1 +ENV NODE_VERSION 16.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 5009fdd745..9fb8bc67ed 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.11.1 +ENV NODE_VERSION 16.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 5dcf1a936e..e4c4ff715b 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.11.1 +ENV NODE_VERSION 16.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 1775b914d0..b310476487 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.11.1 +ENV NODE_VERSION 16.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index b1ac359677..f7b3e8607d 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.11.1 +ENV NODE_VERSION 16.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From eeed4a818e7cd954dbd4fff34de1afb8555b834f Mon Sep 17 00:00:00 2001 From: Jeve-Stobs Date: Wed, 20 Oct 2021 22:41:33 -0400 Subject: [PATCH 515/818] Update node.js v17 from 17.0.0 to 17.0.1 --- 17/alpine3.12/Dockerfile | 4 ++-- 17/alpine3.13/Dockerfile | 4 ++-- 17/alpine3.14/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/17/alpine3.12/Dockerfile b/17/alpine3.12/Dockerfile index 30a77f7db2..e4118f727b 100644 --- a/17/alpine3.12/Dockerfile +++ b/17/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 17.0.0 +ENV NODE_VERSION 17.0.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="643dc2e3558198cdf9d63c9022856c3a391567b338adfd68973b4e822ef2da1b" \ + CHECKSUM="2fe80ab23de32b91a9f7679725369da1eb7833e778d2e16fdc31049d57cdc098" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.13/Dockerfile b/17/alpine3.13/Dockerfile index 8b966d2e3e..01d44c4bbf 100644 --- a/17/alpine3.13/Dockerfile +++ b/17/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 17.0.0 +ENV NODE_VERSION 17.0.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="643dc2e3558198cdf9d63c9022856c3a391567b338adfd68973b4e822ef2da1b" \ + CHECKSUM="2fe80ab23de32b91a9f7679725369da1eb7833e778d2e16fdc31049d57cdc098" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index c2a099175c..6fd0321ecf 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.0.0 +ENV NODE_VERSION 17.0.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="643dc2e3558198cdf9d63c9022856c3a391567b338adfd68973b4e822ef2da1b" \ + CHECKSUM="2fe80ab23de32b91a9f7679725369da1eb7833e778d2e16fdc31049d57cdc098" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index e83d0a30c1..8f66754837 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.0.0 +ENV NODE_VERSION 17.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 68ec58ef8e..afe2efeb2b 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.0.0 +ENV NODE_VERSION 17.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index d39aa10b30..75b103f15a 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.0.0 +ENV NODE_VERSION 17.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 96f47ce3f0..db32292e3f 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.0.0 +ENV NODE_VERSION 17.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index ba8cfe3162..e35bea8bf9 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.0.0 +ENV NODE_VERSION 17.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index 639e93514b..465b8b99fa 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.0.0 +ENV NODE_VERSION 17.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From d146f71011bc87d739c9ed3e2820726af7d75417 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 26 Oct 2021 15:20:36 -0400 Subject: [PATCH 516/818] feat: Node 16.13.0 Gallium --- 16/alpine3.11/Dockerfile | 4 ++-- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- versions.json | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile index 2ebe48189a..ded60893d1 100644 --- a/16/alpine3.11/Dockerfile +++ b/16/alpine3.11/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ENV NODE_VERSION 16.12.0 +ENV NODE_VERSION 16.13.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="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ + CHECKSUM="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index f503d0c4f0..eb84a95c4a 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.12.0 +ENV NODE_VERSION 16.13.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="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ + CHECKSUM="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index bd9b2a09f9..e08e86bf59 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.12.0 +ENV NODE_VERSION 16.13.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="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ + CHECKSUM="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 284f015eb7..56dbd2d030 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.12.0 +ENV NODE_VERSION 16.13.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="4e6c41d43c196c727cdd7ecb03a90b4e6fb604736353a1c1acd9ee58942b7b42" \ + CHECKSUM="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 96a56ce76d..aad4c8aea1 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.12.0 +ENV NODE_VERSION 16.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index febbe80665..aed581f4a9 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.12.0 +ENV NODE_VERSION 16.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 9fb8bc67ed..61621ecd90 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.12.0 +ENV NODE_VERSION 16.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index e4c4ff715b..be1159fdf3 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.12.0 +ENV NODE_VERSION 16.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index b310476487..c46cade8f3 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.12.0 +ENV NODE_VERSION 16.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index f7b3e8607d..48548d1db8 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.12.0 +ENV NODE_VERSION 16.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/versions.json b/versions.json index 7e33e6e940..911f9786bd 100644 --- a/versions.json +++ b/versions.json @@ -77,7 +77,7 @@ "lts": "2021-10-26", "maintenance": "2022-10-18", "end": "2024-04-30", - "codename": "", + "codename": "gallium", "alpine-default": "alpine3.13", "debian-default": "buster", "variants": { @@ -156,7 +156,7 @@ "14": { "start": "2020-04-21", "lts": "2020-10-27", - "maintenance": "2021-10-25", + "maintenance": "2021-10-19", "end": "2023-04-30", "codename": "fermium", "alpine-default": "alpine3.11", From 7f756487962fccfc9447ad22e18d57d3c37987e3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 26 Oct 2021 17:06:01 -0400 Subject: [PATCH 517/818] fix: NodeJS date parsing from string Use an explicit timezone to work around an "off by one" issue with date parsing --- stackbrew.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/stackbrew.js b/stackbrew.js index b183980403..fabe601bab 100755 --- a/stackbrew.js +++ b/stackbrew.js @@ -25,21 +25,23 @@ const config = require('./versions.json'); const versions = Object.keys(config).reverse() -const now = new Date().getTime() +let midnight = new Date() +midnight.setHours(0, 0, 0, 0) +const now = midnight.getTime() const aplineRE = new RegExp(/alpine*/); const slimRE = new RegExp(/\*-slim/); -for(version of versions) { - let lts = new Date(config[version].lts).getTime(); - let maintenance = new Date(config[version].maintenance).getTime(); - let isCurrent = lts > now; - let isLTS = (maintenance > now) && (now > lts); +for (version of versions) { + let lts = new Date(`${config[version].lts}T00:00:00.00`).getTime(); + let maintenance = new Date(`${config[version].maintenance}T00:00:00.00`).getTime(); + let isCurrent = lts >= now; + let isLTS = (maintenance >= now) && (now >= lts); let codename = config[version].codename let defaultAlpine = config[version]['alpine-default'] let defaultDebian = config[version]['debian-default'] let variants = config[version].variants let fullversion; - for(variant in variants) { + for (variant in variants) { let dockerfilePath = path.join(version, variant, 'Dockerfile'); let isAlpine = aplineRE.test(variant) let isSlim = slimRE.test(variant) From 57f92eddb5f960545f8549be10e20d5ecd67ddff Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 27 Oct 2021 12:16:49 -0400 Subject: [PATCH 518/818] fix: Empty data parsing for odd number branch Because the cutover to 17 being "current" happens, but the line doesn't have an LTS date, the tags wernt changing --- stackbrew.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackbrew.js b/stackbrew.js index fabe601bab..baa015398b 100755 --- a/stackbrew.js +++ b/stackbrew.js @@ -34,7 +34,7 @@ const slimRE = new RegExp(/\*-slim/); for (version of versions) { let lts = new Date(`${config[version].lts}T00:00:00.00`).getTime(); let maintenance = new Date(`${config[version].maintenance}T00:00:00.00`).getTime(); - let isCurrent = lts >= now; + let isCurrent = isNaN(lts) || lts >= now; let isLTS = (maintenance >= now) && (now >= lts); let codename = config[version].codename let defaultAlpine = config[version]['alpine-default'] From 3249d350bda58bbb83a5b18a2bf14b46a8b49fc7 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 27 Oct 2021 12:56:59 -0400 Subject: [PATCH 519/818] fix: Drop Apline 3.11 for EOL --- 12/alpine3.11/Dockerfile | 98 ------------------------------ 12/alpine3.11/docker-entrypoint.sh | 11 ---- 14/alpine3.11/Dockerfile | 98 ------------------------------ 14/alpine3.11/docker-entrypoint.sh | 11 ---- 16/alpine3.11/Dockerfile | 98 ------------------------------ 16/alpine3.11/docker-entrypoint.sh | 11 ---- architectures | 14 ++--- config | 2 +- versions.json | 30 +-------- 9 files changed, 11 insertions(+), 362 deletions(-) delete mode 100644 12/alpine3.11/Dockerfile delete mode 100755 12/alpine3.11/docker-entrypoint.sh delete mode 100644 14/alpine3.11/Dockerfile delete mode 100755 14/alpine3.11/docker-entrypoint.sh delete mode 100644 16/alpine3.11/Dockerfile delete mode 100755 16/alpine3.11/docker-entrypoint.sh diff --git a/12/alpine3.11/Dockerfile b/12/alpine3.11/Dockerfile deleted file mode 100644 index 1540bc1955..0000000000 --- a/12/alpine3.11/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -FROM alpine:3.11 - -ENV NODE_VERSION 12.22.7 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.15 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/alpine3.11/docker-entrypoint.sh b/12/alpine3.11/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/alpine3.11/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/alpine3.11/Dockerfile b/14/alpine3.11/Dockerfile deleted file mode 100644 index c6cc94548f..0000000000 --- a/14/alpine3.11/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -FROM alpine:3.11 - -ENV NODE_VERSION 14.18.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.15 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/alpine3.11/docker-entrypoint.sh b/14/alpine3.11/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/alpine3.11/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/alpine3.11/Dockerfile b/16/alpine3.11/Dockerfile deleted file mode 100644 index ded60893d1..0000000000 --- a/16/alpine3.11/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -FROM alpine:3.11 - -ENV NODE_VERSION 16.13.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.15 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/alpine3.11/docker-entrypoint.sh b/16/alpine3.11/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/alpine3.11/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/architectures b/architectures index 6c9b43d109..44c101d4a1 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.11,alpine3.12,alpine3.13,alpine3.14 -arm32v7 alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -i386 alpine3.11,alpine3.12,alpine3.13,alpine3.14 -ppc64le alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.11,alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.12,alpine3.13,alpine3.14 +arm32v7 alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +i386 alpine3.12,alpine3.13,alpine3.14 +ppc64le alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index a9c0c25416..c30f6066c4 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch -alpine_version 3.11 +alpine_version 3.14 debian_versions stretch bullseye buster diff --git a/versions.json b/versions.json index 911f9786bd..b063ff743a 100644 --- a/versions.json +++ b/versions.json @@ -78,17 +78,9 @@ "maintenance": "2022-10-18", "end": "2024-04-30", "codename": "gallium", - "alpine-default": "alpine3.13", + "alpine-default": "alpine3.14", "debian-default": "buster", "variants": { - "alpine3.11": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], "alpine3.12": [ "amd64", "arm32v6", @@ -159,17 +151,9 @@ "maintenance": "2021-10-19", "end": "2023-04-30", "codename": "fermium", - "alpine-default": "alpine3.11", + "alpine-default": "alpine3.14", "debian-default": "stretch", "variants": { - "alpine3.11": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], "alpine3.12": [ "amd64", "arm32v6", @@ -240,17 +224,9 @@ "maintenance": "2020-11-30", "end": "2022-04-30", "codename": "erbium", - "alpine-default": "alpine3.11", + "alpine-default": "alpine3.14", "debian-default": "stretch", "variants": { - "alpine3.11": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], "alpine3.12": [ "amd64", "arm32v6", From 8a750d61c4a2c276a75a9fb27b56555d9dfb4536 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sun, 7 Nov 2021 20:12:38 -0500 Subject: [PATCH 520/818] docs: Update instructions for python 3 --- docs/BestPractices.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 97117fee3c..0ab5a415f3 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -185,7 +185,7 @@ Here is an example of how you would install dependencies for packages that requi ```Dockerfile FROM node:alpine -RUN apk add --no-cache --virtual .gyp python make g++ \ +RUN apk add --no-cache --virtual .gyp python3 make g++ \ && npm install [ your npm dependencies here ] \ && apk del .gyp ``` @@ -196,7 +196,7 @@ And Here's a multistage build example FROM node:alpine as builder ## Install build toolchain, install node deps and compile native add-ons -RUN apk add --no-cache python make g++ +RUN apk add --no-cache python3 make g++ RUN npm install [ your npm dependencies here ] FROM node:alpine as app From ef329f2c98916eca9a913774788b576573bd8aff Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 9 Nov 2021 18:15:12 -0500 Subject: [PATCH 521/818] feat: NodeJS 17.1.0 --- 17/alpine3.12/Dockerfile | 4 ++-- 17/alpine3.13/Dockerfile | 4 ++-- 17/alpine3.14/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/17/alpine3.12/Dockerfile b/17/alpine3.12/Dockerfile index e4118f727b..703fd25a54 100644 --- a/17/alpine3.12/Dockerfile +++ b/17/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 17.0.1 +ENV NODE_VERSION 17.1.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="2fe80ab23de32b91a9f7679725369da1eb7833e778d2e16fdc31049d57cdc098" \ + CHECKSUM="2a1978a4384d57cf4f68794a45dc6c934303033fc4f471b7c113f31eb2b1a8f6" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.13/Dockerfile b/17/alpine3.13/Dockerfile index 01d44c4bbf..2987ac668c 100644 --- a/17/alpine3.13/Dockerfile +++ b/17/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 17.0.1 +ENV NODE_VERSION 17.1.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="2fe80ab23de32b91a9f7679725369da1eb7833e778d2e16fdc31049d57cdc098" \ + CHECKSUM="2a1978a4384d57cf4f68794a45dc6c934303033fc4f471b7c113f31eb2b1a8f6" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 6fd0321ecf..4f712e9851 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.0.1 +ENV NODE_VERSION 17.1.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="2fe80ab23de32b91a9f7679725369da1eb7833e778d2e16fdc31049d57cdc098" \ + CHECKSUM="2a1978a4384d57cf4f68794a45dc6c934303033fc4f471b7c113f31eb2b1a8f6" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 8f66754837..0a06349c84 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.0.1 +ENV NODE_VERSION 17.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index afe2efeb2b..2e16415d20 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.0.1 +ENV NODE_VERSION 17.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 75b103f15a..e0478e9a5f 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.0.1 +ENV NODE_VERSION 17.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index db32292e3f..d489610860 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.0.1 +ENV NODE_VERSION 17.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index e35bea8bf9..f7d0af0bd7 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.0.1 +ENV NODE_VERSION 17.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index 465b8b99fa..e6de88a3fb 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.0.1 +ENV NODE_VERSION 17.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From edfc12cfac2a24a1b54408117e440420907a2217 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Nov 2021 07:04:12 +0000 Subject: [PATCH 522/818] chore(deps): bump actions/setup-node from 2.4.1 to 2.5.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 90c3126290..0b95db6c95 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.4.1 + - uses: actions/setup-node@v2.5.0 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index e116bef208..a11af37920 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.4.1 + - uses: actions/setup-node@v2.5.0 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index d628478390..267aac0233 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.4.1 + - uses: actions/setup-node@v2.5.0 with: node-version: '12.x' - name: Install markdown-link-check From b695e030ea98f272d843feb98ee1ab62943071b3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 30 Nov 2021 20:51:13 -0500 Subject: [PATCH 523/818] feat: NodeJS 14.18.2 and 17.2.0 --- 14/alpine3.12/Dockerfile | 4 ++-- 14/alpine3.13/Dockerfile | 4 ++-- 14/alpine3.14/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 17/alpine3.12/Dockerfile | 4 ++-- 17/alpine3.13/Dockerfile | 4 ++-- 17/alpine3.14/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.12/Dockerfile index 75a9d3eb2a..8a898ccef4 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 14.18.1 +ENV NODE_VERSION 14.18.2 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="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ + CHECKSUM="7a1a1a18e51ad20245fc366a0848cdb55e968094c807a094555ec2c214e8e9c6" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile index 7df0eb474a..e7896f5be1 100644 --- a/14/alpine3.13/Dockerfile +++ b/14/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 14.18.1 +ENV NODE_VERSION 14.18.2 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="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ + CHECKSUM="7a1a1a18e51ad20245fc366a0848cdb55e968094c807a094555ec2c214e8e9c6" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index b04dc530e8..1c0d9e3989 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.18.1 +ENV NODE_VERSION 14.18.2 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="8d6d2b71b76dc31bbcf12827b9e60212bc04a556c3498e75708d38f5eb4ae6eb" \ + CHECKSUM="7a1a1a18e51ad20245fc366a0848cdb55e968094c807a094555ec2c214e8e9c6" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 4e1d3dda2a..d037f46aeb 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.18.1 +ENV NODE_VERSION 14.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 6ebba620c5..35e34003f1 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.18.1 +ENV NODE_VERSION 14.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 92c5e8ef61..c19e5a943b 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.18.1 +ENV NODE_VERSION 14.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 2198966d5f..a2e4bc4eb0 100644 --- a/14/buster/Dockerfile +++ b/14/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.18.1 +ENV NODE_VERSION 14.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index c09e24c12c..d86578aad8 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.18.1 +ENV NODE_VERSION 14.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 9c3978446e..e962383b93 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.18.1 +ENV NODE_VERSION 14.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/alpine3.12/Dockerfile b/17/alpine3.12/Dockerfile index 703fd25a54..563ee4c8db 100644 --- a/17/alpine3.12/Dockerfile +++ b/17/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 17.1.0 +ENV NODE_VERSION 17.2.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="2a1978a4384d57cf4f68794a45dc6c934303033fc4f471b7c113f31eb2b1a8f6" \ + CHECKSUM="915d7a201c51e90220fa4f608ff62b569e414d3c75ceb95e383e877ce5300257" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.13/Dockerfile b/17/alpine3.13/Dockerfile index 2987ac668c..307414ead5 100644 --- a/17/alpine3.13/Dockerfile +++ b/17/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 17.1.0 +ENV NODE_VERSION 17.2.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="2a1978a4384d57cf4f68794a45dc6c934303033fc4f471b7c113f31eb2b1a8f6" \ + CHECKSUM="915d7a201c51e90220fa4f608ff62b569e414d3c75ceb95e383e877ce5300257" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 4f712e9851..f2d5bb6b3f 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.1.0 +ENV NODE_VERSION 17.2.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="2a1978a4384d57cf4f68794a45dc6c934303033fc4f471b7c113f31eb2b1a8f6" \ + CHECKSUM="915d7a201c51e90220fa4f608ff62b569e414d3c75ceb95e383e877ce5300257" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 0a06349c84..56991372d3 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.1.0 +ENV NODE_VERSION 17.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 2e16415d20..b25b2a4fe5 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.1.0 +ENV NODE_VERSION 17.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index e0478e9a5f..243e6a8f1e 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.1.0 +ENV NODE_VERSION 17.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index d489610860..6cdac40f33 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.1.0 +ENV NODE_VERSION 17.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index f7d0af0bd7..4800c6d7de 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.1.0 +ENV NODE_VERSION 17.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index e6de88a3fb..ebdd349db5 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.1.0 +ENV NODE_VERSION 17.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6f740b0ca772e978b44c11d194f369e554c54a14 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 1 Dec 2021 14:53:39 -0500 Subject: [PATCH 524/818] feat: NodeJS 16.13.1 --- 16/alpine3.12/Dockerfile | 4 ++-- 16/alpine3.13/Dockerfile | 4 ++-- 16/alpine3.14/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 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.12/Dockerfile index eb84a95c4a..cc63987175 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 16.13.0 +ENV NODE_VERSION 16.13.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="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ + CHECKSUM="3b4c47e5554fa466651a767691fc76c09b6a514b49d79bbd0061e549614adedf" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile index e08e86bf59..61c36ad33e 100644 --- a/16/alpine3.13/Dockerfile +++ b/16/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 16.13.0 +ENV NODE_VERSION 16.13.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="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ + CHECKSUM="3b4c47e5554fa466651a767691fc76c09b6a514b49d79bbd0061e549614adedf" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 56dbd2d030..fd95d27dd1 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.13.0 +ENV NODE_VERSION 16.13.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="f78b7f49c92559855d7804b67101a0da393ad75950317c9138a15cd05292f7a6" \ + CHECKSUM="3b4c47e5554fa466651a767691fc76c09b6a514b49d79bbd0061e549614adedf" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index aad4c8aea1..74deb6038f 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.13.0 +ENV NODE_VERSION 16.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index aed581f4a9..7b2a05aa3a 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.13.0 +ENV NODE_VERSION 16.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 61621ecd90..d104a2057f 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.13.0 +ENV NODE_VERSION 16.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index be1159fdf3..312f401bd3 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.13.0 +ENV NODE_VERSION 16.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index c46cade8f3..804e8c3e08 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.13.0 +ENV NODE_VERSION 16.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 48548d1db8..fa31600b07 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.13.0 +ENV NODE_VERSION 16.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6e8999e5e1170fc6a791f3e549adfaa405da396e Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 17 Dec 2021 18:42:35 -0500 Subject: [PATCH 525/818] feat: NodeJS 12.22.8 --- 12/alpine3.12/Dockerfile | 6 +++--- 12/alpine3.13/Dockerfile | 6 +++--- 12/alpine3.14/Dockerfile | 6 +++--- 12/bullseye-slim/Dockerfile | 4 ++-- 12/bullseye/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.12/Dockerfile index 2395a4ae32..036510c7c6 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 12.22.7 +ENV NODE_VERSION 12.22.8 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="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ + CHECKSUM="9cc1d120c404d66a62d6e4daaba361e8e1996bdc5b9643f97bbd1241247332df" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.13/Dockerfile b/12/alpine3.13/Dockerfile index e0ef3dea11..f802954ca2 100644 --- a/12/alpine3.13/Dockerfile +++ b/12/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 12.22.7 +ENV NODE_VERSION 12.22.8 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="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ + CHECKSUM="9cc1d120c404d66a62d6e4daaba361e8e1996bdc5b9643f97bbd1241247332df" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index 494c9d18f4..6ce1ecdceb 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.7 +ENV NODE_VERSION 12.22.8 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="c8672a664087e96b4e2804caf77a0aaa8c1375ae6b378edb220a678155383a81" \ + CHECKSUM="9cc1d120c404d66a62d6e4daaba361e8e1996bdc5b9643f97bbd1241247332df" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile index 38ed78cfbe..7db8c3ce22 100644 --- a/12/bullseye-slim/Dockerfile +++ b/12/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 12.22.7 +ENV NODE_VERSION 12.22.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index 85ce31ea26..cff6702c11 100644 --- a/12/bullseye/Dockerfile +++ b/12/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 12.22.7 +ENV NODE_VERSION 12.22.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index c30bf2ca5d..157f6e0452 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.7 +ENV NODE_VERSION 12.22.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 1e8bd85468..60cf18445b 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.7 +ENV NODE_VERSION 12.22.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 7cd28ff000..70199d8f89 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.7 +ENV NODE_VERSION 12.22.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 61abc31f0e..71cca2885e 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.7 +ENV NODE_VERSION 12.22.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ From 39dc17f7f2bb3fb21001bdbafd335fd55cccbe06 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 17 Dec 2021 21:28:03 -0500 Subject: [PATCH 526/818] feat: NodeJS 17.3.0 --- 17/alpine3.12/Dockerfile | 6 +++--- 17/alpine3.13/Dockerfile | 6 +++--- 17/alpine3.14/Dockerfile | 6 +++--- 17/bullseye-slim/Dockerfile | 4 ++-- 17/bullseye/Dockerfile | 4 ++-- 17/buster-slim/Dockerfile | 4 ++-- 17/buster/Dockerfile | 4 ++-- 17/stretch-slim/Dockerfile | 4 ++-- 17/stretch/Dockerfile | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/17/alpine3.12/Dockerfile b/17/alpine3.12/Dockerfile index 563ee4c8db..9f1492d501 100644 --- a/17/alpine3.12/Dockerfile +++ b/17/alpine3.12/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 -ENV NODE_VERSION 17.2.0 +ENV NODE_VERSION 17.3.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="915d7a201c51e90220fa4f608ff62b569e414d3c75ceb95e383e877ce5300257" \ + CHECKSUM="38dbde2dc8eae0d6756c89c88a21d5dc6b41952184c8fe6e96a31fba987f2372" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/alpine3.13/Dockerfile b/17/alpine3.13/Dockerfile index 307414ead5..5062d8202b 100644 --- a/17/alpine3.13/Dockerfile +++ b/17/alpine3.13/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.13 -ENV NODE_VERSION 17.2.0 +ENV NODE_VERSION 17.3.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="915d7a201c51e90220fa4f608ff62b569e414d3c75ceb95e383e877ce5300257" \ + CHECKSUM="38dbde2dc8eae0d6756c89c88a21d5dc6b41952184c8fe6e96a31fba987f2372" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index f2d5bb6b3f..794a498e90 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.2.0 +ENV NODE_VERSION 17.3.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="915d7a201c51e90220fa4f608ff62b569e414d3c75ceb95e383e877ce5300257" \ + CHECKSUM="38dbde2dc8eae0d6756c89c88a21d5dc6b41952184c8fe6e96a31fba987f2372" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 56991372d3..3876a8b8ed 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.2.0 +ENV NODE_VERSION 17.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index b25b2a4fe5..0378be52e3 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.2.0 +ENV NODE_VERSION 17.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 243e6a8f1e..64b97734fb 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.2.0 +ENV NODE_VERSION 17.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 6cdac40f33..25a61e59a2 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.2.0 +ENV NODE_VERSION 17.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index 4800c6d7de..4200b20fd1 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.2.0 +ENV NODE_VERSION 17.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index ebdd349db5..d3472b54c1 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.2.0 +ENV NODE_VERSION 17.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ From 3760675a3f78207605d579f366facbb0d9f26de5 Mon Sep 17 00:00:00 2001 From: Petr Mikusek Date: Wed, 1 Dec 2021 22:30:50 +0100 Subject: [PATCH 527/818] Added Alpine 3.15 - removed Alpine 3.12 and 3.13 to keep only two Alpine variants --- 12/alpine3.13/Dockerfile | 98 ------------------- 12/{alpine3.12 => alpine3.15}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 14/alpine3.13/Dockerfile | 98 ------------------- 14/{alpine3.12 => alpine3.15}/Dockerfile | 2 +- .../alpine3.15}/docker-entrypoint.sh | 0 16/alpine3.12/docker-entrypoint.sh | 11 --- 16/alpine3.13/Dockerfile | 98 ------------------- 16/alpine3.13/docker-entrypoint.sh | 11 --- 16/{alpine3.12 => alpine3.15}/Dockerfile | 2 +- .../alpine3.15}/docker-entrypoint.sh | 0 17/alpine3.12/docker-entrypoint.sh | 11 --- 17/alpine3.13/Dockerfile | 98 ------------------- 17/alpine3.13/docker-entrypoint.sh | 11 --- 17/{alpine3.12 => alpine3.15}/Dockerfile | 2 +- .../alpine3.15}/docker-entrypoint.sh | 0 architectures | 14 +-- config | 2 +- versions.json | 56 +++-------- 19 files changed, 24 insertions(+), 492 deletions(-) delete mode 100644 12/alpine3.13/Dockerfile rename 12/{alpine3.12 => alpine3.15}/Dockerfile (99%) rename 12/{alpine3.12 => alpine3.15}/docker-entrypoint.sh (100%) delete mode 100644 14/alpine3.13/Dockerfile rename 14/{alpine3.12 => alpine3.15}/Dockerfile (99%) rename {12/alpine3.13 => 14/alpine3.15}/docker-entrypoint.sh (100%) delete mode 100755 16/alpine3.12/docker-entrypoint.sh delete mode 100644 16/alpine3.13/Dockerfile delete mode 100755 16/alpine3.13/docker-entrypoint.sh rename 16/{alpine3.12 => alpine3.15}/Dockerfile (99%) rename {14/alpine3.12 => 16/alpine3.15}/docker-entrypoint.sh (100%) delete mode 100755 17/alpine3.12/docker-entrypoint.sh delete mode 100644 17/alpine3.13/Dockerfile delete mode 100755 17/alpine3.13/docker-entrypoint.sh rename 17/{alpine3.12 => alpine3.15}/Dockerfile (99%) rename {14/alpine3.13 => 17/alpine3.15}/docker-entrypoint.sh (100%) diff --git a/12/alpine3.13/Dockerfile b/12/alpine3.13/Dockerfile deleted file mode 100644 index f802954ca2..0000000000 --- a/12/alpine3.13/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -FROM alpine:3.13 - -ENV NODE_VERSION 12.22.8 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="9cc1d120c404d66a62d6e4daaba361e8e1996bdc5b9643f97bbd1241247332df" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.17 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/alpine3.12/Dockerfile b/12/alpine3.15/Dockerfile similarity index 99% rename from 12/alpine3.12/Dockerfile rename to 12/alpine3.15/Dockerfile index 036510c7c6..9dd38b8885 100644 --- a/12/alpine3.12/Dockerfile +++ b/12/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.15 ENV NODE_VERSION 12.22.8 diff --git a/12/alpine3.12/docker-entrypoint.sh b/12/alpine3.15/docker-entrypoint.sh similarity index 100% rename from 12/alpine3.12/docker-entrypoint.sh rename to 12/alpine3.15/docker-entrypoint.sh diff --git a/14/alpine3.13/Dockerfile b/14/alpine3.13/Dockerfile deleted file mode 100644 index e7896f5be1..0000000000 --- a/14/alpine3.13/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -FROM alpine:3.13 - -ENV NODE_VERSION 14.18.2 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="7a1a1a18e51ad20245fc366a0848cdb55e968094c807a094555ec2c214e8e9c6" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.15 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/alpine3.12/Dockerfile b/14/alpine3.15/Dockerfile similarity index 99% rename from 14/alpine3.12/Dockerfile rename to 14/alpine3.15/Dockerfile index 8a898ccef4..7c14bd1082 100644 --- a/14/alpine3.12/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.15 ENV NODE_VERSION 14.18.2 diff --git a/12/alpine3.13/docker-entrypoint.sh b/14/alpine3.15/docker-entrypoint.sh similarity index 100% rename from 12/alpine3.13/docker-entrypoint.sh rename to 14/alpine3.15/docker-entrypoint.sh diff --git a/16/alpine3.12/docker-entrypoint.sh b/16/alpine3.12/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/alpine3.12/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/alpine3.13/Dockerfile b/16/alpine3.13/Dockerfile deleted file mode 100644 index 61c36ad33e..0000000000 --- a/16/alpine3.13/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -FROM alpine:3.13 - -ENV NODE_VERSION 16.13.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="3b4c47e5554fa466651a767691fc76c09b6a514b49d79bbd0061e549614adedf" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.15 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/alpine3.13/docker-entrypoint.sh b/16/alpine3.13/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/alpine3.13/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/alpine3.12/Dockerfile b/16/alpine3.15/Dockerfile similarity index 99% rename from 16/alpine3.12/Dockerfile rename to 16/alpine3.15/Dockerfile index cc63987175..727452731b 100644 --- a/16/alpine3.12/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.15 ENV NODE_VERSION 16.13.1 diff --git a/14/alpine3.12/docker-entrypoint.sh b/16/alpine3.15/docker-entrypoint.sh similarity index 100% rename from 14/alpine3.12/docker-entrypoint.sh rename to 16/alpine3.15/docker-entrypoint.sh diff --git a/17/alpine3.12/docker-entrypoint.sh b/17/alpine3.12/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/alpine3.12/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/alpine3.13/Dockerfile b/17/alpine3.13/Dockerfile deleted file mode 100644 index 5062d8202b..0000000000 --- a/17/alpine3.13/Dockerfile +++ /dev/null @@ -1,98 +0,0 @@ -FROM alpine:3.13 - -ENV NODE_VERSION 17.3.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="38dbde2dc8eae0d6756c89c88a21d5dc6b41952184c8fe6e96a31fba987f2372" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.17 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/alpine3.13/docker-entrypoint.sh b/17/alpine3.13/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/alpine3.13/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/alpine3.12/Dockerfile b/17/alpine3.15/Dockerfile similarity index 99% rename from 17/alpine3.12/Dockerfile rename to 17/alpine3.15/Dockerfile index 9f1492d501..b1fcb84a43 100644 --- a/17/alpine3.12/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.15 ENV NODE_VERSION 17.3.0 diff --git a/14/alpine3.13/docker-entrypoint.sh b/17/alpine3.15/docker-entrypoint.sh similarity index 100% rename from 14/alpine3.13/docker-entrypoint.sh rename to 17/alpine3.15/docker-entrypoint.sh diff --git a/architectures b/architectures index 44c101d4a1..02a1af213f 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.12,alpine3.13,alpine3.14 -arm32v7 alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -i386 alpine3.12,alpine3.13,alpine3.14 -ppc64le alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.12,alpine3.13,alpine3.14,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.14,alpine3.15 +arm32v7 alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +i386 alpine3.14,alpine3.15 +ppc64le alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index c30f6066c4..96a9a3e833 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant stretch -alpine_version 3.14 +alpine_version 3.15 debian_versions stretch bullseye buster diff --git a/versions.json b/versions.json index b063ff743a..7932d6b0a3 100644 --- a/versions.json +++ b/versions.json @@ -5,18 +5,10 @@ "maintenance": "2022-04-01", "end": "2022-06-01", "codename": "", - "alpine-default": "alpine3.14", + "alpine-default": "alpine3.15", "debian-default": "bullseye", "variants": { - "alpine3.12": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.13": [ + "alpine3.14": [ "amd64", "arm32v6", "arm32v7", @@ -24,7 +16,7 @@ "ppc64le", "s390x" ], - "alpine3.14": [ + "alpine3.15": [ "amd64", "arm32v6", "arm32v7", @@ -78,18 +70,10 @@ "maintenance": "2022-10-18", "end": "2024-04-30", "codename": "gallium", - "alpine-default": "alpine3.14", + "alpine-default": "alpine3.15", "debian-default": "buster", "variants": { - "alpine3.12": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.13": [ + "alpine3.14": [ "amd64", "arm32v6", "arm32v7", @@ -97,7 +81,7 @@ "ppc64le", "s390x" ], - "alpine3.14": [ + "alpine3.15": [ "amd64", "arm32v6", "arm32v7", @@ -151,18 +135,10 @@ "maintenance": "2021-10-19", "end": "2023-04-30", "codename": "fermium", - "alpine-default": "alpine3.14", + "alpine-default": "alpine3.15", "debian-default": "stretch", "variants": { - "alpine3.12": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.13": [ + "alpine3.14": [ "amd64", "arm32v6", "arm32v7", @@ -170,7 +146,7 @@ "ppc64le", "s390x" ], - "alpine3.14": [ + "alpine3.15": [ "amd64", "arm32v6", "arm32v7", @@ -224,18 +200,10 @@ "maintenance": "2020-11-30", "end": "2022-04-30", "codename": "erbium", - "alpine-default": "alpine3.14", + "alpine-default": "alpine3.15", "debian-default": "stretch", "variants": { - "alpine3.12": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.13": [ + "alpine3.14": [ "amd64", "arm32v6", "arm32v7", @@ -243,7 +211,7 @@ "ppc64le", "s390x" ], - "alpine3.14": [ + "alpine3.15": [ "amd64", "arm32v6", "arm32v7", From 3bc55c2f43a0a52a95bb423484d05369de941a0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Dec 2021 07:03:44 +0000 Subject: [PATCH 528/818] chore(deps): bump actions/setup-node from 2.5.0 to 2.5.1 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.5.0...v2.5.1) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 0b95db6c95..7d4c68111f 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.5.0 + - uses: actions/setup-node@v2.5.1 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index a11af37920..fd6fabca55 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.5.0 + - uses: actions/setup-node@v2.5.1 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 267aac0233..1f4637859e 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.5.0 + - uses: actions/setup-node@v2.5.1 with: node-version: '12.x' - name: Install markdown-link-check From 2fb063031efa1db14177f04577d64cfae0f9af35 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 29 Dec 2021 10:15:34 -0500 Subject: [PATCH 529/818] ci: unpin setup-node to v2 --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 7d4c68111f..e16f1cc8e2 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.5.1 + - uses: actions/setup-node@v2 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index fd6fabca55..d53b5e44e0 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.5.1 + - uses: actions/setup-node@v2 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 1f4637859e..5ca319ec43 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2.5.1 + - uses: actions/setup-node@v2 with: node-version: '12.x' - name: Install markdown-link-check From 1c1c0001a72a02c3ffa4964537b9a06f75891d33 Mon Sep 17 00:00:00 2001 From: Jeff Mealo Date: Thu, 6 Jan 2022 14:59:22 -0500 Subject: [PATCH 530/818] Update BestPractices.md Link to PoLP to clarify why root should be avoided in a container --- docs/BestPractices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 0ab5a415f3..d15c0964e4 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -97,7 +97,7 @@ You can also include Tini [directly in your Dockerfile](https://github.com/krall ## Non-root User -By default, Docker runs container as root which inside of the container can pose as a security issue. You would want to run the container as an unprivileged user wherever possible. The node images provide the `node` user for such purpose. The Docker Image can then be run with the `node` user in the following way: +By default, Docker runs commands inside the container as root which violates the [Principle of Least Privilege (PoLP)](https://en.wikipedia.org/wiki/Principle_of_least_privilege) when superuser permissions are not strictly required. You want to run the container as an unprivileged user whenever possible. The node images provide the `node` user for such purpose. The Docker Image can then be run with the `node` user in the following way: ``` -u "node" From 85ca3893867505ffbffbdf476722d3897fb3da98 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 11 Jan 2022 10:22:45 +0100 Subject: [PATCH 531/818] chore: update with security releases --- 12/alpine3.14/Dockerfile | 4 ++-- 12/alpine3.15/Dockerfile | 4 ++-- 12/bullseye-slim/Dockerfile | 2 +- 12/bullseye/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 14/alpine3.14/Dockerfile | 4 ++-- 14/alpine3.15/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 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 +- 17/alpine3.14/Dockerfile | 4 ++-- 17/alpine3.15/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 32 files changed, 40 insertions(+), 40 deletions(-) diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index 6ce1ecdceb..6d2d4f9288 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.8 +ENV NODE_VERSION 12.22.9 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="9cc1d120c404d66a62d6e4daaba361e8e1996bdc5b9643f97bbd1241247332df" \ + CHECKSUM="bda831fbebfc00d12dbbc59b6d3736350d8cfbd495753c725800db10e591eb20" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.15/Dockerfile b/12/alpine3.15/Dockerfile index 9dd38b8885..3dfe43ccd6 100644 --- a/12/alpine3.15/Dockerfile +++ b/12/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 12.22.8 +ENV NODE_VERSION 12.22.9 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="9cc1d120c404d66a62d6e4daaba361e8e1996bdc5b9643f97bbd1241247332df" \ + CHECKSUM="bda831fbebfc00d12dbbc59b6d3736350d8cfbd495753c725800db10e591eb20" \ ;; \ *) ;; \ esac \ diff --git a/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile index 7db8c3ce22..4951c794f8 100644 --- a/12/bullseye-slim/Dockerfile +++ b/12/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 12.22.8 +ENV NODE_VERSION 12.22.9 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index cff6702c11..75fd17ddb3 100644 --- a/12/bullseye/Dockerfile +++ b/12/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 12.22.8 +ENV NODE_VERSION 12.22.9 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 157f6e0452..062622d792 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.8 +ENV NODE_VERSION 12.22.9 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 60cf18445b..9cafcbcbec 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.8 +ENV NODE_VERSION 12.22.9 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 70199d8f89..fcd36cafda 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.8 +ENV NODE_VERSION 12.22.9 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 71cca2885e..221a90bedf 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.8 +ENV NODE_VERSION 12.22.9 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index 1c0d9e3989..f183fdd75e 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.18.2 +ENV NODE_VERSION 14.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="7a1a1a18e51ad20245fc366a0848cdb55e968094c807a094555ec2c214e8e9c6" \ + CHECKSUM="5e148aaf5f728f38ded2daa20b0844e3afd422cf9dd6072958e476cf7437c5f3" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 7c14bd1082..2928381bac 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.18.2 +ENV NODE_VERSION 14.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="7a1a1a18e51ad20245fc366a0848cdb55e968094c807a094555ec2c214e8e9c6" \ + CHECKSUM="5e148aaf5f728f38ded2daa20b0844e3afd422cf9dd6072958e476cf7437c5f3" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index d037f46aeb..731bdd11e7 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.18.2 +ENV NODE_VERSION 14.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 35e34003f1..a924b53374 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.18.2 +ENV NODE_VERSION 14.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index c19e5a943b..6fcc9fdcd9 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.18.2 +ENV NODE_VERSION 14.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index a2e4bc4eb0..a6971a0c13 100644 --- a/14/buster/Dockerfile +++ b/14/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.18.2 +ENV NODE_VERSION 14.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index d86578aad8..ef45d191fd 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.18.2 +ENV NODE_VERSION 14.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index e962383b93..1bf33e9d4a 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.18.2 +ENV NODE_VERSION 14.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index fd95d27dd1..a61a2f9a83 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.13.1 +ENV NODE_VERSION 16.13.2 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="3b4c47e5554fa466651a767691fc76c09b6a514b49d79bbd0061e549614adedf" \ + CHECKSUM="3ecc84e21b481cd47b10e7ad77512a84a26c18f060efbe41e65e94d48e05bd8c" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index 727452731b..69fee2f506 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.13.1 +ENV NODE_VERSION 16.13.2 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="3b4c47e5554fa466651a767691fc76c09b6a514b49d79bbd0061e549614adedf" \ + CHECKSUM="3ecc84e21b481cd47b10e7ad77512a84a26c18f060efbe41e65e94d48e05bd8c" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 74deb6038f..ce3813a980 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.13.1 +ENV NODE_VERSION 16.13.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 7b2a05aa3a..075d226d08 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.13.1 +ENV NODE_VERSION 16.13.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index d104a2057f..967ac95e8d 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.13.1 +ENV NODE_VERSION 16.13.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 312f401bd3..2f72a432d8 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.13.1 +ENV NODE_VERSION 16.13.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 804e8c3e08..a03156be41 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.13.1 +ENV NODE_VERSION 16.13.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index fa31600b07..0641052b6b 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.13.1 +ENV NODE_VERSION 16.13.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 794a498e90..9cd08ece38 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.3.0 +ENV NODE_VERSION 17.3.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="38dbde2dc8eae0d6756c89c88a21d5dc6b41952184c8fe6e96a31fba987f2372" \ + CHECKSUM="1939eddafeb8bef10f3dac4c7df274d0bb13275459c4cbf626fa7fd1aff66230" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index b1fcb84a43..ed3865a2ed 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.3.0 +ENV NODE_VERSION 17.3.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="38dbde2dc8eae0d6756c89c88a21d5dc6b41952184c8fe6e96a31fba987f2372" \ + CHECKSUM="1939eddafeb8bef10f3dac4c7df274d0bb13275459c4cbf626fa7fd1aff66230" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 3876a8b8ed..2d998cf42e 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.3.0 +ENV NODE_VERSION 17.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 0378be52e3..5693c02519 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.3.0 +ENV NODE_VERSION 17.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 64b97734fb..11624fa9f4 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.3.0 +ENV NODE_VERSION 17.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 25a61e59a2..4fb21f51df 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.3.0 +ENV NODE_VERSION 17.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index 4200b20fd1..e2881cffbe 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.3.0 +ENV NODE_VERSION 17.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index d3472b54c1..d57e05cd07 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.3.0 +ENV NODE_VERSION 17.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5cafbd5b0462317bd024bb281af49585013473cd Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 18 Jan 2022 20:12:53 -0500 Subject: [PATCH 532/818] feat: Node.js 17.4.0 --- 17/alpine3.14/Dockerfile | 4 ++-- 17/alpine3.15/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 9cd08ece38..04aeff3686 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.3.1 +ENV NODE_VERSION 17.4.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="1939eddafeb8bef10f3dac4c7df274d0bb13275459c4cbf626fa7fd1aff66230" \ + CHECKSUM="4d72694d1e97ebc6eeca5f0401aef471d412e67c057a0c7cc7d79740af3d3d13" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index ed3865a2ed..ad302aa73a 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.3.1 +ENV NODE_VERSION 17.4.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="1939eddafeb8bef10f3dac4c7df274d0bb13275459c4cbf626fa7fd1aff66230" \ + CHECKSUM="4d72694d1e97ebc6eeca5f0401aef471d412e67c057a0c7cc7d79740af3d3d13" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 2d998cf42e..1a94a582e1 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.3.1 +ENV NODE_VERSION 17.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 5693c02519..480f2164f3 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.3.1 +ENV NODE_VERSION 17.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 11624fa9f4..b39b0cab98 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.3.1 +ENV NODE_VERSION 17.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 4fb21f51df..982251bb95 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.3.1 +ENV NODE_VERSION 17.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index e2881cffbe..49611cbc75 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.3.1 +ENV NODE_VERSION 17.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index d57e05cd07..4d38222eaf 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.3.1 +ENV NODE_VERSION 17.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f62de3fcb17d8b306235ac3422612274687a3dbf Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 1 Feb 2022 21:54:13 +0800 Subject: [PATCH 533/818] Clean up temp Dockerfile in update.sh before fatal exit --- update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/update.sh b/update.sh index c3735f8d42..0e443d4202 100755 --- a/update.sh +++ b/update.sh @@ -160,6 +160,7 @@ function update_node_version() { curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1 ) if [ -z "$checksum" ]; then + rm -f "${dockerfile}-tmp" fatal "Failed to fetch checksum for version ${nodeVersion}" fi sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" From b36041b26d8423f1838fb8232411a12f882cbb6a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 1 Feb 2022 21:38:34 +0800 Subject: [PATCH 534/818] Update node.js v14 from 14.18.3 to 14.19.0 with Yarn v1.22.17 - https://nodejs.org/en/blog/release/v14.19.0/ - https://github.com/nodejs/node/releases/tag/v14.19.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V14.md#14.19.0 --- 14/alpine3.14/Dockerfile | 6 +++--- 14/alpine3.15/Dockerfile | 6 +++--- 14/bullseye-slim/Dockerfile | 4 ++-- 14/bullseye/Dockerfile | 4 ++-- 14/buster-slim/Dockerfile | 4 ++-- 14/buster/Dockerfile | 4 ++-- 14/stretch-slim/Dockerfile | 4 ++-- 14/stretch/Dockerfile | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index f183fdd75e..3638396d43 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.18.3 +ENV NODE_VERSION 14.19.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="5e148aaf5f728f38ded2daa20b0844e3afd422cf9dd6072958e476cf7437c5f3" \ + CHECKSUM="8d5e638d88b62de2f147dee812a5d74e4860a20468eb7ff32c41a02b58e2aebf" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 2928381bac..53f80f96ed 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.18.3 +ENV NODE_VERSION 14.19.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="5e148aaf5f728f38ded2daa20b0844e3afd422cf9dd6072958e476cf7437c5f3" \ + CHECKSUM="8d5e638d88b62de2f147dee812a5d74e4860a20468eb7ff32c41a02b58e2aebf" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 731bdd11e7..af9a1d1621 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.18.3 +ENV NODE_VERSION 14.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index a924b53374..903e2db696 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.18.3 +ENV NODE_VERSION 14.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 6fcc9fdcd9..11592b927a 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.18.3 +ENV NODE_VERSION 14.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index a6971a0c13..bf0d6d31e4 100644 --- a/14/buster/Dockerfile +++ b/14/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.18.3 +ENV NODE_VERSION 14.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index ef45d191fd..6eaa7db455 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.18.3 +ENV NODE_VERSION 14.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 1bf33e9d4a..a624660441 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.18.3 +ENV NODE_VERSION 14.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ From 40ac15da3755945e22116d228f1cff8f5048a4ea Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 3 Feb 2022 19:48:06 +0800 Subject: [PATCH 535/818] Update node.js v12 from v12.22.9 to v12.22.10 Reference: - https://nodejs.org/en/blog/release/v12.22.10/ - https://github.com/nodejs/node/releases/tag/v12.22.10 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md#12.22.10 --- 12/alpine3.14/Dockerfile | 4 ++-- 12/alpine3.15/Dockerfile | 4 ++-- 12/bullseye-slim/Dockerfile | 2 +- 12/bullseye/Dockerfile | 2 +- 12/buster-slim/Dockerfile | 2 +- 12/buster/Dockerfile | 2 +- 12/stretch-slim/Dockerfile | 2 +- 12/stretch/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index 6d2d4f9288..2f60cf3e29 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.9 +ENV NODE_VERSION 12.22.10 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="bda831fbebfc00d12dbbc59b6d3736350d8cfbd495753c725800db10e591eb20" \ + CHECKSUM="ec1e2f0c33a495002ffb1647159d8e17643e2f229c0f4fe2c1be33398f56b5f4" \ ;; \ *) ;; \ esac \ diff --git a/12/alpine3.15/Dockerfile b/12/alpine3.15/Dockerfile index 3dfe43ccd6..4b1cfb3f4a 100644 --- a/12/alpine3.15/Dockerfile +++ b/12/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 12.22.9 +ENV NODE_VERSION 12.22.10 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="bda831fbebfc00d12dbbc59b6d3736350d8cfbd495753c725800db10e591eb20" \ + CHECKSUM="ec1e2f0c33a495002ffb1647159d8e17643e2f229c0f4fe2c1be33398f56b5f4" \ ;; \ *) ;; \ esac \ diff --git a/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile index 4951c794f8..52a5c95178 100644 --- a/12/bullseye-slim/Dockerfile +++ b/12/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 12.22.9 +ENV NODE_VERSION 12.22.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index 75fd17ddb3..f72f7b7fac 100644 --- a/12/bullseye/Dockerfile +++ b/12/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 12.22.9 +ENV NODE_VERSION 12.22.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 062622d792..0dfd7fc9eb 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.9 +ENV NODE_VERSION 12.22.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile index 9cafcbcbec..52f50a26a0 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.9 +ENV NODE_VERSION 12.22.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index fcd36cafda..034a06231f 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.9 +ENV NODE_VERSION 12.22.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile index 221a90bedf..15d207f1ae 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.9 +ENV NODE_VERSION 12.22.10 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 01182bc019a77eb0a91836fa853ca768ac7ca138 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 3 Feb 2022 19:51:08 +0800 Subject: [PATCH 536/818] Use `-V` instead of `-n` to sort in update.sh, fix #1636 Fix the problem that `update.sh` didn't pick up the latest version of node.js v12: v12.22.10. We should use `sort -V` instead of `sort -n` here. The order is a little bit different: | Result from `sort -V` | Result from `sort -n` | | ---- | ---- | | 0.0 | 0.0 | | 1.0 | 1.0 | | 2.0 | 2.0 | | 3.0 | 3.0 | | 3.1 | 3.1 | | 4.0 | 4.0 | | 5.0 | 5.0 | | 6.0 | 6.0 | | 7.0 | 7.0 | | 8.0 | 8.0 | | 8.1 | 8.1 | | 9.0 | 9.0 | | 9.1 | 9.1 | | 10.0 | 10.0 | | 11.0 | 11.0 | | 11.1 | 11.1 | | 12.0 | 12.0 | | 13.0 | 13.0 | | 13.1 | 13.1 | | 14.0 | 14.0 | | 14.1 | 14.1 | | 15.0 | 15.0 | | 16.0 | 16.0 | | 16.1 | 16.1 | | 16.2 | 16.2 | | 16.3 | 16.3 | | 17.0 | 17.0 | | 18.0 | 18.0 | | 18.1 | 18.1 | | 18.2 | 18.2 | | 18.3 | 18.3 | | 18.4 | 18.4 | | 19.0 | 19.0 | | 19.1 | 19.1 | | 20.0 | 20.0 | | 20.1 | 20.1 | | 20.2 | 20.2 | | 21.0 | 21.0 | | 22.0 | 22.0 | | 22.1 | 22.1 | | **22.10** | **22.2** | | 22.2 | 22.3 | | 22.3 | 22.4 | | 22.4 | 22.5 | | 22.5 | 22.6 | | 22.6 | 22.7 | | 22.7 | 22.8 | | 22.8 | 22.9 | | **22.9** | **22.10** | --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 0e443d4202..44872c81d1 100755 --- a/update.sh +++ b/update.sh @@ -122,7 +122,7 @@ function update_node_version() { shift fi - fullVersion="$(curl -sSL --compressed "${baseuri}" | grep ' Date: Wed, 9 Feb 2022 01:19:08 +0100 Subject: [PATCH 537/818] chore: update to v16.14.0 --- 16/alpine3.14/Dockerfile | 6 +++--- 16/alpine3.15/Dockerfile | 6 +++--- 16/bullseye-slim/Dockerfile | 4 ++-- 16/bullseye/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 4 ++-- 16/buster/Dockerfile | 4 ++-- 16/stretch-slim/Dockerfile | 4 ++-- 16/stretch/Dockerfile | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index a61a2f9a83..9dcb0dac21 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.13.2 +ENV NODE_VERSION 16.14.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="3ecc84e21b481cd47b10e7ad77512a84a26c18f060efbe41e65e94d48e05bd8c" \ + CHECKSUM="36708b3daa37f9eda5f732cec40690d1338c3c376c0f0ec3c9cb46c6cdf52f1b" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 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 69fee2f506..c69ca8f2de 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.13.2 +ENV NODE_VERSION 16.14.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="3ecc84e21b481cd47b10e7ad77512a84a26c18f060efbe41e65e94d48e05bd8c" \ + CHECKSUM="36708b3daa37f9eda5f732cec40690d1338c3c376c0f0ec3c9cb46c6cdf52f1b" \ ;; \ *) ;; \ esac \ @@ -71,7 +71,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 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 ce3813a980..633cd0c082 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.13.2 +ENV NODE_VERSION 16.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 075d226d08..2415a89cb5 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.13.2 +ENV NODE_VERSION 16.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 967ac95e8d..bf4b78aa20 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.13.2 +ENV NODE_VERSION 16.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 2f72a432d8..3ab2bae01e 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.13.2 +ENV NODE_VERSION 16.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index a03156be41..15511482c0 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.13.2 +ENV NODE_VERSION 16.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -55,7 +55,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 0641052b6b..d366502c9b 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.13.2 +ENV NODE_VERSION 16.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -44,7 +44,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.15 +ENV YARN_VERSION 1.22.17 RUN set -ex \ && for key in \ From 5647d2766ea650f10fb5741e7f6e101b5e5ba0b6 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 23:32:26 +0100 Subject: [PATCH 538/818] chore: update to 17.5.0 --- 17/alpine3.14/Dockerfile | 4 ++-- 17/alpine3.15/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 04aeff3686..72c6d29059 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.4.0 +ENV NODE_VERSION 17.5.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="4d72694d1e97ebc6eeca5f0401aef471d412e67c057a0c7cc7d79740af3d3d13" \ + CHECKSUM="8f4f13abbaf553b102984dc68d2d0c66a12084fbb2a211416e1aaedaaf6eae64" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index ad302aa73a..ae897afffd 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.4.0 +ENV NODE_VERSION 17.5.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="4d72694d1e97ebc6eeca5f0401aef471d412e67c057a0c7cc7d79740af3d3d13" \ + CHECKSUM="8f4f13abbaf553b102984dc68d2d0c66a12084fbb2a211416e1aaedaaf6eae64" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 1a94a582e1..9e03e196df 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.4.0 +ENV NODE_VERSION 17.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 480f2164f3..9ab43217ef 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.4.0 +ENV NODE_VERSION 17.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index b39b0cab98..7c56d2bedf 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.4.0 +ENV NODE_VERSION 17.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 982251bb95..af1cc90d64 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.4.0 +ENV NODE_VERSION 17.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index 49611cbc75..ea14c9a502 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.4.0 +ENV NODE_VERSION 17.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index 4d38222eaf..d3aeddc03b 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.4.0 +ENV NODE_VERSION 17.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 65ce9f8f4a726c231c2942ce090f3c485aaffad2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 07:03:14 +0000 Subject: [PATCH 539/818] chore(deps): bump actions/github-script from 5 to 6 Bumps [actions/github-script](https://github.com/actions/github-script) from 5 to 6. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index d57053fc90..bba269a2bb 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v2 - name: Generate testing matrix - uses: actions/github-script@v5 + uses: actions/github-script@v6 id: generator with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -58,7 +58,7 @@ jobs: steps: - name: Get short node version - uses: actions/github-script@v5 + uses: actions/github-script@v6 id: short-version with: result-encoding: string From 6256caf2c507e7aafdeb8e7f837bab51f46f99e0 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 23 Feb 2022 08:24:24 +0100 Subject: [PATCH 540/818] chore: update to 17.6.0 --- 17/alpine3.14/Dockerfile | 4 ++-- 17/alpine3.15/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 72c6d29059..f65bb50447 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.5.0 +ENV NODE_VERSION 17.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="8f4f13abbaf553b102984dc68d2d0c66a12084fbb2a211416e1aaedaaf6eae64" \ + CHECKSUM="b049228a117aa1cd2917aa67703efc8100973f5451e2dc819d0c534570d3e7c7" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index ae897afffd..506857e4a4 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.5.0 +ENV NODE_VERSION 17.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="8f4f13abbaf553b102984dc68d2d0c66a12084fbb2a211416e1aaedaaf6eae64" \ + CHECKSUM="b049228a117aa1cd2917aa67703efc8100973f5451e2dc819d0c534570d3e7c7" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 9e03e196df..cfa02f3be4 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.5.0 +ENV NODE_VERSION 17.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 9ab43217ef..4e43b237b2 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.5.0 +ENV NODE_VERSION 17.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 7c56d2bedf..04054cb978 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.5.0 +ENV NODE_VERSION 17.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index af1cc90d64..0c44612ab2 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.5.0 +ENV NODE_VERSION 17.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index ea14c9a502..08af585fdd 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.5.0 +ENV NODE_VERSION 17.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index d3aeddc03b..9732a64f2b 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.5.0 +ENV NODE_VERSION 17.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 64724569397cd7a7cc1926195ee67d52f2bd2df3 Mon Sep 17 00:00:00 2001 From: Bryan English Date: Sat, 26 Feb 2022 10:02:31 -0500 Subject: [PATCH 541/818] keys: add key for @bengl Refs: https://github.com/nodejs/Release/issues/730 Refs: https://github.com/nodejs/node/pull/42102 --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index d6d3c68b79..eaa0c9e87b 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,4 +1,5 @@ 4ED778F539E3634C779C87C6D7062848A1AB005C +141F07595B7B3FFE74309A937405533BE57C7D57 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 74F12602B6F1C4E913FAA37AD3A89613643B6201 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 From e1038c648feb0890b2e23c91e8107c723a830172 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:34:13 +0000 Subject: [PATCH 542/818] chore(deps): bump actions/setup-node from 2 to 3 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index e16f1cc8e2..74d15f2a11 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '12.x' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index d53b5e44e0..4861eb1459 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '12.x' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 5ca319ec43..a6245a5b9b 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '12.x' - name: Install markdown-link-check From fb84cc6214e1bbfde9b781fd33e66153121a81a8 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sun, 27 Feb 2022 20:40:45 +0100 Subject: [PATCH 543/818] chore: run all GH actions using Node LTS, not v12 --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 74d15f2a11..f8c55963d6 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v3 with: - node-version: '12.x' + node-version: 'lts/*' - name: Install doctoc run: npm i -g doctoc - name: Create README copy and diff with doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 4861eb1459..221e7db016 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -9,6 +9,6 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v3 with: - node-version: '12.x' + node-version: 'lts/*' - run: npm i -g eclint - run: eclint check diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index a6245a5b9b..9c0c66e51c 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v3 with: - node-version: '12.x' + node-version: 'lts/*' - name: Install markdown-link-check run: npm i -g markdown-link-check - name: Run markdown-link-check on MD files From 0efe196a89c1d2cc7605620b2adf6b475ae1809c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Mar 2022 07:24:29 +0000 Subject: [PATCH 544/818] chore(deps): bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 4 ++-- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- .github/workflows/missing-checksum.yml | 2 +- .github/workflows/official-pr.yml | 4 ++-- .github/workflows/shfmt.yml | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index bba269a2bb..39dcb965df 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -28,7 +28,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Generate testing matrix uses: actions/github-script@v6 @@ -65,7 +65,7 @@ jobs: script: return "${{ matrix.version }}".split('.')[0] - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build image uses: docker/build-push-action@v2 diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index f8c55963d6..8372419901 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -11,7 +11,7 @@ jobs: name: Doc TOC Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: 'lts/*' diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 221e7db016..5640a33ed0 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -6,7 +6,7 @@ jobs: eclint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: 'lts/*' diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 9c0c66e51c..7533c20095 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -9,7 +9,7 @@ jobs: markdown-link-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: node-version: 'lts/*' diff --git a/.github/workflows/missing-checksum.yml b/.github/workflows/missing-checksum.yml index cbd870ccf0..cb221627df 100644 --- a/.github/workflows/missing-checksum.yml +++ b/.github/workflows/missing-checksum.yml @@ -10,7 +10,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Count number of Alpine Dockersfiles without CHECKSUM run: | diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 6e1dea6f43..d798723f27 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -19,14 +19,14 @@ jobs: steps: - name: Checkout the docker-node repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: docker-node ref: ${{ github.base_ref }} fetch-depth: 50 - name: Checkout the official-images repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: official-images repository: docker-library/official-images diff --git a/.github/workflows/shfmt.yml b/.github/workflows/shfmt.yml index 1427dd1cb8..a74db25986 100644 --- a/.github/workflows/shfmt.yml +++ b/.github/workflows/shfmt.yml @@ -9,12 +9,12 @@ jobs: shfmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - run: docker run -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . - run: git diff --color --exit-code shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - run: shellcheck *.sh From 62262f41d4fe8ad4851933a9f3c02545dc44fdf7 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 10 Mar 2022 18:18:08 -0300 Subject: [PATCH 545/818] Automating docker-node part of the official Node Docker images release process (#1646) Co-authored-by: Simen Bekkhus Co-authored-by: Pedro Henrique --- .github/workflows/automatic-updates.yml | 54 ++++++++++++ build-automation.mjs | 104 ++++++++++++++++++++++++ check-pr-status.mjs | 29 +++++++ functions.sh | 2 + 4 files changed, 189 insertions(+) create mode 100644 .github/workflows/automatic-updates.yml create mode 100644 build-automation.mjs create mode 100644 check-pr-status.mjs diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml new file mode 100644 index 0000000000..bbbc29bb6b --- /dev/null +++ b/.github/workflows/automatic-updates.yml @@ -0,0 +1,54 @@ +name: Automatically update Docker image versions + +on: + schedule: + - cron: "*/15 * * * *" + +jobs: + build: + runs-on: ubuntu-latest + if: github.repository_owner == 'nodejs' + + steps: + - uses: actions/checkout@v3 + + - name: Run automation script + uses: actions/github-script@v6 + id: updt + with: + script: | + const { default: script } = await import(`${process.env.GITHUB_WORKSPACE}/build-automation.mjs`); + await script(github); + + - name: Create update PR + id: cpr + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + branch: update-branch + base: main + commit-message: "Update to ${{ steps.updt.outputs.updated-versions }}" + title: "Update to ${{ steps.updt.outputs.updated-versions }}" + delete-branch: true + team-reviewers: | + @nodejs/docker + + - name: Check CI status periodically + uses: actions/github-script@v6 + with: + script: | + const { default: script } = await import(`${process.env.GITHUB_WORKSPACE}/check-pr-status.mjs`); + await script(github, '${{ github.repository }}', ${{ steps.cpr.outputs.pull-request-number }}); + + - name: Auto-approve the PR + uses: juliangruber/approve-pull-request-action@v1 + with: + # Cannot use `GITHUB_TOKEN` as it's not allowed to approve own PR + github-token: ${{ secrets.GH_API_TOKEN }} + number: ${{ steps.cpr.outputs.pull-request-number }} + + - name: Merge PR + uses: juliangruber/merge-pull-request-action@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + number: ${{ steps.cpr.outputs.pull-request-number }} diff --git a/build-automation.mjs b/build-automation.mjs new file mode 100644 index 0000000000..952f3b8e9c --- /dev/null +++ b/build-automation.mjs @@ -0,0 +1,104 @@ +import { promisify } from "util"; + +import child_process from "child_process"; + +const exec = promisify(child_process.exec); + +// a function that queries the Node.js release website for new versions, +// compare the available ones with the ones we use in this repo +// and returns whether we should update or not +const checkIfThereAreNewVersions = async (github) => { + try { + const { stdout: versionsOutput } = await exec(". ./functions.sh && get_versions", { shell: "bash" }); + + const supportedVersions = versionsOutput.trim().split(" "); + + let latestSupportedVersions = {}; + + for (let supportedVersion of supportedVersions) { + const { stdout } = await exec(`ls ${supportedVersion}`); + + const { stdout: fullVersionOutput } = await exec(`. ./functions.sh && get_full_version ./${supportedVersion}/${stdout.trim().split("\n")[0]}`, { shell: "bash" }); + + console.log(fullVersionOutput); + + latestSupportedVersions[supportedVersion] = { fullVersion: fullVersionOutput.trim() }; + } + + const { data: availableVersionsJson } = await github.request('https://nodejs.org/download/release/index.json'); + + // filter only more recent versions of availableVersionsJson for each major version in latestSupportedVersions' keys + // e.g. if latestSupportedVersions = { "12": "12.22.10", "14": "14.19.0", "16": "16.14.0", "17": "17.5.0" } + // and availableVersions = ["Node.js 12.22.10", "Node.js 12.24.0", "Node.js 14.19.0", "Node.js 14.22.0", "Node.js 16.14.0", "Node.js 16.16.0", "Node.js 17.5.0", "Node.js 17.8.0"] + // return { "12": "12.24.0", "14": "14.22.0", "16": "16.16.0", "17": "17.8.0" } + + let filteredNewerVersions = {}; + + for (let availableVersion of availableVersionsJson) { + const [availableMajor, availableMinor, availablePatch] = availableVersion.version.split("v")[1].split("."); + if (latestSupportedVersions[availableMajor] == null) { + continue; + } + const [_latestMajor, latestMinor, latestPatch] = latestSupportedVersions[availableMajor].fullVersion.split("."); + if (latestSupportedVersions[availableMajor] && (Number(availableMinor) > Number(latestMinor) || (availableMinor === latestMinor && Number(availablePatch) > Number(latestPatch)))) { + filteredNewerVersions[availableMajor] = { fullVersion: `${availableMajor}.${availableMinor}.${availablePatch}` }; + } + } + + return { + shouldUpdate: Object.keys(filteredNewerVersions).length > 0 && JSON.stringify(filteredNewerVersions) !== JSON.stringify(latestSupportedVersions), + versions: filteredNewerVersions, + } + } catch (error) { + console.error(error); + process.exit(1); + } +}; + +// a function that queries the Node.js unofficial release website for new musl versions and security releases, +// and returns relevant information +const checkForMuslVersionsAndSecurityReleases = async (github, versions) => { + try { + const { data: unofficialBuildsIndexText } = await github.request('https://unofficial-builds.nodejs.org/download/release/index.json'); + + for (let version of Object.keys(versions)) { + const { data: unofficialBuildsWebsiteText } = await github.request(`https://unofficial-builds.nodejs.org/download/release/v${versions[version].fullVersion}`); + + versions[version].muslBuildExists = unofficialBuildsWebsiteText.includes("musl"); + versions[version].isSecurityRelease = unofficialBuildsIndexText.find(indexVersion => indexVersion.version === `v${versions[version].fullVersion}`)?.security; + } + return versions; + } catch (error) { + console.error(error); + process.exit(1); + } +}; + +export default async function(github) { +// if there are no new versions, exit gracefully +// if there are new versions, +// check for musl builds +// then run update.sh + const { shouldUpdate, versions } = await checkIfThereAreNewVersions(github); + + if (!shouldUpdate) { + console.log("No new versions found. No update required."); + process.exit(0); + } else { + const newVersions = await checkForMuslVersionsAndSecurityReleases(github, versions); + let updatedVersions = []; + for (let version of Object.keys(newVersions)) { + if (newVersions[version].muslBuildExists) { + const { stdout } = await exec(`./update.sh ${newVersions[version].isSecurityRelease ? "-s " : ""}${version}`); + console.log(stdout); + updatedVersions.push(newVersions[version].fullVersion); + } else { + console.log(`There's no musl build for version ${newVersions[version].fullVersion} yet.`); + process.exit(0); + } + } + console.log(`::set-output name=updated-versions::${updatedVersions.join(',')}`); + const { stdout } = (await exec(`git diff`)); + console.log(stdout); + } +} diff --git a/check-pr-status.mjs b/check-pr-status.mjs new file mode 100644 index 0000000000..799c0e35d9 --- /dev/null +++ b/check-pr-status.mjs @@ -0,0 +1,29 @@ +// fetch /repos/{owner}/{repo}/pulls/{pull_number} +// and check its mergeable_state +// if "clean", exit with status code 0 +// else exit with error +import { setTimeout } from 'timers/promises'; + +const tries = 10; +const retryDelay = 30000; + +export default async function(github, repository, pull_number) { + const [owner, repo] = repository.split('/'); + await setTimeout(retryDelay); + + for (let t = 0; t < tries; t++) { + try { + const { data } = await github.rest.pulls.get({owner, repo, pull_number}) + + console.log(data); + if (data.mergeable_state === 'clean') { + process.exit(0); + } + await setTimeout(retryDelay); + } catch (error) { + console.error(error); + process.exit(1); + } + } + process.exit(1); +} diff --git a/functions.sh b/functions.sh index be9c575396..df1883f732 100755 --- a/functions.sh +++ b/functions.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash # # Utlity functions +# Don't change this file unless needed +# The GitHub Action for automating new builds rely on this file info() { printf "%s\\n" "$@" From 8a5843eb20862bf9a11d86f6f936b3bad21aca6b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 10 Mar 2022 22:39:49 -0500 Subject: [PATCH 546/818] feat: NodeJS 17.7.1 --- 17/alpine3.14/Dockerfile | 5 +++-- 17/alpine3.15/Dockerfile | 5 +++-- 17/bullseye-slim/Dockerfile | 3 ++- 17/bullseye/Dockerfile | 3 ++- 17/buster-slim/Dockerfile | 3 ++- 17/buster/Dockerfile | 3 ++- 17/stretch-slim/Dockerfile | 3 ++- 17/stretch/Dockerfile | 3 ++- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index f65bb50447..9604ed2f9b 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.6.0 +ENV NODE_VERSION 17.7.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="b049228a117aa1cd2917aa67703efc8100973f5451e2dc819d0c534570d3e7c7" \ + CHECKSUM="4cf1b82ab32106482f25167b4143762a51c98baf18c19a51ba3515cb7e021fdc" \ ;; \ *) ;; \ esac \ @@ -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/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index 506857e4a4..83513b818c 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.6.0 +ENV NODE_VERSION 17.7.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="b049228a117aa1cd2917aa67703efc8100973f5451e2dc819d0c534570d3e7c7" \ + CHECKSUM="4cf1b82ab32106482f25167b4143762a51c98baf18c19a51ba3515cb7e021fdc" \ ;; \ *) ;; \ esac \ @@ -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/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index cfa02f3be4..c624033586 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.6.0 +ENV NODE_VERSION 17.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 4e43b237b2..88705b5531 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.6.0 +ENV NODE_VERSION 17.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 04054cb978..3bb94ac65e 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.6.0 +ENV NODE_VERSION 17.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/buster/Dockerfile b/17/buster/Dockerfile index 0c44612ab2..6f411b97ae 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.6.0 +ENV NODE_VERSION 17.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index 08af585fdd..d78c83a351 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.6.0 +ENV NODE_VERSION 17.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/stretch/Dockerfile b/17/stretch/Dockerfile index 9732a64f2b..92633f3317 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.6.0 +ENV NODE_VERSION 17.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ From 64779cd47cb67ebc82aa1468a6ec2bcc841c501f Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 11 Mar 2022 07:35:38 +0100 Subject: [PATCH 547/818] chore: use default output from action rather than manual output --- .github/workflows/automatic-updates.yml | 6 +++--- build-automation.mjs | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index bbbc29bb6b..956c24d7f4 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -18,7 +18,7 @@ jobs: with: script: | const { default: script } = await import(`${process.env.GITHUB_WORKSPACE}/build-automation.mjs`); - await script(github); + return script(github); - name: Create update PR id: cpr @@ -27,8 +27,8 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} branch: update-branch base: main - commit-message: "Update to ${{ steps.updt.outputs.updated-versions }}" - title: "Update to ${{ steps.updt.outputs.updated-versions }}" + commit-message: "Update to ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" + title: "Update to ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" delete-branch: true team-reviewers: | @nodejs/docker diff --git a/build-automation.mjs b/build-automation.mjs index 952f3b8e9c..0fc3ea566a 100644 --- a/build-automation.mjs +++ b/build-automation.mjs @@ -97,8 +97,9 @@ export default async function(github) { process.exit(0); } } - console.log(`::set-output name=updated-versions::${updatedVersions.join(',')}`); const { stdout } = (await exec(`git diff`)); console.log(stdout); + + return { updatedVersions }; } } From bb096cca66b5d9f163f10ebc7d6ec823bf0da633 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 11 Mar 2022 07:43:23 +0100 Subject: [PATCH 548/818] chore: remove auto-pr approval --- .github/workflows/automatic-updates.yml | 20 ----------------- check-pr-status.mjs | 29 ------------------------- 2 files changed, 49 deletions(-) delete mode 100644 check-pr-status.mjs diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index bbbc29bb6b..e186e26555 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -32,23 +32,3 @@ jobs: delete-branch: true team-reviewers: | @nodejs/docker - - - name: Check CI status periodically - uses: actions/github-script@v6 - with: - script: | - const { default: script } = await import(`${process.env.GITHUB_WORKSPACE}/check-pr-status.mjs`); - await script(github, '${{ github.repository }}', ${{ steps.cpr.outputs.pull-request-number }}); - - - name: Auto-approve the PR - uses: juliangruber/approve-pull-request-action@v1 - with: - # Cannot use `GITHUB_TOKEN` as it's not allowed to approve own PR - github-token: ${{ secrets.GH_API_TOKEN }} - number: ${{ steps.cpr.outputs.pull-request-number }} - - - name: Merge PR - uses: juliangruber/merge-pull-request-action@v1 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - number: ${{ steps.cpr.outputs.pull-request-number }} diff --git a/check-pr-status.mjs b/check-pr-status.mjs deleted file mode 100644 index 799c0e35d9..0000000000 --- a/check-pr-status.mjs +++ /dev/null @@ -1,29 +0,0 @@ -// fetch /repos/{owner}/{repo}/pulls/{pull_number} -// and check its mergeable_state -// if "clean", exit with status code 0 -// else exit with error -import { setTimeout } from 'timers/promises'; - -const tries = 10; -const retryDelay = 30000; - -export default async function(github, repository, pull_number) { - const [owner, repo] = repository.split('/'); - await setTimeout(retryDelay); - - for (let t = 0; t < tries; t++) { - try { - const { data } = await github.rest.pulls.get({owner, repo, pull_number}) - - console.log(data); - if (data.mergeable_state === 'clean') { - process.exit(0); - } - await setTimeout(retryDelay); - } catch (error) { - console.error(error); - process.exit(1); - } - } - process.exit(1); -} From 9cc4a3efb71e31224af8a6878898a114f7626a24 Mon Sep 17 00:00:00 2001 From: "Md. Rashad Tanjim" <47326039+RashadTanjim@users.noreply.github.com> Date: Sat, 12 Mar 2022 03:04:07 +0600 Subject: [PATCH 549/818] node version update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f792ae297..6446f33e46 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ See: http://nodejs.org ```dockerfile # specify the node base image with your desired version node: -FROM node:10 +FROM node:16 # replace this with your application's default port EXPOSE 8888 ``` From d524d54982b1335af396c8d5d3b8ebda6efda9e8 Mon Sep 17 00:00:00 2001 From: Shane O'Grady Date: Wed, 16 Mar 2022 17:36:58 -0700 Subject: [PATCH 550/818] 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 9dcb0dac21..e5ce2960b9 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 c69ca8f2de..653955df29 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 633cd0c082..fb4a68bc5d 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 2415a89cb5..866bea2653 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 bf4b78aa20..e1a3f5dd0b 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 3ab2bae01e..f6b3db75e2 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 15511482c0..d1ea15a23e 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 d366502c9b..791a478854 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 551/818] 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 e5ce2960b9..4e0c852142 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 653955df29..e43039fc69 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 fb4a68bc5d..c845224248 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 866bea2653..f5ac42a299 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 e1a3f5dd0b..f35cdb0f0b 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 f6b3db75e2..6e1398887d 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 d1ea15a23e..4bedbd5de3 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 791a478854..ca1ac857c9 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 552/818] 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 4e0c852142..9536a045a5 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 e43039fc69..220b8d564e 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 c845224248..a2207c3004 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 f5ac42a299..ad0140d333 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 f35cdb0f0b..a8297c9ec0 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 6e1398887d..a1fdb99b1b 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 4bedbd5de3..5e9aa284a2 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 ca1ac857c9..d09a703011 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 \ From 6e8f32de3f620833e563e9f2b427d50055783801 Mon Sep 17 00:00:00 2001 From: SimenB Date: Fri, 18 Mar 2022 08:23:38 +0000 Subject: [PATCH 553/818] Update to 12.22.11,14.19.1,16.14.2,17.7.2 --- 12/alpine3.14/Dockerfile | 5 +++-- 12/alpine3.15/Dockerfile | 5 +++-- 12/bullseye-slim/Dockerfile | 3 ++- 12/bullseye/Dockerfile | 3 ++- 12/buster-slim/Dockerfile | 3 ++- 12/buster/Dockerfile | 3 ++- 12/stretch-slim/Dockerfile | 3 ++- 12/stretch/Dockerfile | 3 ++- 14/alpine3.14/Dockerfile | 5 +++-- 14/alpine3.15/Dockerfile | 5 +++-- 14/bullseye-slim/Dockerfile | 3 ++- 14/bullseye/Dockerfile | 3 ++- 14/buster-slim/Dockerfile | 3 ++- 14/buster/Dockerfile | 3 ++- 14/stretch-slim/Dockerfile | 3 ++- 14/stretch/Dockerfile | 3 ++- 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 +- 17/alpine3.14/Dockerfile | 4 ++-- 17/alpine3.15/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 32 files changed, 56 insertions(+), 40 deletions(-) diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index 2f60cf3e29..f156930843 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.10 +ENV NODE_VERSION 12.22.11 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="ec1e2f0c33a495002ffb1647159d8e17643e2f229c0f4fe2c1be33398f56b5f4" \ + CHECKSUM="c30c9ba214a8eb2db6199db9147f14ff2cbb0fc07e4517e3a8758f213cc71128" \ ;; \ *) ;; \ esac \ @@ -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/12/alpine3.15/Dockerfile b/12/alpine3.15/Dockerfile index 4b1cfb3f4a..728f323f2d 100644 --- a/12/alpine3.15/Dockerfile +++ b/12/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 12.22.10 +ENV NODE_VERSION 12.22.11 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="ec1e2f0c33a495002ffb1647159d8e17643e2f229c0f4fe2c1be33398f56b5f4" \ + CHECKSUM="c30c9ba214a8eb2db6199db9147f14ff2cbb0fc07e4517e3a8758f213cc71128" \ ;; \ *) ;; \ esac \ @@ -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/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile index 52a5c95178..f634a0fb57 100644 --- a/12/bullseye-slim/Dockerfile +++ b/12/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 12.22.10 +ENV NODE_VERSION 12.22.11 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index f72f7b7fac..9a679adc73 100644 --- a/12/bullseye/Dockerfile +++ b/12/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 12.22.10 +ENV NODE_VERSION 12.22.11 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index 0dfd7fc9eb..d8f47457e4 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.10 +ENV NODE_VERSION 12.22.11 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/buster/Dockerfile b/12/buster/Dockerfile index 52f50a26a0..cd5037fff4 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.10 +ENV NODE_VERSION 12.22.11 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 034a06231f..5808101976 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.10 +ENV NODE_VERSION 12.22.11 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/stretch/Dockerfile b/12/stretch/Dockerfile index 15d207f1ae..e345c9b061 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.10 +ENV NODE_VERSION 12.22.11 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index 3638396d43..a816bffc9d 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.19.0 +ENV NODE_VERSION 14.19.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="8d5e638d88b62de2f147dee812a5d74e4860a20468eb7ff32c41a02b58e2aebf" \ + CHECKSUM="094790128069eccc9534214e7435c70bcafa221a0ef0f229c59418f8762704fa" \ ;; \ *) ;; \ esac \ @@ -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/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 53f80f96ed..9e80dd6780 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.19.0 +ENV NODE_VERSION 14.19.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="8d5e638d88b62de2f147dee812a5d74e4860a20468eb7ff32c41a02b58e2aebf" \ + CHECKSUM="094790128069eccc9534214e7435c70bcafa221a0ef0f229c59418f8762704fa" \ ;; \ *) ;; \ esac \ @@ -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/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index af9a1d1621..ac6b00bd2c 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.19.0 +ENV NODE_VERSION 14.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 903e2db696..05b9a7aad4 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.19.0 +ENV NODE_VERSION 14.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 11592b927a..2275414e39 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.19.0 +ENV NODE_VERSION 14.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/14/buster/Dockerfile b/14/buster/Dockerfile index bf0d6d31e4..0bdfeadfd0 100644 --- a/14/buster/Dockerfile +++ b/14/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.19.0 +ENV NODE_VERSION 14.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 6eaa7db455..2025e87435 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.19.0 +ENV NODE_VERSION 14.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/14/stretch/Dockerfile b/14/stretch/Dockerfile index a624660441..add610152a 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.19.0 +ENV NODE_VERSION 14.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -19,6 +19,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 9536a045a5..6f175ae11b 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.14.1 +ENV NODE_VERSION 16.14.2 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="89b4ece76436344fdb9f646a238ef99734a9fc0913c2a2402766e3039700e008" \ + CHECKSUM="a6dc255e1ef1f20372306eec932b4a3648575c6d3024bcd685b8efc93dc95569" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index 220b8d564e..ef44313b48 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.14.1 +ENV NODE_VERSION 16.14.2 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="89b4ece76436344fdb9f646a238ef99734a9fc0913c2a2402766e3039700e008" \ + CHECKSUM="a6dc255e1ef1f20372306eec932b4a3648575c6d3024bcd685b8efc93dc95569" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index a2207c3004..f3c808e9a9 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.1 +ENV NODE_VERSION 16.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index ad0140d333..7dd3b8155f 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.1 +ENV NODE_VERSION 16.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index a8297c9ec0..1d47a2e0a2 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.1 +ENV NODE_VERSION 16.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index a1fdb99b1b..46aec7872f 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.1 +ENV NODE_VERSION 16.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 5e9aa284a2..1798cfe214 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.1 +ENV NODE_VERSION 16.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index d09a703011..0e45acd245 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.1 +ENV NODE_VERSION 16.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 9604ed2f9b..c63897a233 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.7.1 +ENV NODE_VERSION 17.7.2 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="4cf1b82ab32106482f25167b4143762a51c98baf18c19a51ba3515cb7e021fdc" \ + CHECKSUM="af427820d97cc277d64cc390adfef769d9288fc5b8a37c21e029231f5761c41c" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index 83513b818c..0344bcb112 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.7.1 +ENV NODE_VERSION 17.7.2 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="4cf1b82ab32106482f25167b4143762a51c98baf18c19a51ba3515cb7e021fdc" \ + CHECKSUM="af427820d97cc277d64cc390adfef769d9288fc5b8a37c21e029231f5761c41c" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index c624033586..0ea96ab1d0 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.7.1 +ENV NODE_VERSION 17.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 88705b5531..5fadcc9ca7 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.7.1 +ENV NODE_VERSION 17.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 3bb94ac65e..3c50012f65 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.7.1 +ENV NODE_VERSION 17.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 6f411b97ae..78f8bb2a19 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.7.1 +ENV NODE_VERSION 17.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index d78c83a351..8a3cc96d17 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.7.1 +ENV NODE_VERSION 17.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index 92633f3317..d19dbfc307 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.7.1 +ENV NODE_VERSION 17.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 150bfc1408f474ba8e086a5e04facc5f2ef2c7f2 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Sat, 19 Mar 2022 21:55:55 -0400 Subject: [PATCH 554/818] chore: add awk escapes for openpgp keyserver --- update-keys.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-keys.sh b/update-keys.sh index f8e70d8b1a..b933d8e368 100755 --- a/update-keys.sh +++ b/update-keys.sh @@ -1,3 +1,3 @@ #!/bin/sh -ex -curl -fsSLo- --compressed https://github.com/nodejs/node/raw/master/README.md | awk '/^gpg --keyserver hkps://keys.openpgp.org --recv-keys/ {print $NF}' > keys/node.keys +curl -fsSLo- --compressed https://github.com/nodejs/node/raw/master/README.md | awk '/^gpg --keyserver hkps:\/\/keys\.openpgp\.org --recv-keys/ {print $NF}' > keys/node.keys From 8eef34c04ff8654a2fddf6b084527e19cce3c138 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 21 Mar 2022 08:39:53 +0100 Subject: [PATCH 555/818] Apply suggestions from code review Co-authored-by: Nick Schonning --- .github/workflows/automatic-updates.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 956c24d7f4..3079b2cef7 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -27,8 +27,8 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} branch: update-branch base: main - commit-message: "Update to ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" - title: "Update to ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" + commit-message: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" + title: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" delete-branch: true team-reviewers: | @nodejs/docker From 17e49dae981bfc56e3d42d62709aca1a7210a66e Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 11 Mar 2022 07:28:11 +0100 Subject: [PATCH 556/818] chore: use repo token to open PR --- .github/workflows/automatic-updates.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index f5e69ce29c..c125b640f7 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -24,7 +24,8 @@ jobs: id: cpr uses: peter-evans/create-pull-request@v3 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_API_TOKEN }} + author: "Node.js GitHub Bot " branch: update-branch base: main commit-message: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" From 0d7653f3b742d4e5e5e6b105e1ad118b8791f41b Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 21 Mar 2022 09:56:31 +0100 Subject: [PATCH 557/818] fix: avoid function calls in GH action script --- .github/workflows/automatic-updates.yml | 2 +- build-automation.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index f5e69ce29c..c787dbdc25 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -28,7 +28,7 @@ jobs: branch: update-branch base: main commit-message: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" - title: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" + title: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersionsString }}" delete-branch: true team-reviewers: | @nodejs/docker diff --git a/build-automation.mjs b/build-automation.mjs index 0fc3ea566a..3a8c538bec 100644 --- a/build-automation.mjs +++ b/build-automation.mjs @@ -100,6 +100,6 @@ export default async function(github) { const { stdout } = (await exec(`git diff`)); console.log(stdout); - return { updatedVersions }; + return { updatedVersions, updatedVersionsString: updatedVersions.join(', ') }; } } From 4f00bf217908d7545395be3ca0242a3551fc133c Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Mon, 21 Mar 2022 11:18:13 +0100 Subject: [PATCH 558/818] chore: update formatting of commit message as well --- .github/workflows/automatic-updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index c787dbdc25..de37c50093 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -27,7 +27,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} branch: update-branch base: main - commit-message: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersions.join(', ') }}" + commit-message: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersionsString }}" title: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersionsString }}" delete-branch: true team-reviewers: | From 190bf6af64327a661e67a6865b50f3b9d1e2b55a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Mar 2022 07:02:56 +0000 Subject: [PATCH 559/818] chore(deps): bump peter-evans/create-or-update-comment from 1 to 2 Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 1 to 2. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v1...v2) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index d798723f27..1ac9858d16 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -56,7 +56,7 @@ jobs: echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}" - name: Create PR comment - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 if: ${{ steps.create-pr.outputs.pull-request-url != '' }} with: issue-number: ${{ github.event.pull_request.number }} From 5e2a48c5adf20552e9845a63bea442a838b6d6d3 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 22 Mar 2022 13:56:58 -0400 Subject: [PATCH 560/818] feat: Node.js 17.8.0 --- 17/alpine3.14/Dockerfile | 6 +++--- 17/alpine3.15/Dockerfile | 6 +++--- 17/bullseye-slim/Dockerfile | 4 ++-- 17/bullseye/Dockerfile | 4 ++-- 17/buster-slim/Dockerfile | 4 ++-- 17/buster/Dockerfile | 4 ++-- 17/stretch-slim/Dockerfile | 4 ++-- 17/stretch/Dockerfile | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index c63897a233..5ef9497fb3 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.7.2 +ENV NODE_VERSION 17.8.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="af427820d97cc277d64cc390adfef769d9288fc5b8a37c21e029231f5761c41c" \ + CHECKSUM="faf0dd5ceb4b273b2f50af442cf461cc9d16f9b3ca7ef1006bb8ec1109e8c1cb" \ ;; \ *) ;; \ esac \ @@ -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/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index 0344bcb112..20fb506a76 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.7.2 +ENV NODE_VERSION 17.8.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="af427820d97cc277d64cc390adfef769d9288fc5b8a37c21e029231f5761c41c" \ + CHECKSUM="faf0dd5ceb4b273b2f50af442cf461cc9d16f9b3ca7ef1006bb8ec1109e8c1cb" \ ;; \ *) ;; \ esac \ @@ -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/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 0ea96ab1d0..188751edbb 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.7.2 +ENV NODE_VERSION 17.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 5fadcc9ca7..c3dfabbc6a 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.7.2 +ENV NODE_VERSION 17.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 3c50012f65..aef87003bb 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.7.2 +ENV NODE_VERSION 17.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/buster/Dockerfile b/17/buster/Dockerfile index 78f8bb2a19..870d4fc0f7 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.7.2 +ENV NODE_VERSION 17.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index 8a3cc96d17..8bfa3661a3 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.7.2 +ENV NODE_VERSION 17.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/17/stretch/Dockerfile b/17/stretch/Dockerfile index d19dbfc307..df4d060cbb 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.7.2 +ENV NODE_VERSION 17.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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 \ From 4f66bee1fefef45a04ef0f989bcf5bb36a6e47a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Mar 2022 07:06:28 +0000 Subject: [PATCH 561/818] chore(deps): bump peter-evans/create-pull-request from 3 to 4 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3 to 4. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3...v4) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/official-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index de37c50093..783b7a10a6 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -22,7 +22,7 @@ jobs: - name: Create update PR id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update-branch diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 1ac9858d16..41557a8853 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -38,7 +38,7 @@ jobs: - name: Create PR in official-images id: create-pr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GH_API_TOKEN }} push-to-fork: nodejs/official-images From ee74eb16cf7dd67d284030f30890fbf4e91da2b1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 5 Apr 2022 09:32:19 -0400 Subject: [PATCH 562/818] feat: Node.js 12.22.12 --- 12/alpine3.14/Dockerfile | 6 +++--- 12/alpine3.15/Dockerfile | 6 +++--- 12/bullseye-slim/Dockerfile | 4 ++-- 12/bullseye/Dockerfile | 4 ++-- 12/buster-slim/Dockerfile | 4 ++-- 12/buster/Dockerfile | 4 ++-- 12/stretch-slim/Dockerfile | 4 ++-- 12/stretch/Dockerfile | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile index f156930843..348373f3a8 100644 --- a/12/alpine3.14/Dockerfile +++ b/12/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 12.22.11 +ENV NODE_VERSION 12.22.12 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="c30c9ba214a8eb2db6199db9147f14ff2cbb0fc07e4517e3a8758f213cc71128" \ + CHECKSUM="e5eb941bd3d5b7ab197e27c353049e6e8fd03d39c4949ea393f5af4ba8ef020a" \ ;; \ *) ;; \ esac \ @@ -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/12/alpine3.15/Dockerfile b/12/alpine3.15/Dockerfile index 728f323f2d..5f984b9085 100644 --- a/12/alpine3.15/Dockerfile +++ b/12/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 12.22.11 +ENV NODE_VERSION 12.22.12 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="c30c9ba214a8eb2db6199db9147f14ff2cbb0fc07e4517e3a8758f213cc71128" \ + CHECKSUM="e5eb941bd3d5b7ab197e27c353049e6e8fd03d39c4949ea393f5af4ba8ef020a" \ ;; \ *) ;; \ esac \ @@ -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/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile index f634a0fb57..6f65e9d427 100644 --- a/12/bullseye-slim/Dockerfile +++ b/12/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 12.22.11 +ENV NODE_VERSION 12.22.12 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/bullseye/Dockerfile b/12/bullseye/Dockerfile index 9a679adc73..8c758434fb 100644 --- a/12/bullseye/Dockerfile +++ b/12/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 12.22.11 +ENV NODE_VERSION 12.22.12 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile index d8f47457e4..f0e9e80903 100644 --- a/12/buster-slim/Dockerfile +++ b/12/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.22.11 +ENV NODE_VERSION 12.22.12 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/buster/Dockerfile b/12/buster/Dockerfile index cd5037fff4..49eac0b826 100644 --- a/12/buster/Dockerfile +++ b/12/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.22.11 +ENV NODE_VERSION 12.22.12 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile index 5808101976..3a2c102aea 100644 --- a/12/stretch-slim/Dockerfile +++ b/12/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 12.22.11 +ENV NODE_VERSION 12.22.12 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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/12/stretch/Dockerfile b/12/stretch/Dockerfile index e345c9b061..14bcdfad84 100644 --- a/12/stretch/Dockerfile +++ b/12/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 12.22.11 +ENV NODE_VERSION 12.22.12 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -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 \ From 3f6cb08991ce662dd5a53a454310c21f3a848bf3 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 7 Apr 2022 14:35:19 +0200 Subject: [PATCH 563/818] fix: only update yarn if there are other changes to the dockerfile --- update.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/update.sh b/update.sh index 44872c81d1..ba7b9f1bfc 100755 --- a/update.sh +++ b/update.sh @@ -135,11 +135,8 @@ function update_node_version() { sed -Ei -e 's/^FROM (.*)/FROM '"$fromprefix"'\1/' "${dockerfile}-tmp" sed -Ei -e 's/^(ENV NODE_VERSION ).*/\1'"${nodeVersion}"'/' "${dockerfile}-tmp" - if [ "${SKIP}" = true ]; then - # Get the currently used Yarn version - yarnVersion="$(grep "ENV YARN_VERSION" "${dockerfile}" | cut -d' ' -f3)" - fi - sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}-tmp" + currentYarnVersion="$(grep "ENV YARN_VERSION" "${dockerfile}" | cut -d' ' -f3)" + sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${currentYarnVersion}"'/' "${dockerfile}-tmp" # shellcheck disable=SC1004 new_line=' \\\ @@ -180,17 +177,22 @@ function update_node_version() { sed -Ei -e "s/(debian:)name-slim/\\1${variant}/" "${dockerfile}-tmp" fi - # Required for POSIX sed - if [ -f "${dockerfile}-tmp-e" ]; then - rm "${dockerfile}-tmp-e" - fi - if diff -q "${dockerfile}-tmp" "${dockerfile}" > /dev/null; then echo "${dockerfile} is already up to date!" else + if [ "${SKIP}" = true ]; then + # Get the currently used Yarn version + yarnVersion="$(grep "ENV YARN_VERSION" "${dockerfile}" | cut -d' ' -f3)" + fi + sed -Ei -e 's/^(ENV YARN_VERSION ).*/\1'"${yarnVersion}"'/' "${dockerfile}-tmp" echo "${dockerfile} updated!" fi + # Required for POSIX sed + if [ -f "${dockerfile}-tmp-e" ]; then + rm "${dockerfile}-tmp-e" + fi + mv -f "${dockerfile}-tmp" "${dockerfile}" ) } From 7b418d1bc4077a0a86df5cd2594c3f67b4ee0dd5 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 7 Apr 2022 14:51:11 +0200 Subject: [PATCH 564/818] fix: get correct commit message and PR title for auto PRs --- .github/workflows/automatic-updates.yml | 5 +++-- build-automation.mjs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 1717edf53d..c02a94b50b 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -16,6 +16,7 @@ jobs: uses: actions/github-script@v6 id: updt with: + result-encoding: string script: | const { default: script } = await import(`${process.env.GITHUB_WORKSPACE}/build-automation.mjs`); return script(github); @@ -28,8 +29,8 @@ jobs: author: "Node.js GitHub Bot " branch: update-branch base: main - commit-message: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersionsString }}" - title: "feat: Node.js ${{ steps.updt.outputs.result.updatedVersionsString }}" + commit-message: "feat: Node.js ${{ steps.updt.outputs.result }}" + title: "feat: Node.js ${{ steps.updt.outputs.result }}" delete-branch: true team-reviewers: | @nodejs/docker diff --git a/build-automation.mjs b/build-automation.mjs index 3a8c538bec..d294326386 100644 --- a/build-automation.mjs +++ b/build-automation.mjs @@ -100,6 +100,6 @@ export default async function(github) { const { stdout } = (await exec(`git diff`)); console.log(stdout); - return { updatedVersions, updatedVersionsString: updatedVersions.join(', ') }; + return updatedVersions.join(', '); } } From 2b855be09ac7e83326147026241f42cc02830b04 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 12 Apr 2022 13:27:30 +0000 Subject: [PATCH 565/818] feat: Node.js 17.9.0 --- 17/alpine3.14/Dockerfile | 4 ++-- 17/alpine3.15/Dockerfile | 4 ++-- 17/bullseye-slim/Dockerfile | 2 +- 17/bullseye/Dockerfile | 2 +- 17/buster-slim/Dockerfile | 2 +- 17/buster/Dockerfile | 2 +- 17/stretch-slim/Dockerfile | 2 +- 17/stretch/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 5ef9497fb3..0bb9d35a47 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.8.0 +ENV NODE_VERSION 17.9.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="faf0dd5ceb4b273b2f50af442cf461cc9d16f9b3ca7ef1006bb8ec1109e8c1cb" \ + CHECKSUM="8b4f38b239b342bef694ba41b82a127e94688be37cdda8a355b2d8307a0dcf20" \ ;; \ *) ;; \ esac \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index 20fb506a76..75510fa56c 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.8.0 +ENV NODE_VERSION 17.9.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="faf0dd5ceb4b273b2f50af442cf461cc9d16f9b3ca7ef1006bb8ec1109e8c1cb" \ + CHECKSUM="8b4f38b239b342bef694ba41b82a127e94688be37cdda8a355b2d8307a0dcf20" \ ;; \ *) ;; \ esac \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 188751edbb..ee640890da 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.8.0 +ENV NODE_VERSION 17.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index c3dfabbc6a..12bd999658 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.8.0 +ENV NODE_VERSION 17.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index aef87003bb..90b9cbba68 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.8.0 +ENV NODE_VERSION 17.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 870d4fc0f7..34d3c71396 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.8.0 +ENV NODE_VERSION 17.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index 8bfa3661a3..f5bde19111 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.8.0 +ENV NODE_VERSION 17.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index df4d060cbb..1209e3fb63 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.8.0 +ENV NODE_VERSION 17.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 2b67149d782e4716b9c51f348b401e9d07940831 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 19 Apr 2022 16:22:28 -0400 Subject: [PATCH 566/818] feat: Node.js 18.0.0 Fixes #1696 --- 18/alpine3.14/Dockerfile | 99 +++++++++++++++++++++++++++ 18/alpine3.14/docker-entrypoint.sh | 11 +++ 18/alpine3.15/Dockerfile | 99 +++++++++++++++++++++++++++ 18/alpine3.15/docker-entrypoint.sh | 11 +++ 18/bullseye-slim/Dockerfile | 95 +++++++++++++++++++++++++ 18/bullseye-slim/docker-entrypoint.sh | 11 +++ 18/bullseye/Dockerfile | 71 +++++++++++++++++++ 18/bullseye/docker-entrypoint.sh | 11 +++ 18/buster-slim/Dockerfile | 95 +++++++++++++++++++++++++ 18/buster-slim/docker-entrypoint.sh | 11 +++ 18/buster/Dockerfile | 71 +++++++++++++++++++ 18/buster/docker-entrypoint.sh | 11 +++ 18/stretch-slim/Dockerfile | 95 +++++++++++++++++++++++++ 18/stretch-slim/docker-entrypoint.sh | 11 +++ 18/stretch/Dockerfile | 71 +++++++++++++++++++ 18/stretch/docker-entrypoint.sh | 11 +++ versions.json | 65 ++++++++++++++++++ 17 files changed, 849 insertions(+) create mode 100644 18/alpine3.14/Dockerfile create mode 100755 18/alpine3.14/docker-entrypoint.sh create mode 100644 18/alpine3.15/Dockerfile create mode 100755 18/alpine3.15/docker-entrypoint.sh create mode 100644 18/bullseye-slim/Dockerfile create mode 100755 18/bullseye-slim/docker-entrypoint.sh create mode 100644 18/bullseye/Dockerfile create mode 100755 18/bullseye/docker-entrypoint.sh create mode 100644 18/buster-slim/Dockerfile create mode 100755 18/buster-slim/docker-entrypoint.sh create mode 100644 18/buster/Dockerfile create mode 100755 18/buster/docker-entrypoint.sh create mode 100644 18/stretch-slim/Dockerfile create mode 100755 18/stretch-slim/docker-entrypoint.sh create mode 100644 18/stretch/Dockerfile create mode 100755 18/stretch/docker-entrypoint.sh diff --git a/18/alpine3.14/Dockerfile b/18/alpine3.14/Dockerfile new file mode 100644 index 0000000000..620891f57f --- /dev/null +++ b/18/alpine3.14/Dockerfile @@ -0,0 +1,99 @@ +FROM alpine:3.14 + +ENV NODE_VERSION 18.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="64277af61876eb2460faf6fe4d127cd4cfaed7239f4fc8c8fa2afe05503aae38" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/alpine3.14/docker-entrypoint.sh b/18/alpine3.14/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/alpine3.14/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile new file mode 100644 index 0000000000..6c6d19e4c9 --- /dev/null +++ b/18/alpine3.15/Dockerfile @@ -0,0 +1,99 @@ +FROM alpine:3.15 + +ENV NODE_VERSION 18.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="64277af61876eb2460faf6fe4d127cd4cfaed7239f4fc8c8fa2afe05503aae38" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/alpine3.15/docker-entrypoint.sh b/18/alpine3.15/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/alpine3.15/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..48dd3ed5a6 --- /dev/null +++ b/18/bullseye-slim/Dockerfile @@ -0,0 +1,95 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/bullseye-slim/docker-entrypoint.sh b/18/bullseye-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile new file mode 100644 index 0000000000..0a9b6e9906 --- /dev/null +++ b/18/bullseye/Dockerfile @@ -0,0 +1,71 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/bullseye/docker-entrypoint.sh b/18/bullseye/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/bullseye/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile new file mode 100644 index 0000000000..aefad7b394 --- /dev/null +++ b/18/buster-slim/Dockerfile @@ -0,0 +1,95 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/buster-slim/docker-entrypoint.sh b/18/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/buster-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile new file mode 100644 index 0000000000..c29a582e66 --- /dev/null +++ b/18/buster/Dockerfile @@ -0,0 +1,71 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/buster/docker-entrypoint.sh b/18/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/buster/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/stretch-slim/Dockerfile b/18/stretch-slim/Dockerfile new file mode 100644 index 0000000000..cc114807c9 --- /dev/null +++ b/18/stretch-slim/Dockerfile @@ -0,0 +1,95 @@ +FROM debian:stretch-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/stretch-slim/docker-entrypoint.sh b/18/stretch-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/stretch-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/stretch/Dockerfile b/18/stretch/Dockerfile new file mode 100644 index 0000000000..9e075e1bea --- /dev/null +++ b/18/stretch/Dockerfile @@ -0,0 +1,71 @@ +FROM buildpack-deps:stretch + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + B9E2F5981AA6E0CD28160D9FF13993A75599653C \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.18 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/stretch/docker-entrypoint.sh b/18/stretch/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/stretch/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index 7932d6b0a3..3fc374ce5e 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,69 @@ { + "18": { + "start": "2022-04-19", + "lts": "2022-10-25", + "maintenance": "2023-10-18", + "end": "2025-04-30", + "codename": "", + "alpine-default": "alpine3.15", + "debian-default": "bullseye", + "variants": { + "alpine3.14": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.15": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "stretch": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "stretch-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, "17": { "start": "2021-10-19", "lts": "", From 31a051a8358e0259388d7e6d9e37be2a830a157f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 19 Apr 2022 18:00:06 -0400 Subject: [PATCH 567/818] fix: drop Stretch for Node 18 --- 18/stretch-slim/Dockerfile | 95 ---------------------------- 18/stretch-slim/docker-entrypoint.sh | 11 ---- 18/stretch/Dockerfile | 71 --------------------- 18/stretch/docker-entrypoint.sh | 11 ---- versions.json | 10 --- 5 files changed, 198 deletions(-) delete mode 100644 18/stretch-slim/Dockerfile delete mode 100755 18/stretch-slim/docker-entrypoint.sh delete mode 100644 18/stretch/Dockerfile delete mode 100755 18/stretch/docker-entrypoint.sh diff --git a/18/stretch-slim/Dockerfile b/18/stretch-slim/Dockerfile deleted file mode 100644 index cc114807c9..0000000000 --- a/18/stretch-slim/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 18.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/18/stretch-slim/docker-entrypoint.sh b/18/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/18/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/18/stretch/Dockerfile b/18/stretch/Dockerfile deleted file mode 100644 index 9e075e1bea..0000000000 --- a/18/stretch/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 18.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/18/stretch/docker-entrypoint.sh b/18/stretch/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/18/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index 3fc374ce5e..0c8e424d28 100644 --- a/versions.json +++ b/versions.json @@ -51,16 +51,6 @@ "arm64v8", "ppc64le", "s390x" - ], - "stretch": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "stretch-slim": [ - "amd64", - "arm32v7", - "arm64v8" ] } }, From 71fd6418a47c8dd34407c7dfb49fd0a8eab3d2b2 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 20 Apr 2022 09:40:11 -0400 Subject: [PATCH 568/818] fix: use most Current/LTS with overlapping dates --- stackbrew.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stackbrew.js b/stackbrew.js index baa015398b..9142b3b91d 100755 --- a/stackbrew.js +++ b/stackbrew.js @@ -30,12 +30,16 @@ midnight.setHours(0, 0, 0, 0) const now = midnight.getTime() const aplineRE = new RegExp(/alpine*/); const slimRE = new RegExp(/\*-slim/); +let foundLTS = false; +let foundCurrent = false; for (version of versions) { let lts = new Date(`${config[version].lts}T00:00:00.00`).getTime(); let maintenance = new Date(`${config[version].maintenance}T00:00:00.00`).getTime(); - let isCurrent = isNaN(lts) || lts >= now; - let isLTS = (maintenance >= now) && (now >= lts); + let isCurrent = foundCurrent ? false : isNaN(lts) || lts >= now; + foundCurrent = isCurrent || foundCurrent; + let isLTS = foundLTS ? false : (maintenance >= now) && (now >= lts); + foundLTS = isLTS || foundLTS; let codename = config[version].codename let defaultAlpine = config[version]['alpine-default'] let defaultDebian = config[version]['debian-default'] From 44a6c4796bf53809a14ad445a43b0bdda8b93e5d Mon Sep 17 00:00:00 2001 From: Issei Horie Date: Sun, 24 Apr 2022 09:52:55 +0900 Subject: [PATCH 569/818] docs: clarify docker compose volume explanation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6446f33e46..2a994db1a3 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ You can then run using Docker Compose: $ docker-compose up -d ``` -Docker Compose example copies your current directory (including node_modules) to the container. +Docker Compose example mounts your current directory (including node_modules) to the container. It assumes that your application has a file named [`package.json`](https://docs.npmjs.com/files/package.json) defining [start script](https://docs.npmjs.com/misc/scripts#default-values). From 92477b460894e6482635ddac76ea9f1e8bdc597a Mon Sep 17 00:00:00 2001 From: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> Date: Sat, 23 Apr 2022 21:23:42 -0500 Subject: [PATCH 570/818] chore: Set permissions for GitHub actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much. - Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs [Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/) Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> --- .github/workflows/doctoc.yml | 3 +++ .github/workflows/eclint.yml | 3 +++ .github/workflows/markdown-link-check.yml | 3 +++ .github/workflows/missing-checksum.yml | 3 +++ .github/workflows/shfmt.yml | 3 +++ 5 files changed, 15 insertions(+) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 8372419901..334eba263e 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -6,6 +6,9 @@ on: - "README.md" - "docs/BestPractices.md" +permissions: + contents: read + jobs: doctoc: name: Doc TOC Check diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 5640a33ed0..50f78bfdbc 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -2,6 +2,9 @@ name: Test Whitespace and line endings on: [pull_request] +permissions: + contents: read + jobs: eclint: runs-on: ubuntu-latest diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 7533c20095..93ccabb296 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -5,6 +5,9 @@ on: paths: - "**/*.md" +permissions: + contents: read + jobs: markdown-link-check: runs-on: ubuntu-latest diff --git a/.github/workflows/missing-checksum.yml b/.github/workflows/missing-checksum.yml index cb221627df..95b2af526a 100644 --- a/.github/workflows/missing-checksum.yml +++ b/.github/workflows/missing-checksum.yml @@ -6,6 +6,9 @@ on: - ".github/workflows/missing-checksum.yml" - "**/alpine*/Dockerfile" +permissions: + contents: read + jobs: test: runs-on: ubuntu-latest diff --git a/.github/workflows/shfmt.yml b/.github/workflows/shfmt.yml index a74db25986..7b8d4b76cf 100644 --- a/.github/workflows/shfmt.yml +++ b/.github/workflows/shfmt.yml @@ -5,6 +5,9 @@ on: paths: - "**/*.sh" +permissions: + contents: read + jobs: shfmt: runs-on: ubuntu-latest From 4e0fff70002f51c2b121c9b231917abcb63d2b1a Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 27 Apr 2022 04:18:49 +0000 Subject: [PATCH 571/818] feat: Node.js 16.15.0 --- 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 6f175ae11b..0bad7797e5 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.14.2 +ENV NODE_VERSION 16.15.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="a6dc255e1ef1f20372306eec932b4a3648575c6d3024bcd685b8efc93dc95569" \ + CHECKSUM="4db62cabc0647fc18f537ed10b5573f3c23ffb4d4434e40713e7e472f1ed4e55" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index ef44313b48..b2c94338a5 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.14.2 +ENV NODE_VERSION 16.15.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="a6dc255e1ef1f20372306eec932b4a3648575c6d3024bcd685b8efc93dc95569" \ + CHECKSUM="4db62cabc0647fc18f537ed10b5573f3c23ffb4d4434e40713e7e472f1ed4e55" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index f3c808e9a9..fb9c53ae47 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.2 +ENV NODE_VERSION 16.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 7dd3b8155f..ab2557c3f6 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.2 +ENV NODE_VERSION 16.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 1d47a2e0a2..692be02032 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.2 +ENV NODE_VERSION 16.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 46aec7872f..e18d5e39b9 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.2 +ENV NODE_VERSION 16.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 1798cfe214..8b846ba807 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.2 +ENV NODE_VERSION 16.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 0e45acd245..f7b6d933a4 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.2 +ENV NODE_VERSION 16.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5f3ea4e2a0e13e36195fe5010c4dff3155a0777d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 22 Apr 2022 10:46:50 -0400 Subject: [PATCH 572/818] feat: Drop Node 12 for EOL 2022-04-30 --- 12/alpine3.14/Dockerfile | 99 --------------------------- 12/alpine3.14/docker-entrypoint.sh | 11 --- 12/alpine3.15/Dockerfile | 99 --------------------------- 12/alpine3.15/docker-entrypoint.sh | 11 --- 12/bullseye-slim/Dockerfile | 95 ------------------------- 12/bullseye-slim/docker-entrypoint.sh | 11 --- 12/bullseye/Dockerfile | 71 ------------------- 12/bullseye/docker-entrypoint.sh | 11 --- 12/buster-slim/Dockerfile | 95 ------------------------- 12/buster-slim/docker-entrypoint.sh | 11 --- 12/buster/Dockerfile | 71 ------------------- 12/buster/docker-entrypoint.sh | 11 --- 12/stretch-slim/Dockerfile | 95 ------------------------- 12/stretch-slim/docker-entrypoint.sh | 11 --- 12/stretch/Dockerfile | 71 ------------------- 12/stretch/docker-entrypoint.sh | 11 --- Dockerfile-alpine.template | 2 +- update.sh | 8 --- versions.json | 65 ------------------ 19 files changed, 1 insertion(+), 858 deletions(-) delete mode 100644 12/alpine3.14/Dockerfile delete mode 100755 12/alpine3.14/docker-entrypoint.sh delete mode 100644 12/alpine3.15/Dockerfile delete mode 100755 12/alpine3.15/docker-entrypoint.sh delete mode 100644 12/bullseye-slim/Dockerfile delete mode 100755 12/bullseye-slim/docker-entrypoint.sh delete mode 100644 12/bullseye/Dockerfile delete mode 100755 12/bullseye/docker-entrypoint.sh delete mode 100644 12/buster-slim/Dockerfile delete mode 100755 12/buster-slim/docker-entrypoint.sh delete mode 100644 12/buster/Dockerfile delete mode 100755 12/buster/docker-entrypoint.sh delete mode 100644 12/stretch-slim/Dockerfile delete mode 100755 12/stretch-slim/docker-entrypoint.sh delete mode 100644 12/stretch/Dockerfile delete mode 100755 12/stretch/docker-entrypoint.sh diff --git a/12/alpine3.14/Dockerfile b/12/alpine3.14/Dockerfile deleted file mode 100644 index 348373f3a8..0000000000 --- a/12/alpine3.14/Dockerfile +++ /dev/null @@ -1,99 +0,0 @@ -FROM alpine:3.14 - -ENV NODE_VERSION 12.22.12 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="e5eb941bd3d5b7ab197e27c353049e6e8fd03d39c4949ea393f5af4ba8ef020a" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/alpine3.14/docker-entrypoint.sh b/12/alpine3.14/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/alpine3.14/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/alpine3.15/Dockerfile b/12/alpine3.15/Dockerfile deleted file mode 100644 index 5f984b9085..0000000000 --- a/12/alpine3.15/Dockerfile +++ /dev/null @@ -1,99 +0,0 @@ -FROM alpine:3.15 - -ENV NODE_VERSION 12.22.12 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="e5eb941bd3d5b7ab197e27c353049e6e8fd03d39c4949ea393f5af4ba8ef020a" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python2 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/alpine3.15/docker-entrypoint.sh b/12/alpine3.15/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/alpine3.15/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/bullseye-slim/Dockerfile b/12/bullseye-slim/Dockerfile deleted file mode 100644 index 6f65e9d427..0000000000 --- a/12/bullseye-slim/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -FROM debian:bullseye-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 12.22.12 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/bullseye-slim/docker-entrypoint.sh b/12/bullseye-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/bullseye-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/bullseye/Dockerfile b/12/bullseye/Dockerfile deleted file mode 100644 index 8c758434fb..0000000000 --- a/12/bullseye/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM buildpack-deps:bullseye - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 12.22.12 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/bullseye/docker-entrypoint.sh b/12/bullseye/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/bullseye/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/buster-slim/Dockerfile b/12/buster-slim/Dockerfile deleted file mode 100644 index f0e9e80903..0000000000 --- a/12/buster-slim/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 12.22.12 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/buster-slim/docker-entrypoint.sh b/12/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/buster/Dockerfile b/12/buster/Dockerfile deleted file mode 100644 index 49eac0b826..0000000000 --- a/12/buster/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 12.22.12 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/buster/docker-entrypoint.sh b/12/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/stretch-slim/Dockerfile b/12/stretch-slim/Dockerfile deleted file mode 100644 index 3a2c102aea..0000000000 --- a/12/stretch-slim/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 12.22.12 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/stretch-slim/docker-entrypoint.sh b/12/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/12/stretch/Dockerfile b/12/stretch/Dockerfile deleted file mode 100644 index 14bcdfad84..0000000000 --- a/12/stretch/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 12.22.12 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.18 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/12/stretch/docker-entrypoint.sh b/12/stretch/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/12/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index bcfa119958..c2e2c5a5a9 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -33,7 +33,7 @@ RUN addgroup -g 1000 node \ libgcc \ linux-headers \ make \ - ${PYTHON_VERSION} \ + python3 \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ "${NODE_KEYS[@]}" diff --git a/update.sh b/update.sh index ba7b9f1bfc..799f4afce2 100755 --- a/update.sh +++ b/update.sh @@ -163,14 +163,6 @@ function update_node_version() { sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp" sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${checksum}\"/" "${dockerfile}-tmp" - # Use python2 for nodejs < 14 on alpine - if [ "$version" -lt 14 ]; then - pythonVersion="python2" - else - pythonVersion="python3" - fi - - sed -Ei -e 's/\$\{PYTHON_VERSION\}/'"${pythonVersion}"'/' "${dockerfile}-tmp" elif is_debian "${variant}"; then sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp" elif is_debian_slim "${variant}"; then diff --git a/versions.json b/versions.json index 0c8e424d28..99f94b8805 100644 --- a/versions.json +++ b/versions.json @@ -248,70 +248,5 @@ "arm64v8" ] } - }, - "12": { - "start": "2019-04-23", - "lts": "2019-10-21", - "maintenance": "2020-11-30", - "end": "2022-04-30", - "codename": "erbium", - "alpine-default": "alpine3.15", - "debian-default": "stretch", - "variants": { - "alpine3.14": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.15": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "stretch": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "stretch-slim": [ - "amd64", - "arm32v7", - "arm64v8" - ] - } } } From a21a7e6ad09063f906a7de1cb17bc65cb0b7d995 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 3 May 2022 16:10:45 +0200 Subject: [PATCH 573/818] fix: set correct default distro --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 96a9a3e833..7cb78b8f6c 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist -default_variant stretch +default_variant bullseye alpine_version 3.15 debian_versions stretch bullseye buster From 38ae136a31e276da1dc6ff6a129a4e429304582d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 3 May 2022 19:33:33 +0000 Subject: [PATCH 574/818] feat: Node.js 18.1.0 --- 18/alpine3.14/Dockerfile | 4 ++-- 18/alpine3.15/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.14/Dockerfile b/18/alpine3.14/Dockerfile index 620891f57f..2f07070447 100644 --- a/18/alpine3.14/Dockerfile +++ b/18/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 18.0.0 +ENV NODE_VERSION 18.1.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="64277af61876eb2460faf6fe4d127cd4cfaed7239f4fc8c8fa2afe05503aae38" \ + CHECKSUM="db44a0003c61313ba466a486508353d013bc651973581acd9b9f4c71024cc7df" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index 6c6d19e4c9..d5a309181e 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.0.0 +ENV NODE_VERSION 18.1.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="64277af61876eb2460faf6fe4d127cd4cfaed7239f4fc8c8fa2afe05503aae38" \ + CHECKSUM="db44a0003c61313ba466a486508353d013bc651973581acd9b9f4c71024cc7df" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 48dd3ed5a6..4e6303db5a 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.0.0 +ENV NODE_VERSION 18.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 0a9b6e9906..5b097c889b 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.0.0 +ENV NODE_VERSION 18.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index aefad7b394..01da1e8509 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.0.0 +ENV NODE_VERSION 18.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index c29a582e66..5fb3722d0e 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.0.0 +ENV NODE_VERSION 18.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5896f1c02650ea0a6995378e518d3b8177515e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Arboleda?= Date: Tue, 3 May 2022 16:41:58 -0500 Subject: [PATCH 575/818] keys: add key for @juanarbol Refs: https://github.com/nodejs/Release/issues/742 Refs: https://github.com/nodejs/node/pull/42961 --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index eaa0c9e87b..881732c4d2 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -3,6 +3,7 @@ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 74F12602B6F1C4E913FAA37AD3A89613643B6201 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 +61FC681DFB92A079F1685E77973F295594EC4689 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C From b37d59425ba71ed7e0dbf09a130da9fb2b7fbfc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 May 2022 07:04:57 +0000 Subject: [PATCH 576/818] chore(deps): bump docker/build-push-action from 2 to 3 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 39dcb965df..99559c506d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v3 - name: Build image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3 with: push: false load: true From 34b6fe9dc8f6d1bd2319d1cf0b418be2dbcf2ff6 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 14 May 2022 19:13:14 -0400 Subject: [PATCH 577/818] feat: Node.js 14.9.2 --- 14/alpine3.14/Dockerfile | 7 ++++--- 14/alpine3.15/Dockerfile | 7 ++++--- 14/bullseye-slim/Dockerfile | 5 +++-- 14/bullseye/Dockerfile | 5 +++-- 14/buster-slim/Dockerfile | 5 +++-- 14/buster/Dockerfile | 5 +++-- 14/stretch-slim/Dockerfile | 5 +++-- 14/stretch/Dockerfile | 5 +++-- 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index a816bffc9d..62043c9c7b 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.19.1 +ENV NODE_VERSION 14.19.2 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="094790128069eccc9534214e7435c70bcafa221a0ef0f229c59418f8762704fa" \ + CHECKSUM="d039d55f4007897ccc99921e619c4a447493086df81963883ea1f31adf53f3f3" \ ;; \ *) ;; \ esac \ @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 9e80dd6780..3a5f719eb3 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.19.1 +ENV NODE_VERSION 14.19.2 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="094790128069eccc9534214e7435c70bcafa221a0ef0f229c59418f8762704fa" \ + CHECKSUM="d039d55f4007897ccc99921e619c4a447493086df81963883ea1f31adf53f3f3" \ ;; \ *) ;; \ esac \ @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index ac6b00bd2c..15aac1398d 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.19.1 +ENV NODE_VERSION 14.19.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 05b9a7aad4..e835059aab 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.19.1 +ENV NODE_VERSION 14.19.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 2275414e39..f70877e143 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.19.1 +ENV NODE_VERSION 14.19.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 0bdfeadfd0..c38e1a1c70 100644 --- a/14/buster/Dockerfile +++ b/14/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.19.1 +ENV NODE_VERSION 14.19.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 2025e87435..0f4fa15b4e 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.19.1 +ENV NODE_VERSION 14.19.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index add610152a..587cf5599d 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.19.1 +ENV NODE_VERSION 14.19.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.17 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ From 4e8fe34165d79044d7ea909021ccc0de3e3b4c6d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 17 May 2022 22:23:19 +0000 Subject: [PATCH 578/818] feat: Node.js 14.19.3, 18.2.0 --- 14/alpine3.14/Dockerfile | 4 ++-- 14/alpine3.15/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 14/stretch-slim/Dockerfile | 2 +- 14/stretch/Dockerfile | 2 +- 16/alpine3.14/Dockerfile | 3 ++- 16/alpine3.15/Dockerfile | 3 ++- 16/bullseye-slim/Dockerfile | 3 ++- 16/bullseye/Dockerfile | 3 ++- 16/buster-slim/Dockerfile | 3 ++- 16/buster/Dockerfile | 3 ++- 16/stretch-slim/Dockerfile | 3 ++- 16/stretch/Dockerfile | 3 ++- 17/alpine3.14/Dockerfile | 3 ++- 17/alpine3.15/Dockerfile | 3 ++- 17/bullseye-slim/Dockerfile | 3 ++- 17/bullseye/Dockerfile | 3 ++- 17/buster-slim/Dockerfile | 3 ++- 17/buster/Dockerfile | 3 ++- 17/stretch-slim/Dockerfile | 3 ++- 17/stretch/Dockerfile | 3 ++- 18/alpine3.14/Dockerfile | 7 ++++--- 18/alpine3.15/Dockerfile | 7 ++++--- 18/bullseye-slim/Dockerfile | 5 +++-- 18/bullseye/Dockerfile | 5 +++-- 18/buster-slim/Dockerfile | 5 +++-- 18/buster/Dockerfile | 5 +++-- 30 files changed, 62 insertions(+), 40 deletions(-) diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.14/Dockerfile index 62043c9c7b..c51387ec23 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 14.19.2 +ENV NODE_VERSION 14.19.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="d039d55f4007897ccc99921e619c4a447493086df81963883ea1f31adf53f3f3" \ + CHECKSUM="2a91d0d2fda04c267e2c1d956b24378d1c34fcec489ad82695f4b23af0e22c1d" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 3a5f719eb3..467df0338a 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.19.2 +ENV NODE_VERSION 14.19.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="d039d55f4007897ccc99921e619c4a447493086df81963883ea1f31adf53f3f3" \ + CHECKSUM="2a91d0d2fda04c267e2c1d956b24378d1c34fcec489ad82695f4b23af0e22c1d" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 15aac1398d..584bc20955 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.19.2 +ENV NODE_VERSION 14.19.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index e835059aab..31cb1864f7 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.19.2 +ENV NODE_VERSION 14.19.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index f70877e143..ae85fd047a 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.19.2 +ENV NODE_VERSION 14.19.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index c38e1a1c70..5632222e5f 100644 --- a/14/buster/Dockerfile +++ b/14/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.19.2 +ENV NODE_VERSION 14.19.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile index 0f4fa15b4e..501c3d3df5 100644 --- a/14/stretch-slim/Dockerfile +++ b/14/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 14.19.2 +ENV NODE_VERSION 14.19.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile index 587cf5599d..3722325a66 100644 --- a/14/stretch/Dockerfile +++ b/14/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 14.19.2 +ENV NODE_VERSION 14.19.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 0bad7797e5..dfce54dd55 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 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 b2c94338a5..3acb3295da 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 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 fb9c53ae47..67ce9fedd5 100644 --- a/16/bullseye-slim/Dockerfile +++ b/16/bullseye-slim/Dockerfile @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index ab2557c3f6..a2fa9cd5ed 100644 --- a/16/bullseye/Dockerfile +++ b/16/bullseye/Dockerfile @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 692be02032..a78f8bda1f 100644 --- a/16/buster-slim/Dockerfile +++ b/16/buster-slim/Dockerfile @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index e18d5e39b9..cd83885e81 100644 --- a/16/buster/Dockerfile +++ b/16/buster/Dockerfile @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 8b846ba807..902f431ef9 100644 --- a/16/stretch-slim/Dockerfile +++ b/16/stretch-slim/Dockerfile @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index f7b6d933a4..4b517b9f46 100644 --- a/16/stretch/Dockerfile +++ b/16/stretch/Dockerfile @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 0bb9d35a47..472c7ae06c 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index 75510fa56c..1f33b8de40 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index ee640890da..58c897672c 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/bullseye-slim/Dockerfile @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 12bd999658..3139cb6523 100644 --- a/17/bullseye/Dockerfile +++ b/17/bullseye/Dockerfile @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 90b9cbba68..8c77aad306 100644 --- a/17/buster-slim/Dockerfile +++ b/17/buster-slim/Dockerfile @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 34d3c71396..8cc76ffb2d 100644 --- a/17/buster/Dockerfile +++ b/17/buster/Dockerfile @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index f5bde19111..58459a65ce 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/stretch-slim/Dockerfile @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index 1209e3fb63..9281b48eba 100644 --- a/17/stretch/Dockerfile +++ b/17/stretch/Dockerfile @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/18/alpine3.14/Dockerfile b/18/alpine3.14/Dockerfile index 2f07070447..4921e086a7 100644 --- a/18/alpine3.14/Dockerfile +++ b/18/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 18.1.0 +ENV NODE_VERSION 18.2.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="db44a0003c61313ba466a486508353d013bc651973581acd9b9f4c71024cc7df" \ + CHECKSUM="2a0b06e7322d79863191a8a4da517be4df5ff18920b2315fe3e8cd8ca0ae4025" \ ;; \ *) ;; \ esac \ @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index d5a309181e..a9b69571be 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.1.0 +ENV NODE_VERSION 18.2.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="db44a0003c61313ba466a486508353d013bc651973581acd9b9f4c71024cc7df" \ + CHECKSUM="2a0b06e7322d79863191a8a4da517be4df5ff18920b2315fe3e8cd8ca0ae4025" \ ;; \ *) ;; \ esac \ @@ -41,6 +41,7 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -72,7 +73,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 4e6303db5a..7ac592e0fa 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.1.0 +ENV NODE_VERSION 18.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 5b097c889b..e7ade03259 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.1.0 +ENV NODE_VERSION 18.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 01da1e8509..1a4527dbc1 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.1.0 +ENV NODE_VERSION 18.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,6 +25,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -56,7 +57,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 5fb3722d0e..a98eb1a44e 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.1.0 +ENV NODE_VERSION 18.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -45,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ From d6da749f2cdceb30e73e381260c11f51b98db434 Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Tue, 17 May 2022 17:31:05 -0300 Subject: [PATCH 579/818] keys: add key for @rafaelgss --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index 881732c4d2..8d3e6d58cc 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -6,6 +6,7 @@ 61FC681DFB92A079F1685E77973F295594EC4689 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 +890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C DD8F2338BAE7501E3DD5AC78C273792F7D83545D A48C2BEE680E841632CD4E44F07496B3EB3C1762 From fa12fbdebdc5881ede3991184d81793b768caf3a Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 18 May 2022 21:20:15 +0200 Subject: [PATCH 580/818] fix: rollback changes to v16 and 17 --- 16/alpine3.14/Dockerfile | 3 +-- 16/alpine3.15/Dockerfile | 3 +-- 16/bullseye-slim/Dockerfile | 3 +-- 16/bullseye/Dockerfile | 3 +-- 16/buster-slim/Dockerfile | 3 +-- 16/buster/Dockerfile | 3 +-- 16/stretch-slim/Dockerfile | 3 +-- 16/stretch/Dockerfile | 3 +-- 17/alpine3.14/Dockerfile | 3 +-- 17/alpine3.15/Dockerfile | 3 +-- 17/bullseye-slim/Dockerfile | 3 +-- 17/bullseye/Dockerfile | 3 +-- 17/buster-slim/Dockerfile | 3 +-- 17/buster/Dockerfile | 3 +-- 17/stretch-slim/Dockerfile | 3 +-- 17/stretch/Dockerfile | 3 +-- 16 files changed, 16 insertions(+), 32 deletions(-) diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index dfce54dd55..0bad7797e5 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +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 3acb3295da..b2c94338a5 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +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 67ce9fedd5..fb9c53ae47 100644 --- a/16/bullseye-slim/Dockerfile +++ b/16/bullseye-slim/Dockerfile @@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index a2fa9cd5ed..ab2557c3f6 100644 --- a/16/bullseye/Dockerfile +++ b/16/bullseye/Dockerfile @@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +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 a78f8bda1f..692be02032 100644 --- a/16/buster-slim/Dockerfile +++ b/16/buster-slim/Dockerfile @@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index cd83885e81..e18d5e39b9 100644 --- a/16/buster/Dockerfile +++ b/16/buster/Dockerfile @@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +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 902f431ef9..8b846ba807 100644 --- a/16/stretch-slim/Dockerfile +++ b/16/stretch-slim/Dockerfile @@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index 4b517b9f46..f7b6d933a4 100644 --- a/16/stretch/Dockerfile +++ b/16/stretch/Dockerfile @@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && for key in \ diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 472c7ae06c..0bb9d35a47 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index 1f33b8de40..75510fa56c 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -41,7 +41,6 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -73,7 +72,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index 58c897672c..ee640890da 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/bullseye-slim/Dockerfile @@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 3139cb6523..12bd999658 100644 --- a/17/bullseye/Dockerfile +++ b/17/bullseye/Dockerfile @@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && for key in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 8c77aad306..90b9cbba68 100644 --- a/17/buster-slim/Dockerfile +++ b/17/buster-slim/Dockerfile @@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 8cc76ffb2d..34d3c71396 100644 --- a/17/buster/Dockerfile +++ b/17/buster/Dockerfile @@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && for key in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index 58459a65ce..f5bde19111 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/stretch-slim/Dockerfile @@ -25,7 +25,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -57,7 +56,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index 9281b48eba..1209e3fb63 100644 --- a/17/stretch/Dockerfile +++ b/17/stretch/Dockerfile @@ -23,7 +23,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ @@ -46,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.18 RUN set -ex \ && for key in \ From 194a775693fd40598a1bafd4858e063c24efeb42 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 2 Jun 2022 11:19:33 -0400 Subject: [PATCH 581/818] feat: Node.js 16.15.1 --- 16/alpine3.14/Dockerfile | 8 +++++--- 16/alpine3.15/Dockerfile | 8 +++++--- 16/bullseye-slim/Dockerfile | 6 ++++-- 16/bullseye/Dockerfile | 6 ++++-- 16/buster-slim/Dockerfile | 6 ++++-- 16/buster/Dockerfile | 6 ++++-- 16/stretch-slim/Dockerfile | 6 ++++-- 16/stretch/Dockerfile | 6 ++++-- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.14/Dockerfile index 0bad7797e5..ea578fb811 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 16.15.0 +ENV NODE_VERSION 16.15.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="4db62cabc0647fc18f537ed10b5573f3c23ffb4d4434e40713e7e472f1ed4e55" \ + CHECKSUM="3acef00c21ca044a74710a56492c40d715ea5a707ce8629d6df2415f3cf89fec" \ ;; \ *) ;; \ esac \ @@ -41,8 +41,10 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -72,7 +74,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 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 b2c94338a5..c8c6619ccd 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.15.0 +ENV NODE_VERSION 16.15.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="4db62cabc0647fc18f537ed10b5573f3c23ffb4d4434e40713e7e472f1ed4e55" \ + CHECKSUM="3acef00c21ca044a74710a56492c40d715ea5a707ce8629d6df2415f3cf89fec" \ ;; \ *) ;; \ esac \ @@ -41,8 +41,10 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -72,7 +74,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 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 fb9c53ae47..9ab19487f2 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.15.0 +ENV NODE_VERSION 16.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,8 +25,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -56,7 +58,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index ab2557c3f6..cc973f364a 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.15.0 +ENV NODE_VERSION 16.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,8 +23,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -45,7 +47,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 692be02032..42d7ae96a0 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.15.0 +ENV NODE_VERSION 16.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,8 +25,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -56,7 +58,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index e18d5e39b9..e60c109127 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.15.0 +ENV NODE_VERSION 16.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,8 +23,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -45,7 +47,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile index 8b846ba807..f7e598b287 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.15.0 +ENV NODE_VERSION 16.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,8 +25,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -56,7 +58,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile index f7b6d933a4..efe1c2f017 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.15.0 +ENV NODE_VERSION 16.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,8 +23,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -45,7 +47,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ From 5a93991b11ce38572fed65cfc2eb5139ce53456d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 2 Jun 2022 11:20:03 -0400 Subject: [PATCH 582/818] feat: Node.js 17.9.1 --- 17/alpine3.14/Dockerfile | 8 +++++--- 17/alpine3.15/Dockerfile | 8 +++++--- 17/bullseye-slim/Dockerfile | 6 ++++-- 17/bullseye/Dockerfile | 6 ++++-- 17/buster-slim/Dockerfile | 6 ++++-- 17/buster/Dockerfile | 6 ++++-- 17/stretch-slim/Dockerfile | 6 ++++-- 17/stretch/Dockerfile | 6 ++++-- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile index 0bb9d35a47..e6c7b68547 100644 --- a/17/alpine3.14/Dockerfile +++ b/17/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 17.9.0 +ENV NODE_VERSION 17.9.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="8b4f38b239b342bef694ba41b82a127e94688be37cdda8a355b2d8307a0dcf20" \ + CHECKSUM="cb7c953b9dbe619f98f6f061b92a655138b158b4a2e61e78e44e6652db42dcd2" \ ;; \ *) ;; \ esac \ @@ -41,8 +41,10 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -72,7 +74,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile index 75510fa56c..d960634f8f 100644 --- a/17/alpine3.15/Dockerfile +++ b/17/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 17.9.0 +ENV NODE_VERSION 17.9.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="8b4f38b239b342bef694ba41b82a127e94688be37cdda8a355b2d8307a0dcf20" \ + CHECKSUM="cb7c953b9dbe619f98f6f061b92a655138b158b4a2e61e78e44e6652db42dcd2" \ ;; \ *) ;; \ esac \ @@ -41,8 +41,10 @@ RUN addgroup -g 1000 node \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -72,7 +74,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && for key in \ diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile index ee640890da..64480ff047 100644 --- a/17/bullseye-slim/Dockerfile +++ b/17/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 17.9.0 +ENV NODE_VERSION 17.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,8 +25,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -56,7 +58,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile index 12bd999658..32e1004bb1 100644 --- a/17/bullseye/Dockerfile +++ b/17/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 17.9.0 +ENV NODE_VERSION 17.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,8 +23,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -45,7 +47,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile index 90b9cbba68..177514de3c 100644 --- a/17/buster-slim/Dockerfile +++ b/17/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 17.9.0 +ENV NODE_VERSION 17.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,8 +25,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -56,7 +58,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile index 34d3c71396..1b121872db 100644 --- a/17/buster/Dockerfile +++ b/17/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 17.9.0 +ENV NODE_VERSION 17.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,8 +23,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -45,7 +47,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile index f5bde19111..c520c5de75 100644 --- a/17/stretch-slim/Dockerfile +++ b/17/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 17.9.0 +ENV NODE_VERSION 17.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -25,8 +25,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -56,7 +58,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile index 1209e3fb63..20b27a61a1 100644 --- a/17/stretch/Dockerfile +++ b/17/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 17.9.0 +ENV NODE_VERSION 17.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,8 +23,10 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ @@ -45,7 +47,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.18 +ENV YARN_VERSION 1.22.19 RUN set -ex \ && for key in \ From 90065897cdca681a20c3383f28b436bc2434928f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 2 Jun 2022 11:20:17 -0400 Subject: [PATCH 583/818] feat: Node.js 18.3.0 --- 18/alpine3.14/Dockerfile | 5 +++-- 18/alpine3.15/Dockerfile | 5 +++-- 18/bullseye-slim/Dockerfile | 3 ++- 18/bullseye/Dockerfile | 3 ++- 18/buster-slim/Dockerfile | 3 ++- 18/buster/Dockerfile | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/18/alpine3.14/Dockerfile b/18/alpine3.14/Dockerfile index 4921e086a7..119bee8bcc 100644 --- a/18/alpine3.14/Dockerfile +++ b/18/alpine3.14/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14 -ENV NODE_VERSION 18.2.0 +ENV NODE_VERSION 18.3.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="2a0b06e7322d79863191a8a4da517be4df5ff18920b2315fe3e8cd8ca0ae4025" \ + CHECKSUM="db21043c8b2fe3e6dbca31de8b9e9fe42de2813a630f47ecf69922eadba40648" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index a9b69571be..ae26d1aae6 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.2.0 +ENV NODE_VERSION 18.3.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="2a0b06e7322d79863191a8a4da517be4df5ff18920b2315fe3e8cd8ca0ae4025" \ + CHECKSUM="db21043c8b2fe3e6dbca31de8b9e9fe42de2813a630f47ecf69922eadba40648" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 7ac592e0fa..f8d4bd0c84 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.2.0 +ENV NODE_VERSION 18.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index e7ade03259..adb9bb9e88 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.2.0 +ENV NODE_VERSION 18.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 1a4527dbc1..63b3f13c2d 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.2.0 +ENV NODE_VERSION 18.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index a98eb1a44e..1bb1d92a06 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.2.0 +ENV NODE_VERSION 18.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ From bfa961393b658de05964800580b034c75930d223 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sun, 5 Jun 2022 01:26:20 -0400 Subject: [PATCH 584/818] feat: remove EOL Node.js 17 --- 17/alpine3.14/Dockerfile | 101 -------------------------- 17/alpine3.14/docker-entrypoint.sh | 11 --- 17/alpine3.15/Dockerfile | 101 -------------------------- 17/alpine3.15/docker-entrypoint.sh | 11 --- 17/bullseye-slim/Dockerfile | 97 ------------------------- 17/bullseye-slim/docker-entrypoint.sh | 11 --- 17/bullseye/Dockerfile | 73 ------------------- 17/bullseye/docker-entrypoint.sh | 11 --- 17/buster-slim/Dockerfile | 97 ------------------------- 17/buster-slim/docker-entrypoint.sh | 11 --- 17/buster/Dockerfile | 73 ------------------- 17/buster/docker-entrypoint.sh | 11 --- 17/stretch-slim/Dockerfile | 97 ------------------------- 17/stretch-slim/docker-entrypoint.sh | 11 --- 17/stretch/Dockerfile | 73 ------------------- 17/stretch/docker-entrypoint.sh | 11 --- versions.json | 65 ----------------- 17 files changed, 865 deletions(-) delete mode 100644 17/alpine3.14/Dockerfile delete mode 100755 17/alpine3.14/docker-entrypoint.sh delete mode 100644 17/alpine3.15/Dockerfile delete mode 100755 17/alpine3.15/docker-entrypoint.sh delete mode 100644 17/bullseye-slim/Dockerfile delete mode 100755 17/bullseye-slim/docker-entrypoint.sh delete mode 100644 17/bullseye/Dockerfile delete mode 100755 17/bullseye/docker-entrypoint.sh delete mode 100644 17/buster-slim/Dockerfile delete mode 100755 17/buster-slim/docker-entrypoint.sh delete mode 100644 17/buster/Dockerfile delete mode 100755 17/buster/docker-entrypoint.sh delete mode 100644 17/stretch-slim/Dockerfile delete mode 100755 17/stretch-slim/docker-entrypoint.sh delete mode 100644 17/stretch/Dockerfile delete mode 100755 17/stretch/docker-entrypoint.sh diff --git a/17/alpine3.14/Dockerfile b/17/alpine3.14/Dockerfile deleted file mode 100644 index e6c7b68547..0000000000 --- a/17/alpine3.14/Dockerfile +++ /dev/null @@ -1,101 +0,0 @@ -FROM alpine:3.14 - -ENV NODE_VERSION 17.9.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="cb7c953b9dbe619f98f6f061b92a655138b158b4a2e61e78e44e6652db42dcd2" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/alpine3.14/docker-entrypoint.sh b/17/alpine3.14/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/alpine3.14/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/alpine3.15/Dockerfile b/17/alpine3.15/Dockerfile deleted file mode 100644 index d960634f8f..0000000000 --- a/17/alpine3.15/Dockerfile +++ /dev/null @@ -1,101 +0,0 @@ -FROM alpine:3.15 - -ENV NODE_VERSION 17.9.1 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="cb7c953b9dbe619f98f6f061b92a655138b158b4a2e61e78e44e6652db42dcd2" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/alpine3.15/docker-entrypoint.sh b/17/alpine3.15/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/alpine3.15/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/bullseye-slim/Dockerfile b/17/bullseye-slim/Dockerfile deleted file mode 100644 index 64480ff047..0000000000 --- a/17/bullseye-slim/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -FROM debian:bullseye-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 17.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/bullseye-slim/docker-entrypoint.sh b/17/bullseye-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/bullseye-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile deleted file mode 100644 index 32e1004bb1..0000000000 --- a/17/bullseye/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM buildpack-deps:bullseye - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 17.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/bullseye/docker-entrypoint.sh b/17/bullseye/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/bullseye/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/buster-slim/Dockerfile b/17/buster-slim/Dockerfile deleted file mode 100644 index 177514de3c..0000000000 --- a/17/buster-slim/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 17.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/buster-slim/docker-entrypoint.sh b/17/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/buster/Dockerfile b/17/buster/Dockerfile deleted file mode 100644 index 1b121872db..0000000000 --- a/17/buster/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 17.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/buster/docker-entrypoint.sh b/17/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/stretch-slim/Dockerfile b/17/stretch-slim/Dockerfile deleted file mode 100644 index c520c5de75..0000000000 --- a/17/stretch-slim/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 17.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/stretch-slim/docker-entrypoint.sh b/17/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/17/stretch/Dockerfile b/17/stretch/Dockerfile deleted file mode 100644 index 20b27a61a1..0000000000 --- a/17/stretch/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 17.9.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/17/stretch/docker-entrypoint.sh b/17/stretch/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/17/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index 99f94b8805..af1672479f 100644 --- a/versions.json +++ b/versions.json @@ -54,71 +54,6 @@ ] } }, - "17": { - "start": "2021-10-19", - "lts": "", - "maintenance": "2022-04-01", - "end": "2022-06-01", - "codename": "", - "alpine-default": "alpine3.15", - "debian-default": "bullseye", - "variants": { - "alpine3.14": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.15": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "stretch": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "stretch-slim": [ - "amd64", - "arm32v7", - "arm64v8" - ] - } - }, "16": { "start": "2021-04-20", "lts": "2021-10-26", From 23e032fd5377a16dcc527215c1c3f91bc57cc2ab Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Tue, 24 May 2022 14:52:54 +0200 Subject: [PATCH 585/818] Add Alpine 3.16 variant Also remove Alpine 3.14 --- 14/{alpine3.14 => alpine3.16}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 16/{alpine3.14 => alpine3.16}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 18/{alpine3.14 => alpine3.16}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 architectures | 14 +++++++------- config | 2 +- versions.json | 18 +++++++++--------- 9 files changed, 20 insertions(+), 20 deletions(-) rename 14/{alpine3.14 => alpine3.16}/Dockerfile (99%) rename 14/{alpine3.14 => alpine3.16}/docker-entrypoint.sh (100%) rename 16/{alpine3.14 => alpine3.16}/Dockerfile (99%) rename 16/{alpine3.14 => alpine3.16}/docker-entrypoint.sh (100%) rename 18/{alpine3.14 => alpine3.16}/Dockerfile (99%) rename 18/{alpine3.14 => alpine3.16}/docker-entrypoint.sh (100%) diff --git a/14/alpine3.14/Dockerfile b/14/alpine3.16/Dockerfile similarity index 99% rename from 14/alpine3.14/Dockerfile rename to 14/alpine3.16/Dockerfile index c51387ec23..080190da14 100644 --- a/14/alpine3.14/Dockerfile +++ b/14/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.16 ENV NODE_VERSION 14.19.3 diff --git a/14/alpine3.14/docker-entrypoint.sh b/14/alpine3.16/docker-entrypoint.sh similarity index 100% rename from 14/alpine3.14/docker-entrypoint.sh rename to 14/alpine3.16/docker-entrypoint.sh diff --git a/16/alpine3.14/Dockerfile b/16/alpine3.16/Dockerfile similarity index 99% rename from 16/alpine3.14/Dockerfile rename to 16/alpine3.16/Dockerfile index ea578fb811..79453e61c2 100644 --- a/16/alpine3.14/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.16 ENV NODE_VERSION 16.15.1 diff --git a/16/alpine3.14/docker-entrypoint.sh b/16/alpine3.16/docker-entrypoint.sh similarity index 100% rename from 16/alpine3.14/docker-entrypoint.sh rename to 16/alpine3.16/docker-entrypoint.sh diff --git a/18/alpine3.14/Dockerfile b/18/alpine3.16/Dockerfile similarity index 99% rename from 18/alpine3.14/Dockerfile rename to 18/alpine3.16/Dockerfile index 119bee8bcc..397ae7c4b2 100644 --- a/18/alpine3.14/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.16 ENV NODE_VERSION 18.3.0 diff --git a/18/alpine3.14/docker-entrypoint.sh b/18/alpine3.16/docker-entrypoint.sh similarity index 100% rename from 18/alpine3.14/docker-entrypoint.sh rename to 18/alpine3.16/docker-entrypoint.sh diff --git a/architectures b/architectures index 02a1af213f..2a648d4f89 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -arm32v6 alpine3.14,alpine3.15 -arm32v7 alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -i386 alpine3.14,alpine3.15 -ppc64le alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.14,alpine3.15,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm32v6 alpine3.15,alpine3.16 +arm32v7 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm64v8 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +i386 alpine3.15,alpine3.16 +ppc64le alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index 7cb78b8f6c..1ebfd3a3d8 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant bullseye -alpine_version 3.15 +alpine_version 3.16 debian_versions stretch bullseye buster diff --git a/versions.json b/versions.json index af1672479f..55df3d6c67 100644 --- a/versions.json +++ b/versions.json @@ -5,10 +5,10 @@ "maintenance": "2023-10-18", "end": "2025-04-30", "codename": "", - "alpine-default": "alpine3.15", + "alpine-default": "alpine3.16", "debian-default": "bullseye", "variants": { - "alpine3.14": [ + "alpine3.15": [ "amd64", "arm32v6", "arm32v7", @@ -16,7 +16,7 @@ "ppc64le", "s390x" ], - "alpine3.15": [ + "alpine3.16": [ "amd64", "arm32v6", "arm32v7", @@ -60,10 +60,10 @@ "maintenance": "2022-10-18", "end": "2024-04-30", "codename": "gallium", - "alpine-default": "alpine3.15", + "alpine-default": "alpine3.16", "debian-default": "buster", "variants": { - "alpine3.14": [ + "alpine3.15": [ "amd64", "arm32v6", "arm32v7", @@ -71,7 +71,7 @@ "ppc64le", "s390x" ], - "alpine3.15": [ + "alpine3.16": [ "amd64", "arm32v6", "arm32v7", @@ -125,10 +125,10 @@ "maintenance": "2021-10-19", "end": "2023-04-30", "codename": "fermium", - "alpine-default": "alpine3.15", + "alpine-default": "alpine3.16", "debian-default": "stretch", "variants": { - "alpine3.14": [ + "alpine3.15": [ "amd64", "arm32v6", "arm32v7", @@ -136,7 +136,7 @@ "ppc64le", "s390x" ], - "alpine3.15": [ + "alpine3.16": [ "amd64", "arm32v6", "arm32v7", From d76a0ed3a8849b59292ea4006468e57782c54345 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 15 Jun 2022 16:08:41 +0800 Subject: [PATCH 586/818] docs: Update GitHub links in CONTRIBUTING.md Those links in the doc are now all 301 redirected to somewhere else, should better update them before it's dead. --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6952d37890..5e1e87158c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,12 +14,12 @@ New **NPM** releases are not tracked. We simply use the NPM version bundled in t If you'd like to help us by submitting a PR for a version update, please do the following: -1. [Fork this project.](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) -1. [Clone the forked repository.](https://help.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) +1. [Fork this project.](https://docs.github.com/en/get-started/quickstart/fork-a-repo) +1. [Clone the forked repository.](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) 1. Create a branch for the update PR. For example, `git checkout main; git checkout -b version-update`. 1. Run `./update.sh`. You can see additional options by using accessing the built-in help documentation with `./update.sh -h`. This script will automatically update the appropriate files with the latest versions and checksums. 1. Commit the modified files to the `version-update` branch and push the branch to your fork. -1. [Create a PR to merge the branch from your fork into this project's default branch.](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork). +1. [Create a PR to merge the branch from your fork into this project's default branch.](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork). ## Adding dependencies to the base images From 07c284ebe50708eb0c1b08872fd8e1701c099485 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 16 Jun 2022 17:33:47 +0800 Subject: [PATCH 587/818] docs: Improve markdown format in README.md There should be a blank line after the headings --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6446f33e46..c6ddbcae02 100644 --- a/README.md +++ b/README.md @@ -193,11 +193,13 @@ image as a base, add the things you need in your own Dockerfile examples of how to install packages if you are unfamiliar). ### `node:buster` + This image is based on version 10 of [Debian](http://debian.org), available in [the `debian` official image](https://hub.docker.com/_/debian). ### `node:stretch` + This image is based on version 9 of [Debian](http://debian.org), available in [the `debian` official image](https://hub.docker.com/_/debian). From c87ff785fe4be8271b95d03e6c226d07d79df003 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 16 Jun 2022 15:13:29 -0400 Subject: [PATCH 588/818] feat: Node.js 18.4.0 --- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index ae26d1aae6..26b8270e44 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.3.0 +ENV NODE_VERSION 18.4.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="db21043c8b2fe3e6dbca31de8b9e9fe42de2813a630f47ecf69922eadba40648" \ + CHECKSUM="974068f6261f9e3f2eba7d158fd21405460fb2285081fa6a2337379e1647bd3f" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 397ae7c4b2..448df37b24 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.3.0 +ENV NODE_VERSION 18.4.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="db21043c8b2fe3e6dbca31de8b9e9fe42de2813a630f47ecf69922eadba40648" \ + CHECKSUM="974068f6261f9e3f2eba7d158fd21405460fb2285081fa6a2337379e1647bd3f" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index f8d4bd0c84..3df1e84878 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.3.0 +ENV NODE_VERSION 18.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index adb9bb9e88..e4f43d04f1 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.3.0 +ENV NODE_VERSION 18.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 63b3f13c2d..47cd299965 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.3.0 +ENV NODE_VERSION 18.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 1bb1d92a06..ccbdd16e50 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.3.0 +ENV NODE_VERSION 18.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 583afee49c1afd3f52686662068e6b1a88266efb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 21 Jun 2022 01:22:22 +0800 Subject: [PATCH 589/818] Add markdown-link-check GitHub Docs workaround, cc #1739 Reference: - https://github.com/tcort/markdown-link-check/issues/201 --- .github/workflows/markdown-link-check.yml | 3 ++- markdown_link_check_config.json | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 markdown_link_check_config.json diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 93ccabb296..8dfb107f00 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - "**/*.md" + - ".markdown-link-check.json" permissions: contents: read @@ -19,4 +20,4 @@ jobs: - name: Install markdown-link-check run: npm i -g markdown-link-check - name: Run markdown-link-check on MD files - run: find . -name "*.md" | xargs -n 1 markdown-link-check -q + run: find . -name "*.md" | xargs -n 1 markdown-link-check -c markdown_link_check_config.json -q diff --git a/markdown_link_check_config.json b/markdown_link_check_config.json new file mode 100644 index 0000000000..1b8b1d40f6 --- /dev/null +++ b/markdown_link_check_config.json @@ -0,0 +1,12 @@ +{ + "httpHeaders": [ + { + "urls": [ + "https://docs.github.com" + ], + "headers": { + "Accept-Encoding": "br, gzip, deflate" + } + } + ] +} From ec0763837652e423ef598d5d7493259f8d7f6be7 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 21 Jun 2022 23:05:00 +0800 Subject: [PATCH 590/818] Fix GitHub Action for markdown-link-check trigger cc #1742 --- .github/workflows/markdown-link-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 8dfb107f00..29230d41a1 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -4,7 +4,7 @@ on: pull_request: paths: - "**/*.md" - - ".markdown-link-check.json" + - "markdown_link_check_config.json" permissions: contents: read From 4f1d6a3875d1833ef57d87ed1999c41dbe6bd82c Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 1 Jul 2022 22:34:13 -0400 Subject: [PATCH 591/818] chore: drop EOL Stretch images --- 14/stretch-slim/Dockerfile | 96 --------------------------- 14/stretch-slim/docker-entrypoint.sh | 11 ---- 14/stretch/Dockerfile | 72 --------------------- 14/stretch/docker-entrypoint.sh | 11 ---- 16/stretch-slim/Dockerfile | 97 ---------------------------- 16/stretch-slim/docker-entrypoint.sh | 11 ---- 16/stretch/Dockerfile | 73 --------------------- 16/stretch/docker-entrypoint.sh | 11 ---- README.md | 6 +- SECURITY.md | 2 +- architectures | 6 +- versions.json | 22 +------ 12 files changed, 8 insertions(+), 410 deletions(-) delete mode 100644 14/stretch-slim/Dockerfile delete mode 100755 14/stretch-slim/docker-entrypoint.sh delete mode 100644 14/stretch/Dockerfile delete mode 100755 14/stretch/docker-entrypoint.sh delete mode 100644 16/stretch-slim/Dockerfile delete mode 100755 16/stretch-slim/docker-entrypoint.sh delete mode 100644 16/stretch/Dockerfile delete mode 100755 16/stretch/docker-entrypoint.sh diff --git a/14/stretch-slim/Dockerfile b/14/stretch-slim/Dockerfile deleted file mode 100644 index 501c3d3df5..0000000000 --- a/14/stretch-slim/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 14.19.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/stretch-slim/docker-entrypoint.sh b/14/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/stretch/Dockerfile b/14/stretch/Dockerfile deleted file mode 100644 index 3722325a66..0000000000 --- a/14/stretch/Dockerfile +++ /dev/null @@ -1,72 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 14.19.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/stretch/docker-entrypoint.sh b/14/stretch/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/stretch-slim/Dockerfile b/16/stretch-slim/Dockerfile deleted file mode 100644 index f7e598b287..0000000000 --- a/16/stretch-slim/Dockerfile +++ /dev/null @@ -1,97 +0,0 @@ -FROM debian:stretch-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.15.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/stretch-slim/docker-entrypoint.sh b/16/stretch-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/stretch-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/stretch/Dockerfile b/16/stretch/Dockerfile deleted file mode 100644 index efe1c2f017..0000000000 --- a/16/stretch/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -FROM buildpack-deps:stretch - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.15.1 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/stretch/docker-entrypoint.sh b/16/stretch/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/stretch/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/README.md b/README.md index 5d8e710740..ee6b4b97d6 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The official Node.js docker image, made with love by the node community. - [`node:`](#nodeversion) - [`node:alpine`](#nodealpine) - [`node:buster`](#nodebuster) - - [`node:stretch`](#nodestretch) + - [`node:bullseye`](#nodebullseye) - [`node:slim`](#nodeslim) - [License](#license) - [Supported Docker versions](#supported-docker-versions) @@ -198,9 +198,9 @@ This image is based on version 10 of [Debian](http://debian.org), available in [the `debian` official image](https://hub.docker.com/_/debian). -### `node:stretch` +### `node:bullseye` -This image is based on version 9 of +This image is based on version 11 of [Debian](http://debian.org), available in [the `debian` official image](https://hub.docker.com/_/debian). diff --git a/SECURITY.md b/SECURITY.md index 4200f99566..340da3d7c2 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,6 +7,6 @@ Security issues relating to Node.js project should follow the process documented CVEs for the base image packages should be reported to those repositories. Nothing to address those CVEs is in the hands of this repos. - [Alpine](https://github.com/alpinelinux/docker-alpine) -- [Debian (buster, bullseye, stretch)](https://github.com/debuerreotype/docker-debian-artifacts) +- [Debian (buster, bullseye)](https://github.com/debuerreotype/docker-debian-artifacts) When base images are patched, the images are rebuilt and rolled out to the Docker hub without intervention by this repo. This process is explained in . diff --git a/architectures b/architectures index 2a648d4f89..3b6ce5fc09 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +amd64 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim arm32v6 alpine3.15,alpine3.16 -arm32v7 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim -arm64v8 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim,stretch,stretch-slim +arm32v7 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim +arm64v8 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim i386 alpine3.15,alpine3.16 ppc64le alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim s390x alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim diff --git a/versions.json b/versions.json index 55df3d6c67..a63957e3aa 100644 --- a/versions.json +++ b/versions.json @@ -106,16 +106,6 @@ "arm64v8", "ppc64le", "s390x" - ], - "stretch": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "stretch-slim": [ - "amd64", - "arm32v7", - "arm64v8" ] } }, @@ -126,7 +116,7 @@ "end": "2023-04-30", "codename": "fermium", "alpine-default": "alpine3.16", - "debian-default": "stretch", + "debian-default": "buster", "variants": { "alpine3.15": [ "amd64", @@ -171,16 +161,6 @@ "arm64v8", "ppc64le", "s390x" - ], - "stretch": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "stretch-slim": [ - "amd64", - "arm32v7", - "arm64v8" ] } } From f82af606acd44dc6be7fbb2a069922afa32657f3 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 7 Jul 2022 23:48:34 +0000 Subject: [PATCH 592/818] feat: Node.js 14.20.0, 16.16.0, 18.5.0 --- 14/alpine3.15/Dockerfile | 5 +++-- 14/alpine3.16/Dockerfile | 5 +++-- 14/bullseye-slim/Dockerfile | 3 ++- 14/bullseye/Dockerfile | 3 ++- 14/buster-slim/Dockerfile | 3 ++- 14/buster/Dockerfile | 3 ++- 16/alpine3.15/Dockerfile | 4 ++-- 16/alpine3.16/Dockerfile | 4 ++-- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 18 files changed, 30 insertions(+), 24 deletions(-) diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 467df0338a..69654a1151 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.19.3 +ENV NODE_VERSION 14.20.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="2a91d0d2fda04c267e2c1d956b24378d1c34fcec489ad82695f4b23af0e22c1d" \ + CHECKSUM="6c96fdd6438cb919f4861419b632165697aabb1233d8da6cf3f7886b221416bf" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/14/alpine3.16/Dockerfile b/14/alpine3.16/Dockerfile index 080190da14..d14ac1b58f 100644 --- a/14/alpine3.16/Dockerfile +++ b/14/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 14.19.3 +ENV NODE_VERSION 14.20.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="2a91d0d2fda04c267e2c1d956b24378d1c34fcec489ad82695f4b23af0e22c1d" \ + CHECKSUM="6c96fdd6438cb919f4861419b632165697aabb1233d8da6cf3f7886b221416bf" \ ;; \ *) ;; \ esac \ @@ -44,6 +44,7 @@ RUN addgroup -g 1000 node \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 584bc20955..4b1242f14a 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.19.3 +ENV NODE_VERSION 14.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 31cb1864f7..a841cdbae3 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.19.3 +ENV NODE_VERSION 14.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index ae85fd047a..697630c052 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.19.3 +ENV NODE_VERSION 14.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 5632222e5f..785706c127 100644 --- a/14/buster/Dockerfile +++ b/14/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.19.3 +ENV NODE_VERSION 14.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -26,6 +26,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index c8c6619ccd..ad8fc523e1 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.15.1 +ENV NODE_VERSION 16.16.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="3acef00c21ca044a74710a56492c40d715ea5a707ce8629d6df2415f3cf89fec" \ + CHECKSUM="2b74f0baaaa931ffc46573874a7d7435b642d28f1f283104ac297499fba99f0a" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index 79453e61c2..3022da6e78 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.15.1 +ENV NODE_VERSION 16.16.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="3acef00c21ca044a74710a56492c40d715ea5a707ce8629d6df2415f3cf89fec" \ + CHECKSUM="2b74f0baaaa931ffc46573874a7d7435b642d28f1f283104ac297499fba99f0a" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 9ab19487f2..8d4dab0660 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.15.1 +ENV NODE_VERSION 16.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index cc973f364a..af93499a9c 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.15.1 +ENV NODE_VERSION 16.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 42d7ae96a0..59d5c12a74 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.15.1 +ENV NODE_VERSION 16.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index e60c109127..353c9e8a43 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.15.1 +ENV NODE_VERSION 16.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index 26b8270e44..e288c75bf0 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.4.0 +ENV NODE_VERSION 18.5.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="974068f6261f9e3f2eba7d158fd21405460fb2285081fa6a2337379e1647bd3f" \ + CHECKSUM="055e3dcfc1d7076739a14a9aa522deb8d6a0308b11f85f60da49b80be244625c" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 448df37b24..4057028933 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.4.0 +ENV NODE_VERSION 18.5.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="974068f6261f9e3f2eba7d158fd21405460fb2285081fa6a2337379e1647bd3f" \ + CHECKSUM="055e3dcfc1d7076739a14a9aa522deb8d6a0308b11f85f60da49b80be244625c" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 3df1e84878..4576b900f0 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.4.0 +ENV NODE_VERSION 18.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index e4f43d04f1..fd398cc22f 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.4.0 +ENV NODE_VERSION 18.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 47cd299965..5b3b5e4ab8 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.4.0 +ENV NODE_VERSION 18.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index ccbdd16e50..17d5b37243 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.4.0 +ENV NODE_VERSION 18.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From dd093107dcf173d158342c6f09f68c55feb81df5 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 14 Jul 2022 01:34:51 +0000 Subject: [PATCH 593/818] feat: Node.js 18.6.0 --- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index e288c75bf0..f30a06f10d 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.5.0 +ENV NODE_VERSION 18.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="055e3dcfc1d7076739a14a9aa522deb8d6a0308b11f85f60da49b80be244625c" \ + CHECKSUM="b9deb73770a8b2c5d4c6926bad723f68366718bb196b6278137fc6f6489147fe" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 4057028933..cf6a245b04 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.5.0 +ENV NODE_VERSION 18.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="055e3dcfc1d7076739a14a9aa522deb8d6a0308b11f85f60da49b80be244625c" \ + CHECKSUM="b9deb73770a8b2c5d4c6926bad723f68366718bb196b6278137fc6f6489147fe" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 4576b900f0..bfed856348 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.5.0 +ENV NODE_VERSION 18.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index fd398cc22f..dca4eeed29 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.5.0 +ENV NODE_VERSION 18.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 5b3b5e4ab8..d671e35208 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.5.0 +ENV NODE_VERSION 18.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 17d5b37243..9e5a6f9701 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.5.0 +ENV NODE_VERSION 18.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6249a0b2a460b010c9ee216c8ab81ea8c698ab07 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 27 Jul 2022 02:37:04 +0000 Subject: [PATCH 594/818] feat: Node.js 18.7.0 --- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index f30a06f10d..cf82f4d9ba 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.6.0 +ENV NODE_VERSION 18.7.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="b9deb73770a8b2c5d4c6926bad723f68366718bb196b6278137fc6f6489147fe" \ + CHECKSUM="4b63521950c04a282ab714aa67bb711a10c5825e7b456f5aea150f4bdfc4b32c" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index cf6a245b04..187fa66fe4 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.6.0 +ENV NODE_VERSION 18.7.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="b9deb73770a8b2c5d4c6926bad723f68366718bb196b6278137fc6f6489147fe" \ + CHECKSUM="4b63521950c04a282ab714aa67bb711a10c5825e7b456f5aea150f4bdfc4b32c" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index bfed856348..8965fe962c 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.6.0 +ENV NODE_VERSION 18.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index dca4eeed29..68766253e7 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.6.0 +ENV NODE_VERSION 18.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index d671e35208..f06cdf4829 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.6.0 +ENV NODE_VERSION 18.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 9e5a6f9701..5c98249057 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.6.0 +ENV NODE_VERSION 18.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9e9c0ecbd938e672add198b3cbbb2ab7704f6970 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 16 Aug 2022 14:04:21 +0000 Subject: [PATCH 595/818] feat: Node.js 16.17.0 --- 16/alpine3.15/Dockerfile | 4 ++-- 16/alpine3.16/Dockerfile | 4 ++-- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index ad8fc523e1..e269199a57 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.16.0 +ENV NODE_VERSION 16.17.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="2b74f0baaaa931ffc46573874a7d7435b642d28f1f283104ac297499fba99f0a" \ + CHECKSUM="6c94de8608fcd5b992f5f804c2d03bc3a7f422426760b1b80ea4ced486a694fe" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index 3022da6e78..c58c326216 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.16.0 +ENV NODE_VERSION 16.17.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="2b74f0baaaa931ffc46573874a7d7435b642d28f1f283104ac297499fba99f0a" \ + CHECKSUM="6c94de8608fcd5b992f5f804c2d03bc3a7f422426760b1b80ea4ced486a694fe" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 8d4dab0660..ce19bff234 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.16.0 +ENV NODE_VERSION 16.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index af93499a9c..e051fa3476 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.16.0 +ENV NODE_VERSION 16.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 59d5c12a74..3430941164 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.16.0 +ENV NODE_VERSION 16.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 353c9e8a43..26a615ec44 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.16.0 +ENV NODE_VERSION 16.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 946fe17cd1ca7a3a5741667c9df606b6e83e2d2d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 24 Aug 2022 20:04:21 +0000 Subject: [PATCH 596/818] feat: Node.js 18.8.0 --- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index cf82f4d9ba..a3ec79232e 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.7.0 +ENV NODE_VERSION 18.8.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="4b63521950c04a282ab714aa67bb711a10c5825e7b456f5aea150f4bdfc4b32c" \ + CHECKSUM="0db707b81e1ff47347e4ad11ec60b6da17828d9b2d54f60d24af1caf9ef641e8" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 187fa66fe4..6e0c52bf52 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.7.0 +ENV NODE_VERSION 18.8.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="4b63521950c04a282ab714aa67bb711a10c5825e7b456f5aea150f4bdfc4b32c" \ + CHECKSUM="0db707b81e1ff47347e4ad11ec60b6da17828d9b2d54f60d24af1caf9ef641e8" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 8965fe962c..9dc7b76bce 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.7.0 +ENV NODE_VERSION 18.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 68766253e7..359ea84e5f 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.7.0 +ENV NODE_VERSION 18.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index f06cdf4829..3b77a9eaef 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.7.0 +ENV NODE_VERSION 18.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 5c98249057..228f6af8f6 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.7.0 +ENV NODE_VERSION 18.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9a04c5c8894b1658b4d61abfde2fdcae9103ea67 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 24 Aug 2022 16:56:37 -0400 Subject: [PATCH 597/818] fix: remove ppc64le and s390x for buster --- versions.json | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/versions.json b/versions.json index a63957e3aa..0aa27827d7 100644 --- a/versions.json +++ b/versions.json @@ -41,16 +41,12 @@ "buster": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ], "buster-slim": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ] } }, @@ -96,16 +92,12 @@ "buster": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ], "buster-slim": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ] } }, @@ -151,16 +143,12 @@ "buster": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ], "buster-slim": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ] } } From f95846a323c3ca71009b5b1b6b5f9bfa326a56a3 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 8 Sep 2022 18:53:01 +0000 Subject: [PATCH 598/818] feat: Node.js 18.9.0 --- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index a3ec79232e..768cc2230b 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.8.0 +ENV NODE_VERSION 18.9.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="0db707b81e1ff47347e4ad11ec60b6da17828d9b2d54f60d24af1caf9ef641e8" \ + CHECKSUM="3e8a38d0967c0e918444fe1031e82eb3689cdb5eaeb197b1f2e2ec19f1846a8e" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 6e0c52bf52..6a24239a9c 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.8.0 +ENV NODE_VERSION 18.9.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="0db707b81e1ff47347e4ad11ec60b6da17828d9b2d54f60d24af1caf9ef641e8" \ + CHECKSUM="3e8a38d0967c0e918444fe1031e82eb3689cdb5eaeb197b1f2e2ec19f1846a8e" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 9dc7b76bce..4b806ab026 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.8.0 +ENV NODE_VERSION 18.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 359ea84e5f..6e3b6c2ae9 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.8.0 +ENV NODE_VERSION 18.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 3b77a9eaef..5f0cbaef75 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.8.0 +ENV NODE_VERSION 18.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 228f6af8f6..eba417330e 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.8.0 +ENV NODE_VERSION 18.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9025d87163ea406681ea762ab9b0263e696b257f Mon Sep 17 00:00:00 2001 From: Zsolt Szabo Date: Fri, 16 Sep 2022 14:07:58 +0200 Subject: [PATCH 599/818] Add an example of a smaller alpine image without npm/yarn --- docs/BestPractices.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index d15c0964e4..ce6c4289ba 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -204,3 +204,42 @@ FROM node:alpine as app ## Copy built node modules and binaries without including the toolchain COPY --from=builder node_modules . ``` + + +## Smaller images without npm/yarn + +If you want to achieve an even smaller image size than the `-alpine`, you can omit the npm/yarn like this: + +```Dockerfile +FROM node:18-alpine3.16 AS builder +WORKDIR /build-stage +COPY package*.json ./ +RUN npm ci + +# Copy the the files you need +COPY . ./ + +RUN npm run build + + +# Make sure the alpine version is the same as in the build stage +FROM alpine:3.16 +RUN apk add --no-cache libstdc++ +RUN apk add --no-cache dumb-init +RUN addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node + +COPY --from=builder /usr/local/bin/node /usr/local/bin/ +COPY --from=builder /usr/local/bin/docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +# Update the following lines based on your codebase +COPY --from=builder /build-stage/node_modules ./node_modules +COPY --from=builder /build-stage/dist ./dist + +RUN chown -R node:node ./ +USER node +# Run with dumb-init to not start node with PID=1, since Node.js was not designed to run as PID 1 +CMD ["dumb-init", "node", "dist/index.js"] +``` + + From 4e0fbe2f2e7f659f2c926cabfb1a3dcf4d26f4c0 Mon Sep 17 00:00:00 2001 From: Zsolt Szabo Date: Fri, 16 Sep 2022 14:20:33 +0200 Subject: [PATCH 600/818] Update README. Link to creating image without npm --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ee6b4b97d6..7916601489 100644 --- a/README.md +++ b/README.md @@ -192,6 +192,8 @@ image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar). +To make the image size even smaller, you can [bundle without npm/yarn](./docs/BestPractices.md#smaller-images-without-npmyarn). + ### `node:buster` This image is based on version 10 of From 999efab6467b005885bc81cd5df417736dc6b27c Mon Sep 17 00:00:00 2001 From: Zsolt Szabo Date: Fri, 16 Sep 2022 14:23:22 +0200 Subject: [PATCH 601/818] Update best practices table of Contents --- docs/BestPractices.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index ce6c4289ba..043c8d3cfb 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -16,6 +16,7 @@ - [Docker Run](#docker-run) - [Security](#security) - [node-gyp alpine](#node-gyp-alpine) +- [Smaller images without npm/yarn](#smaller-images-without-npmyarn) From 0c3d9de40cde11513657e119258fed3961358bfb Mon Sep 17 00:00:00 2001 From: Zsolt Szabo Date: Fri, 16 Sep 2022 17:16:51 +0200 Subject: [PATCH 602/818] Merge two commands in example dockerfile --- docs/BestPractices.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 043c8d3cfb..fc9c602ca8 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -225,8 +225,7 @@ RUN npm run build # Make sure the alpine version is the same as in the build stage FROM alpine:3.16 -RUN apk add --no-cache libstdc++ -RUN apk add --no-cache dumb-init +RUN apk add --no-cache libstdc++ dumb-init RUN addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node COPY --from=builder /usr/local/bin/node /usr/local/bin/ @@ -239,7 +238,7 @@ COPY --from=builder /build-stage/dist ./dist RUN chown -R node:node ./ USER node -# Run with dumb-init to not start node with PID=1, since Node.js was not designed to run as PID 1 +# Run with dumb-init to not start node with PID=1, since Node.js was not designed to run as PID 1 CMD ["dumb-init", "node", "dist/index.js"] ``` From ebc9c193822ba16b86906f87573be3d0e8b6a5e3 Mon Sep 17 00:00:00 2001 From: Zsolt Szabo Date: Sat, 17 Sep 2022 15:04:38 +0200 Subject: [PATCH 603/818] Update example config in best practices - add workdir - use chown on copy for smaller image - create a variable for alpine version instead of explaining in a comment --- docs/BestPractices.md | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index fc9c602ca8..5351845122 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -212,31 +212,29 @@ COPY --from=builder node_modules . If you want to achieve an even smaller image size than the `-alpine`, you can omit the npm/yarn like this: ```Dockerfile -FROM node:18-alpine3.16 AS builder +ARG ALPINE_VERSION=3.16 + + +FROM node:18-alpine${ALPINE_VERSION} AS builder WORKDIR /build-stage COPY package*.json ./ RUN npm ci - # Copy the the files you need COPY . ./ - RUN npm run build -# Make sure the alpine version is the same as in the build stage -FROM alpine:3.16 +FROM alpine:${ALPINE_VERSION} RUN apk add --no-cache libstdc++ dumb-init RUN addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node - COPY --from=builder /usr/local/bin/node /usr/local/bin/ COPY --from=builder /usr/local/bin/docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] - -# Update the following lines based on your codebase -COPY --from=builder /build-stage/node_modules ./node_modules -COPY --from=builder /build-stage/dist ./dist - -RUN chown -R node:node ./ +WORKDIR /usr/src/app +RUN chown node:node ./ +# Update the following COPY lines based on your codebase +COPY --chown=node:node --from=builder /build-stage/node_modules ./node_modules +COPY --chown=node:node --from=builder /build-stage/dist ./dist USER node # Run with dumb-init to not start node with PID=1, since Node.js was not designed to run as PID 1 CMD ["dumb-init", "node", "dist/index.js"] From c97bb67fb82bb10fd199cb4c4e57b3ab43605a9c Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Sat, 24 Sep 2022 01:36:29 +0000 Subject: [PATCH 604/818] feat: Node.js 14.20.1, 16.17.1, 18.9.1 --- 14/alpine3.15/Dockerfile | 4 ++-- 14/alpine3.16/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 16/alpine3.15/Dockerfile | 4 ++-- 16/alpine3.16/Dockerfile | 4 ++-- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 69654a1151..49df96e403 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.20.0 +ENV NODE_VERSION 14.20.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="6c96fdd6438cb919f4861419b632165697aabb1233d8da6cf3f7886b221416bf" \ + CHECKSUM="968f53b11f1432a16bbeae38e2ad4099b4e38d917c448b7134ff7d5c448642fb" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.16/Dockerfile b/14/alpine3.16/Dockerfile index d14ac1b58f..2a789b90c7 100644 --- a/14/alpine3.16/Dockerfile +++ b/14/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 14.20.0 +ENV NODE_VERSION 14.20.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="6c96fdd6438cb919f4861419b632165697aabb1233d8da6cf3f7886b221416bf" \ + CHECKSUM="968f53b11f1432a16bbeae38e2ad4099b4e38d917c448b7134ff7d5c448642fb" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 4b1242f14a..fb06839328 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.20.0 +ENV NODE_VERSION 14.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index a841cdbae3..5463008183 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.20.0 +ENV NODE_VERSION 14.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 697630c052..9bca1d52de 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.20.0 +ENV NODE_VERSION 14.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 785706c127..99d60bbdcc 100644 --- a/14/buster/Dockerfile +++ b/14/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.20.0 +ENV NODE_VERSION 14.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index e269199a57..4187d72aa5 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.17.0 +ENV NODE_VERSION 16.17.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="6c94de8608fcd5b992f5f804c2d03bc3a7f422426760b1b80ea4ced486a694fe" \ + CHECKSUM="58118370085f0fb1a6a66cc5562d0c341e560ac9c4d0311307b671283b7f5671" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index c58c326216..e003203c95 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.17.0 +ENV NODE_VERSION 16.17.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="6c94de8608fcd5b992f5f804c2d03bc3a7f422426760b1b80ea4ced486a694fe" \ + CHECKSUM="58118370085f0fb1a6a66cc5562d0c341e560ac9c4d0311307b671283b7f5671" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index ce19bff234..5202d57a57 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.17.0 +ENV NODE_VERSION 16.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index e051fa3476..3d9c9b1db9 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.17.0 +ENV NODE_VERSION 16.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 3430941164..c521792c0b 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.17.0 +ENV NODE_VERSION 16.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 26a615ec44..e1fc4b1512 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.17.0 +ENV NODE_VERSION 16.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index 768cc2230b..15db1c9fc1 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.9.0 +ENV NODE_VERSION 18.9.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="3e8a38d0967c0e918444fe1031e82eb3689cdb5eaeb197b1f2e2ec19f1846a8e" \ + CHECKSUM="1e237ce2468d295d80e6c5326106ac95d2d42a61142c8a7cab60ece481355c92" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 6a24239a9c..bcc709290a 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.9.0 +ENV NODE_VERSION 18.9.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="3e8a38d0967c0e918444fe1031e82eb3689cdb5eaeb197b1f2e2ec19f1846a8e" \ + CHECKSUM="1e237ce2468d295d80e6c5326106ac95d2d42a61142c8a7cab60ece481355c92" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 4b806ab026..97f6e220ae 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.9.0 +ENV NODE_VERSION 18.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 6e3b6c2ae9..3d212436fd 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.9.0 +ENV NODE_VERSION 18.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 5f0cbaef75..6f20ccf108 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.9.0 +ENV NODE_VERSION 18.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index eba417330e..5407132e00 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.9.0 +ENV NODE_VERSION 18.9.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 647fbaa404d4550375bc77b14925b0c2a1c06240 Mon Sep 17 00:00:00 2001 From: Zsolt Szabo Date: Wed, 28 Sep 2022 14:26:00 +0200 Subject: [PATCH 605/818] Refactor example in best practices --- docs/BestPractices.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 5351845122..008a667df8 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -214,7 +214,6 @@ If you want to achieve an even smaller image size than the `-alpine`, you can om ```Dockerfile ARG ALPINE_VERSION=3.16 - FROM node:18-alpine${ALPINE_VERSION} AS builder WORKDIR /build-stage COPY package*.json ./ @@ -223,19 +222,20 @@ RUN npm ci COPY . ./ RUN npm run build - FROM alpine:${ALPINE_VERSION} -RUN apk add --no-cache libstdc++ dumb-init -RUN addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node +# Create app directory +WORKDIR /usr/src/app +# Add required binaries +RUN apk add --no-cache libstdc++ dumb-init \ + && addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node \ + && chown node:node ./ COPY --from=builder /usr/local/bin/node /usr/local/bin/ COPY --from=builder /usr/local/bin/docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] -WORKDIR /usr/src/app -RUN chown node:node ./ -# Update the following COPY lines based on your codebase -COPY --chown=node:node --from=builder /build-stage/node_modules ./node_modules -COPY --chown=node:node --from=builder /build-stage/dist ./dist USER node +# Update the following COPY lines based on your codebase +COPY --from=builder /build-stage/node_modules ./node_modules +COPY --from=builder /build-stage/dist ./dist # Run with dumb-init to not start node with PID=1, since Node.js was not designed to run as PID 1 CMD ["dumb-init", "node", "dist/index.js"] ``` From 02a64a08a98a472c6141cd583d2e9fc47bcd9bfd Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 28 Sep 2022 21:50:26 +0000 Subject: [PATCH 606/818] feat: Node.js 18.10.0 --- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index 15db1c9fc1..b365b64e5a 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.9.1 +ENV NODE_VERSION 18.10.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="1e237ce2468d295d80e6c5326106ac95d2d42a61142c8a7cab60ece481355c92" \ + CHECKSUM="64012d01733e14b272a24b24fd5815b2fc60789df2b74f7e2643c7f1abdcbac0" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index bcc709290a..9a09dfbe98 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.9.1 +ENV NODE_VERSION 18.10.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="1e237ce2468d295d80e6c5326106ac95d2d42a61142c8a7cab60ece481355c92" \ + CHECKSUM="64012d01733e14b272a24b24fd5815b2fc60789df2b74f7e2643c7f1abdcbac0" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 97f6e220ae..f957df9ac5 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.9.1 +ENV NODE_VERSION 18.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 3d212436fd..799e006228 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.9.1 +ENV NODE_VERSION 18.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 6f20ccf108..3d1243689a 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.9.1 +ENV NODE_VERSION 18.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 5407132e00..97fd299a7e 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.9.1 +ENV NODE_VERSION 18.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 7264cd268e150d4a8e56f4939dd9323e0bb8e5d4 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 5 Oct 2022 17:33:45 -0700 Subject: [PATCH 607/818] chore: remove keys for emeritus releasers Refs: https://github.com/nodejs/Release/blob/3cd3c6a65188d0e64017d0cee11b9834a5753fd5/GOVERNANCE.md#offboarding-releasers Refs: https://github.com/nodejs/node/pull/44899 --- keys/node.keys | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keys/node.keys b/keys/node.keys index 8d3e6d58cc..a0f2ccc76e 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,14 +1,9 @@ 4ED778F539E3634C779C87C6D7062848A1AB005C 141F07595B7B3FFE74309A937405533BE57C7D57 -94AE36675C464D64BAFA68DD7434390BDBE9B9C5 74F12602B6F1C4E913FAA37AD3A89613643B6201 -71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 61FC681DFB92A079F1685E77973F295594EC4689 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C -DD8F2338BAE7501E3DD5AC78C273792F7D83545D -A48C2BEE680E841632CD4E44F07496B3EB3C1762 108F52B48DB57BB0CC439B2997B01419BD92F80A -B9E2F5981AA6E0CD28160D9FF13993A75599653C From 8edd510a1b2f64330fd7b865afd12d88c3c21679 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 12 Oct 2022 14:32:02 -0400 Subject: [PATCH 608/818] feat: Node.js 16.18.0 --- 16/alpine3.15/Dockerfile | 9 ++------- 16/alpine3.16/Dockerfile | 9 ++------- 16/bullseye-slim/Dockerfile | 7 +------ 16/bullseye/Dockerfile | 7 +------ 16/buster-slim/Dockerfile | 7 +------ 16/buster/Dockerfile | 7 +------ 6 files changed, 8 insertions(+), 38 deletions(-) diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index 4187d72aa5..2d7ebc7944 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.17.1 +ENV NODE_VERSION 16.18.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="58118370085f0fb1a6a66cc5562d0c341e560ac9c4d0311307b671283b7f5671" \ + CHECKSUM="e6b9c39f85eed0f625b570bbb3019db8761ab78a935eb44f20865ab35c4eec6c" \ ;; \ *) ;; \ esac \ @@ -38,18 +38,13 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index e003203c95..bfa565cec9 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.17.1 +ENV NODE_VERSION 16.18.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="58118370085f0fb1a6a66cc5562d0c341e560ac9c4d0311307b671283b7f5671" \ + CHECKSUM="e6b9c39f85eed0f625b570bbb3019db8761ab78a935eb44f20865ab35c4eec6c" \ ;; \ *) ;; \ esac \ @@ -38,18 +38,13 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 5202d57a57..f7a3b92d2d 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.17.1 +ENV NODE_VERSION 16.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,18 +22,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 3d9c9b1db9..3b50120984 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.17.1 +ENV NODE_VERSION 16.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index c521792c0b..f445740c51 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.17.1 +ENV NODE_VERSION 16.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,18 +22,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index e1fc4b1512..8c88d366df 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.17.1 +ENV NODE_VERSION 16.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From fdc0fd95b4a15af643d17508443f80ff6ec17433 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Oct 2022 23:57:58 -0400 Subject: [PATCH 609/818] feat: Node.js 18.11.0 --- 18/alpine3.15/Dockerfile | 9 ++------- 18/alpine3.16/Dockerfile | 9 ++------- 18/bullseye-slim/Dockerfile | 7 +------ 18/bullseye/Dockerfile | 7 +------ 18/buster-slim/Dockerfile | 7 +------ 18/buster/Dockerfile | 7 +------ 6 files changed, 8 insertions(+), 38 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index b365b64e5a..e3033b3787 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.10.0 +ENV NODE_VERSION 18.11.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="64012d01733e14b272a24b24fd5815b2fc60789df2b74f7e2643c7f1abdcbac0" \ + CHECKSUM="fb40af3a14014b0cf5d014db58f596cb7886f579dda8de2531eadce91ab4bb51" \ ;; \ *) ;; \ esac \ @@ -38,18 +38,13 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 9a09dfbe98..6fe64bb85b 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.10.0 +ENV NODE_VERSION 18.11.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="64012d01733e14b272a24b24fd5815b2fc60789df2b74f7e2643c7f1abdcbac0" \ + CHECKSUM="fb40af3a14014b0cf5d014db58f596cb7886f579dda8de2531eadce91ab4bb51" \ ;; \ *) ;; \ esac \ @@ -38,18 +38,13 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index f957df9ac5..f8166b5f83 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.10.0 +ENV NODE_VERSION 18.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,18 +22,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 799e006228..bfa8a5879b 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.10.0 +ENV NODE_VERSION 18.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 3d1243689a..660ec68431 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.10.0 +ENV NODE_VERSION 18.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,18 +22,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 97fd299a7e..69beab3fd5 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.10.0 +ENV NODE_VERSION 18.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From 521cc918805cfc24e31e7d4460aba80a5e5743da Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 18 Oct 2022 12:36:07 -0400 Subject: [PATCH 610/818] feat: Node.js 19.0.0 --- 19/alpine3.15/Dockerfile | 96 +++++++++++++++++++++++++++ 19/alpine3.15/docker-entrypoint.sh | 11 +++ 19/alpine3.16/Dockerfile | 96 +++++++++++++++++++++++++++ 19/alpine3.16/docker-entrypoint.sh | 11 +++ 19/bullseye-slim/Dockerfile | 92 +++++++++++++++++++++++++ 19/bullseye-slim/docker-entrypoint.sh | 11 +++ 19/bullseye/Dockerfile | 68 +++++++++++++++++++ 19/bullseye/docker-entrypoint.sh | 11 +++ 19/buster-slim/Dockerfile | 92 +++++++++++++++++++++++++ 19/buster-slim/docker-entrypoint.sh | 11 +++ 19/buster/Dockerfile | 68 +++++++++++++++++++ 19/buster/docker-entrypoint.sh | 11 +++ versions.json | 51 ++++++++++++++ 13 files changed, 629 insertions(+) create mode 100644 19/alpine3.15/Dockerfile create mode 100755 19/alpine3.15/docker-entrypoint.sh create mode 100644 19/alpine3.16/Dockerfile create mode 100755 19/alpine3.16/docker-entrypoint.sh create mode 100644 19/bullseye-slim/Dockerfile create mode 100755 19/bullseye-slim/docker-entrypoint.sh create mode 100644 19/bullseye/Dockerfile create mode 100755 19/bullseye/docker-entrypoint.sh create mode 100644 19/buster-slim/Dockerfile create mode 100755 19/buster-slim/docker-entrypoint.sh create mode 100644 19/buster/Dockerfile create mode 100755 19/buster/docker-entrypoint.sh diff --git a/19/alpine3.15/Dockerfile b/19/alpine3.15/Dockerfile new file mode 100644 index 0000000000..999288760e --- /dev/null +++ b/19/alpine3.15/Dockerfile @@ -0,0 +1,96 @@ +FROM alpine:3.15 + +ENV NODE_VERSION 19.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="80744232bb6ebe38967a827c05cab3d0a4b8cf75d2c7963d806f074e193d05ee" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/19/alpine3.15/docker-entrypoint.sh b/19/alpine3.15/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/19/alpine3.15/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile new file mode 100644 index 0000000000..17303fd6f7 --- /dev/null +++ b/19/alpine3.16/Dockerfile @@ -0,0 +1,96 @@ +FROM alpine:3.16 + +ENV NODE_VERSION 19.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="80744232bb6ebe38967a827c05cab3d0a4b8cf75d2c7963d806f074e193d05ee" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/19/alpine3.16/docker-entrypoint.sh b/19/alpine3.16/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/19/alpine3.16/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..bc0952d7ea --- /dev/null +++ b/19/bullseye-slim/Dockerfile @@ -0,0 +1,92 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 19.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/19/bullseye-slim/docker-entrypoint.sh b/19/bullseye-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/19/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile new file mode 100644 index 0000000000..421333e3b4 --- /dev/null +++ b/19/bullseye/Dockerfile @@ -0,0 +1,68 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 19.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/19/bullseye/docker-entrypoint.sh b/19/bullseye/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/19/bullseye/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile new file mode 100644 index 0000000000..05556effbc --- /dev/null +++ b/19/buster-slim/Dockerfile @@ -0,0 +1,92 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 19.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/19/buster-slim/docker-entrypoint.sh b/19/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/19/buster-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile new file mode 100644 index 0000000000..56d847ed72 --- /dev/null +++ b/19/buster/Dockerfile @@ -0,0 +1,68 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 19.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/19/buster/docker-entrypoint.sh b/19/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/19/buster/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index 0aa27827d7..49550de71d 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,55 @@ { + "19": { + "start": "2022-10-18", + "lts": "", + "maintenance": "2023-04-01", + "end": "2023-06-01", + "codename": "", + "alpine-default": "alpine3.16", + "debian-default": "bullseye", + "variants": { + "alpine3.15": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.16": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, "18": { "start": "2022-04-19", "lts": "2022-10-25", From f05fbf88068ba29ac9b544a72c9471ba60243e4b Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 25 Oct 2022 22:38:13 -0400 Subject: [PATCH 611/818] fix: Node.js 18.12.0 - Hydrogen LTS --- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- versions.json | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index e3033b3787..3d48072e93 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.11.0 +ENV NODE_VERSION 18.12.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="fb40af3a14014b0cf5d014db58f596cb7886f579dda8de2531eadce91ab4bb51" \ + CHECKSUM="1ed310f338017dbe53300342457c3e7c3701e9efa7697f51b90be785476853d7" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 6fe64bb85b..abbf683bcb 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.11.0 +ENV NODE_VERSION 18.12.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="fb40af3a14014b0cf5d014db58f596cb7886f579dda8de2531eadce91ab4bb51" \ + CHECKSUM="1ed310f338017dbe53300342457c3e7c3701e9efa7697f51b90be785476853d7" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index f8166b5f83..8e0aa9352b 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.11.0 +ENV NODE_VERSION 18.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index bfa8a5879b..be73a442d2 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.11.0 +ENV NODE_VERSION 18.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 660ec68431..e12cf9d11d 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.11.0 +ENV NODE_VERSION 18.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 69beab3fd5..b78ed1922e 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.11.0 +ENV NODE_VERSION 18.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/versions.json b/versions.json index 49550de71d..f40f4e99be 100644 --- a/versions.json +++ b/versions.json @@ -55,7 +55,7 @@ "lts": "2022-10-25", "maintenance": "2023-10-18", "end": "2025-04-30", - "codename": "", + "codename": "hydrogen", "alpine-default": "alpine3.16", "debian-default": "bullseye", "variants": { From 6186eff9cea628d90d4f83657d56d0502b515ced Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 1 Nov 2022 23:38:05 +0000 Subject: [PATCH 612/818] feat: Node.js 14.21.0 --- 14/alpine3.15/Dockerfile | 9 ++------- 14/alpine3.16/Dockerfile | 9 ++------- 14/bullseye-slim/Dockerfile | 7 +------ 14/bullseye/Dockerfile | 7 +------ 14/buster-slim/Dockerfile | 7 +------ 14/buster/Dockerfile | 7 +------ 6 files changed, 8 insertions(+), 38 deletions(-) diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 49df96e403..0c1ba5b132 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.20.1 +ENV NODE_VERSION 14.21.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="968f53b11f1432a16bbeae38e2ad4099b4e38d917c448b7134ff7d5c448642fb" \ + CHECKSUM="b7d90dae42a75531ff4b29f3c843927c63677f7dbd30dda299ac3d3da65f828b" \ ;; \ *) ;; \ esac \ @@ -38,18 +38,13 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/14/alpine3.16/Dockerfile b/14/alpine3.16/Dockerfile index 2a789b90c7..3109419c3b 100644 --- a/14/alpine3.16/Dockerfile +++ b/14/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 14.20.1 +ENV NODE_VERSION 14.21.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="968f53b11f1432a16bbeae38e2ad4099b4e38d917c448b7134ff7d5c448642fb" \ + CHECKSUM="b7d90dae42a75531ff4b29f3c843927c63677f7dbd30dda299ac3d3da65f828b" \ ;; \ *) ;; \ esac \ @@ -38,18 +38,13 @@ RUN addgroup -g 1000 node \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index fb06839328..bca5ccdcdf 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.20.1 +ENV NODE_VERSION 14.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,18 +22,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 5463008183..cd69207690 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.20.1 +ENV NODE_VERSION 14.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 9bca1d52de..3dbb7013ef 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.20.1 +ENV NODE_VERSION 14.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -22,18 +22,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 99d60bbdcc..1bb31d5015 100644 --- a/14/buster/Dockerfile +++ b/14/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.20.1 +ENV NODE_VERSION 14.21.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,13 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - A48C2BEE680E841632CD4E44F07496B3EB3C1762 \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - B9E2F5981AA6E0CD28160D9FF13993A75599653C \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From 7bc9983852d4a0a8910f3865b199d78157d1440b Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 8 Nov 2022 16:25:30 +0000 Subject: [PATCH 613/818] feat: Node.js 14.21.1, 16.18.1, 18.12.1, 19.0.1 --- 14/alpine3.15/Dockerfile | 4 ++-- 14/alpine3.16/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 16/alpine3.15/Dockerfile | 4 ++-- 16/alpine3.16/Dockerfile | 4 ++-- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 18/alpine3.15/Dockerfile | 4 ++-- 18/alpine3.16/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 19/alpine3.15/Dockerfile | 4 ++-- 19/alpine3.16/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 24 files changed, 32 insertions(+), 32 deletions(-) diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.15/Dockerfile index 0c1ba5b132..3c7216eb61 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 14.21.0 +ENV NODE_VERSION 14.21.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="b7d90dae42a75531ff4b29f3c843927c63677f7dbd30dda299ac3d3da65f828b" \ + CHECKSUM="0fc7c18a1fa7aa6b39ac7b11ba2e56fa12ab1c4d3b4bb32f9c4ac3f7178d613c" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.16/Dockerfile b/14/alpine3.16/Dockerfile index 3109419c3b..74f36464a1 100644 --- a/14/alpine3.16/Dockerfile +++ b/14/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 14.21.0 +ENV NODE_VERSION 14.21.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="b7d90dae42a75531ff4b29f3c843927c63677f7dbd30dda299ac3d3da65f828b" \ + CHECKSUM="0fc7c18a1fa7aa6b39ac7b11ba2e56fa12ab1c4d3b4bb32f9c4ac3f7178d613c" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index bca5ccdcdf..b2553a8090 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.21.0 +ENV NODE_VERSION 14.21.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index cd69207690..483fbd36ef 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.21.0 +ENV NODE_VERSION 14.21.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 3dbb7013ef..7b0ceca3fd 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.21.0 +ENV NODE_VERSION 14.21.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 1bb31d5015..518ab21b8a 100644 --- a/14/buster/Dockerfile +++ b/14/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.21.0 +ENV NODE_VERSION 14.21.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.15/Dockerfile index 2d7ebc7944..766ae2408a 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 16.18.0 +ENV NODE_VERSION 16.18.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="e6b9c39f85eed0f625b570bbb3019db8761ab78a935eb44f20865ab35c4eec6c" \ + CHECKSUM="ba6f8e66b23518ff4ff465814f781fd48b196a1cd77a9942ca5c7857715253a9" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index bfa565cec9..9e97e2694c 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.18.0 +ENV NODE_VERSION 16.18.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="e6b9c39f85eed0f625b570bbb3019db8761ab78a935eb44f20865ab35c4eec6c" \ + CHECKSUM="ba6f8e66b23518ff4ff465814f781fd48b196a1cd77a9942ca5c7857715253a9" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index f7a3b92d2d..918af6aa47 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.18.0 +ENV NODE_VERSION 16.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 3b50120984..82959d93ab 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.18.0 +ENV NODE_VERSION 16.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index f445740c51..d0f5db82ba 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.18.0 +ENV NODE_VERSION 16.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 8c88d366df..7962b8e494 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.18.0 +ENV NODE_VERSION 16.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.15/Dockerfile index 3d48072e93..d24f340abe 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 18.12.0 +ENV NODE_VERSION 18.12.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="1ed310f338017dbe53300342457c3e7c3701e9efa7697f51b90be785476853d7" \ + CHECKSUM="b94b70fbd8d85e5874cc42dc12a02a1e6b4624d0d4a9bf62a88d122ac3f61bbe" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index abbf683bcb..802ffdd880 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.12.0 +ENV NODE_VERSION 18.12.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="1ed310f338017dbe53300342457c3e7c3701e9efa7697f51b90be785476853d7" \ + CHECKSUM="b94b70fbd8d85e5874cc42dc12a02a1e6b4624d0d4a9bf62a88d122ac3f61bbe" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 8e0aa9352b..bb54e16a29 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.12.0 +ENV NODE_VERSION 18.12.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index be73a442d2..01a919b213 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.12.0 +ENV NODE_VERSION 18.12.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index e12cf9d11d..2c380b2222 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.12.0 +ENV NODE_VERSION 18.12.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index b78ed1922e..56a5459520 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.12.0 +ENV NODE_VERSION 18.12.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/alpine3.15/Dockerfile b/19/alpine3.15/Dockerfile index 999288760e..e65ef8a369 100644 --- a/19/alpine3.15/Dockerfile +++ b/19/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 19.0.0 +ENV NODE_VERSION 19.0.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="80744232bb6ebe38967a827c05cab3d0a4b8cf75d2c7963d806f074e193d05ee" \ + CHECKSUM="75982f3f90f1c9b38ec29f2cc75bdfad05d3e52b89f46064cbd302a6f813858d" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 17303fd6f7..d12740517d 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.0.0 +ENV NODE_VERSION 19.0.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="80744232bb6ebe38967a827c05cab3d0a4b8cf75d2c7963d806f074e193d05ee" \ + CHECKSUM="75982f3f90f1c9b38ec29f2cc75bdfad05d3e52b89f46064cbd302a6f813858d" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index bc0952d7ea..59dc6fb417 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.0.0 +ENV NODE_VERSION 19.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 421333e3b4..34ae6db4fe 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.0.0 +ENV NODE_VERSION 19.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index 05556effbc..b22ae8cbd7 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.0.0 +ENV NODE_VERSION 19.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index 56d847ed72..b01be5d6fb 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.0.0 +ENV NODE_VERSION 19.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9220863a62a5f9d76bb761d1e385674de39224a6 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Mon, 14 Nov 2022 17:42:17 +0000 Subject: [PATCH 614/818] feat: Node.js 19.1.0 --- 19/alpine3.15/Dockerfile | 4 ++-- 19/alpine3.16/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/19/alpine3.15/Dockerfile b/19/alpine3.15/Dockerfile index e65ef8a369..12a33aa4c2 100644 --- a/19/alpine3.15/Dockerfile +++ b/19/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 19.0.1 +ENV NODE_VERSION 19.1.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="75982f3f90f1c9b38ec29f2cc75bdfad05d3e52b89f46064cbd302a6f813858d" \ + CHECKSUM="397ca35b04726e8fc92692ac0a2e4906dfe6f550e62500b1955c84cd6975e5e7" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index d12740517d..006099d4a5 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.0.1 +ENV NODE_VERSION 19.1.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="75982f3f90f1c9b38ec29f2cc75bdfad05d3e52b89f46064cbd302a6f813858d" \ + CHECKSUM="397ca35b04726e8fc92692ac0a2e4906dfe6f550e62500b1955c84cd6975e5e7" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 59dc6fb417..014b7e2661 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.0.1 +ENV NODE_VERSION 19.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 34ae6db4fe..b3a20a4d5d 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.0.1 +ENV NODE_VERSION 19.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index b22ae8cbd7..53270770c9 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.0.1 +ENV NODE_VERSION 19.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index b01be5d6fb..c40a96bda1 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.0.1 +ENV NODE_VERSION 19.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 66ec7a544dab2f8284e167075938258399a9d458 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 29 Nov 2022 23:22:55 +0000 Subject: [PATCH 615/818] feat: Node.js 19.2.0 --- 19/alpine3.15/Dockerfile | 4 ++-- 19/alpine3.16/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/19/alpine3.15/Dockerfile b/19/alpine3.15/Dockerfile index 12a33aa4c2..bb31b991c6 100644 --- a/19/alpine3.15/Dockerfile +++ b/19/alpine3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ENV NODE_VERSION 19.1.0 +ENV NODE_VERSION 19.2.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="397ca35b04726e8fc92692ac0a2e4906dfe6f550e62500b1955c84cd6975e5e7" \ + CHECKSUM="470da164dbdf4ff9cc45b35fbfc45bd19a1d6a2542a99f784bd8c4a55a7fdebb" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 006099d4a5..03a7617aa3 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.1.0 +ENV NODE_VERSION 19.2.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="397ca35b04726e8fc92692ac0a2e4906dfe6f550e62500b1955c84cd6975e5e7" \ + CHECKSUM="470da164dbdf4ff9cc45b35fbfc45bd19a1d6a2542a99f784bd8c4a55a7fdebb" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 014b7e2661..e30b7a14d3 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.1.0 +ENV NODE_VERSION 19.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index b3a20a4d5d..e97405490b 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.1.0 +ENV NODE_VERSION 19.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index 53270770c9..9fbe2d9b91 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.1.0 +ENV NODE_VERSION 19.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index c40a96bda1..f2eb1e81ef 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.1.0 +ENV NODE_VERSION 19.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From aee40d3fd78f2053350d1480b792ca8119040a92 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 23 Nov 2022 11:36:39 +0100 Subject: [PATCH 616/818] Add Alpine 3.17 variant Also remove Alpine 3.15 --- 14/{alpine3.15 => alpine3.17}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 16/{alpine3.15 => alpine3.17}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 18/{alpine3.15 => alpine3.17}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 19/{alpine3.15 => alpine3.17}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 architectures | 14 +++++------ config | 2 +- versions.json | 24 +++++++++---------- 11 files changed, 24 insertions(+), 24 deletions(-) rename 14/{alpine3.15 => alpine3.17}/Dockerfile (99%) rename 14/{alpine3.15 => alpine3.17}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename 16/{alpine3.15 => alpine3.17}/Dockerfile (99%) rename 16/{alpine3.15 => alpine3.17}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename 18/{alpine3.15 => alpine3.17}/Dockerfile (99%) rename 18/{alpine3.15 => alpine3.17}/docker-entrypoint.sh (100%) mode change 100755 => 100644 rename 19/{alpine3.15 => alpine3.17}/Dockerfile (99%) rename 19/{alpine3.15 => alpine3.17}/docker-entrypoint.sh (100%) mode change 100755 => 100644 diff --git a/14/alpine3.15/Dockerfile b/14/alpine3.17/Dockerfile similarity index 99% rename from 14/alpine3.15/Dockerfile rename to 14/alpine3.17/Dockerfile index 3c7216eb61..34f06f8bed 100644 --- a/14/alpine3.15/Dockerfile +++ b/14/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.17 ENV NODE_VERSION 14.21.1 diff --git a/14/alpine3.15/docker-entrypoint.sh b/14/alpine3.17/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from 14/alpine3.15/docker-entrypoint.sh rename to 14/alpine3.17/docker-entrypoint.sh diff --git a/16/alpine3.15/Dockerfile b/16/alpine3.17/Dockerfile similarity index 99% rename from 16/alpine3.15/Dockerfile rename to 16/alpine3.17/Dockerfile index 766ae2408a..6581f3bed1 100644 --- a/16/alpine3.15/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.17 ENV NODE_VERSION 16.18.1 diff --git a/16/alpine3.15/docker-entrypoint.sh b/16/alpine3.17/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from 16/alpine3.15/docker-entrypoint.sh rename to 16/alpine3.17/docker-entrypoint.sh diff --git a/18/alpine3.15/Dockerfile b/18/alpine3.17/Dockerfile similarity index 99% rename from 18/alpine3.15/Dockerfile rename to 18/alpine3.17/Dockerfile index d24f340abe..f6599a03b8 100644 --- a/18/alpine3.15/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.17 ENV NODE_VERSION 18.12.1 diff --git a/18/alpine3.15/docker-entrypoint.sh b/18/alpine3.17/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from 18/alpine3.15/docker-entrypoint.sh rename to 18/alpine3.17/docker-entrypoint.sh diff --git a/19/alpine3.15/Dockerfile b/19/alpine3.17/Dockerfile similarity index 99% rename from 19/alpine3.15/Dockerfile rename to 19/alpine3.17/Dockerfile index bb31b991c6..44a34c7cfb 100644 --- a/19/alpine3.15/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.17 ENV NODE_VERSION 19.2.0 diff --git a/19/alpine3.15/docker-entrypoint.sh b/19/alpine3.17/docker-entrypoint.sh old mode 100755 new mode 100644 similarity index 100% rename from 19/alpine3.15/docker-entrypoint.sh rename to 19/alpine3.17/docker-entrypoint.sh diff --git a/architectures b/architectures index 3b6ce5fc09..094b44113f 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim -arm32v6 alpine3.15,alpine3.16 -arm32v7 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim -arm64v8 alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim -i386 alpine3.15,alpine3.16 -ppc64le alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.15,alpine3.16,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim +arm32v6 alpine3.16,alpine3.17 +arm32v7 alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim +arm64v8 alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim +i386 alpine3.16,alpine3.17 +ppc64le alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index 1ebfd3a3d8..c5f634c115 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant bullseye -alpine_version 3.16 +alpine_version 3.17 debian_versions stretch bullseye buster diff --git a/versions.json b/versions.json index f40f4e99be..1176e5eaa3 100644 --- a/versions.json +++ b/versions.json @@ -5,10 +5,10 @@ "maintenance": "2023-04-01", "end": "2023-06-01", "codename": "", - "alpine-default": "alpine3.16", + "alpine-default": "alpine3.17", "debian-default": "bullseye", "variants": { - "alpine3.15": [ + "alpine3.16": [ "amd64", "arm32v6", "arm32v7", @@ -16,7 +16,7 @@ "ppc64le", "s390x" ], - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", @@ -56,10 +56,10 @@ "maintenance": "2023-10-18", "end": "2025-04-30", "codename": "hydrogen", - "alpine-default": "alpine3.16", + "alpine-default": "alpine3.17", "debian-default": "bullseye", "variants": { - "alpine3.15": [ + "alpine3.16": [ "amd64", "arm32v6", "arm32v7", @@ -67,7 +67,7 @@ "ppc64le", "s390x" ], - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", @@ -107,10 +107,10 @@ "maintenance": "2022-10-18", "end": "2024-04-30", "codename": "gallium", - "alpine-default": "alpine3.16", + "alpine-default": "alpine3.17", "debian-default": "buster", "variants": { - "alpine3.15": [ + "alpine3.16": [ "amd64", "arm32v6", "arm32v7", @@ -118,7 +118,7 @@ "ppc64le", "s390x" ], - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", @@ -158,10 +158,10 @@ "maintenance": "2021-10-19", "end": "2023-04-30", "codename": "fermium", - "alpine-default": "alpine3.16", + "alpine-default": "alpine3.17", "debian-default": "buster", "variants": { - "alpine3.15": [ + "alpine3.16": [ "amd64", "arm32v6", "arm32v7", @@ -169,7 +169,7 @@ "ppc64le", "s390x" ], - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", From e9c9c55af1ef8c866a6fe4a191763fb4a1c7e700 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Mon, 12 Dec 2022 07:55:04 +0100 Subject: [PATCH 617/818] Fix git permissions on Alpine 3.17 docker-entrypoint files --- 14/alpine3.17/docker-entrypoint.sh | 0 16/alpine3.17/docker-entrypoint.sh | 0 18/alpine3.17/docker-entrypoint.sh | 0 19/alpine3.17/docker-entrypoint.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 14/alpine3.17/docker-entrypoint.sh mode change 100644 => 100755 16/alpine3.17/docker-entrypoint.sh mode change 100644 => 100755 18/alpine3.17/docker-entrypoint.sh mode change 100644 => 100755 19/alpine3.17/docker-entrypoint.sh diff --git a/14/alpine3.17/docker-entrypoint.sh b/14/alpine3.17/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/16/alpine3.17/docker-entrypoint.sh b/16/alpine3.17/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/18/alpine3.17/docker-entrypoint.sh b/18/alpine3.17/docker-entrypoint.sh old mode 100644 new mode 100755 diff --git a/19/alpine3.17/docker-entrypoint.sh b/19/alpine3.17/docker-entrypoint.sh old mode 100644 new mode 100755 From 3f8018043408490439723ed3b71ab5578d69ea70 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 13 Dec 2022 15:04:20 +0000 Subject: [PATCH 618/818] feat: Node.js --- 14/alpine3.16/Dockerfile | 4 ++-- 14/alpine3.17/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/14/alpine3.16/Dockerfile b/14/alpine3.16/Dockerfile index 74f36464a1..a8fd74d836 100644 --- a/14/alpine3.16/Dockerfile +++ b/14/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 14.21.1 +ENV NODE_VERSION 14.21.2 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="0fc7c18a1fa7aa6b39ac7b11ba2e56fa12ab1c4d3b4bb32f9c4ac3f7178d613c" \ + CHECKSUM="069d9b0f9c01fa269dfe71e0b65f04a151c233c81bd998b59894c5f717f79877" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.17/Dockerfile b/14/alpine3.17/Dockerfile index 34f06f8bed..3ab731e2a0 100644 --- a/14/alpine3.17/Dockerfile +++ b/14/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 14.21.1 +ENV NODE_VERSION 14.21.2 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="0fc7c18a1fa7aa6b39ac7b11ba2e56fa12ab1c4d3b4bb32f9c4ac3f7178d613c" \ + CHECKSUM="069d9b0f9c01fa269dfe71e0b65f04a151c233c81bd998b59894c5f717f79877" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index b2553a8090..9f0f6297e6 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.21.1 +ENV NODE_VERSION 14.21.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index 483fbd36ef..b5e21a6e6a 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.21.1 +ENV NODE_VERSION 14.21.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index 7b0ceca3fd..b772830736 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.21.1 +ENV NODE_VERSION 14.21.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 518ab21b8a..288b7a7363 100644 --- a/14/buster/Dockerfile +++ b/14/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.21.1 +ENV NODE_VERSION 14.21.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 918af6aa47..727ac5dba9 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.18.1 +ENV NODE_VERSION 16.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 82959d93ab..f2a1c508cd 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.18.1 +ENV NODE_VERSION 16.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index d0f5db82ba..e6fe5ba9a1 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.18.1 +ENV NODE_VERSION 16.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 7962b8e494..02fa81abce 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.18.1 +ENV NODE_VERSION 16.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 2a15356c778b366621aa370a4294c59ac1df9c6a Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 13 Dec 2022 18:04:38 +0000 Subject: [PATCH 619/818] feat: Node.js 16.19.0 --- 16/alpine3.16/Dockerfile | 4 ++-- 16/alpine3.17/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index 9e97e2694c..ccc956aa63 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.18.1 +ENV NODE_VERSION 16.19.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="ba6f8e66b23518ff4ff465814f781fd48b196a1cd77a9942ca5c7857715253a9" \ + CHECKSUM="f5817883eb3009972a031d635ea71ed8377808a6e831ae1c72e063e888cdd318" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile index 6581f3bed1..f5670946c7 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 16.18.1 +ENV NODE_VERSION 16.19.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="ba6f8e66b23518ff4ff465814f781fd48b196a1cd77a9942ca5c7857715253a9" \ + CHECKSUM="f5817883eb3009972a031d635ea71ed8377808a6e831ae1c72e063e888cdd318" \ ;; \ *) ;; \ esac \ From 3b210a6d277538912aa45266ba4bc83d4899c2ca Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 14 Dec 2022 17:48:05 +0000 Subject: [PATCH 620/818] feat: Node.js 19.3.0 --- 19/alpine3.16/Dockerfile | 4 ++-- 19/alpine3.17/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 03a7617aa3..891d6d966b 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.2.0 +ENV NODE_VERSION 19.3.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="470da164dbdf4ff9cc45b35fbfc45bd19a1d6a2542a99f784bd8c4a55a7fdebb" \ + CHECKSUM="0964f45fb6040e6bc04f75dcd350412c75a15940d12b14ed7c445397eb15daa4" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index 44a34c7cfb..e2df4bd873 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.2.0 +ENV NODE_VERSION 19.3.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="470da164dbdf4ff9cc45b35fbfc45bd19a1d6a2542a99f784bd8c4a55a7fdebb" \ + CHECKSUM="0964f45fb6040e6bc04f75dcd350412c75a15940d12b14ed7c445397eb15daa4" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index e30b7a14d3..93724562a5 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.2.0 +ENV NODE_VERSION 19.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index e97405490b..0df7f11675 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.2.0 +ENV NODE_VERSION 19.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index 9fbe2d9b91..4bb000cf75 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.2.0 +ENV NODE_VERSION 19.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index f2eb1e81ef..14fa5b2a82 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.2.0 +ENV NODE_VERSION 19.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 86d8b5dbad62b7c58d2146dafaa7b35086ae2eb8 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 6 Jan 2023 05:05:25 +0000 Subject: [PATCH 621/818] feat: Node.js 18.13.0 --- 18/alpine3.16/Dockerfile | 4 ++-- 18/alpine3.17/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 802ffdd880..1585ead1f9 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.12.1 +ENV NODE_VERSION 18.13.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="b94b70fbd8d85e5874cc42dc12a02a1e6b4624d0d4a9bf62a88d122ac3f61bbe" \ + CHECKSUM="96973d2cf66fd5c1b0a02b9eeaa248b8e8a29e93cfc79d73fb99c396ec41eac7" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index f6599a03b8..0941169c58 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.12.1 +ENV NODE_VERSION 18.13.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="b94b70fbd8d85e5874cc42dc12a02a1e6b4624d0d4a9bf62a88d122ac3f61bbe" \ + CHECKSUM="96973d2cf66fd5c1b0a02b9eeaa248b8e8a29e93cfc79d73fb99c396ec41eac7" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index bb54e16a29..e5108d30fc 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.12.1 +ENV NODE_VERSION 18.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 01a919b213..67a15e0a53 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.12.1 +ENV NODE_VERSION 18.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 2c380b2222..9ba01805b1 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.12.1 +ENV NODE_VERSION 18.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 56a5459520..96a88d03bd 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.12.1 +ENV NODE_VERSION 18.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 28ad5e0e5d0e80df44d897c9057ffd6419a3c7a5 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 6 Jan 2023 17:04:13 +0000 Subject: [PATCH 622/818] feat: Node.js 19.4.0 --- 19/alpine3.16/Dockerfile | 4 ++-- 19/alpine3.17/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 891d6d966b..3ec9912281 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.3.0 +ENV NODE_VERSION 19.4.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="0964f45fb6040e6bc04f75dcd350412c75a15940d12b14ed7c445397eb15daa4" \ + CHECKSUM="b75d71cfd10931c27f968902a7c6fd7143c95a813988f402e0bac150017b361e" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index e2df4bd873..5df3803035 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.3.0 +ENV NODE_VERSION 19.4.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="0964f45fb6040e6bc04f75dcd350412c75a15940d12b14ed7c445397eb15daa4" \ + CHECKSUM="b75d71cfd10931c27f968902a7c6fd7143c95a813988f402e0bac150017b361e" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 93724562a5..6d71a06d6c 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.3.0 +ENV NODE_VERSION 19.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 0df7f11675..94b5f96daa 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.3.0 +ENV NODE_VERSION 19.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index 4bb000cf75..a2d8a61671 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.3.0 +ENV NODE_VERSION 19.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index 14fa5b2a82..8258749f7d 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.3.0 +ENV NODE_VERSION 19.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 18a65fa8f56063a42381aa94923ce07f00375d7d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 25 Jan 2023 02:10:54 +0000 Subject: [PATCH 623/818] feat: Node.js 19.5.0 --- 19/alpine3.16/Dockerfile | 4 ++-- 19/alpine3.17/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 3ec9912281..0449530417 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.4.0 +ENV NODE_VERSION 19.5.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="b75d71cfd10931c27f968902a7c6fd7143c95a813988f402e0bac150017b361e" \ + CHECKSUM="f7eb17cd6f5821f2dbe697956fd93ef4caaafc0385cbd85df4d47eb5fd9ee5aa" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index 5df3803035..a400e7ff18 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.4.0 +ENV NODE_VERSION 19.5.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="b75d71cfd10931c27f968902a7c6fd7143c95a813988f402e0bac150017b361e" \ + CHECKSUM="f7eb17cd6f5821f2dbe697956fd93ef4caaafc0385cbd85df4d47eb5fd9ee5aa" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 6d71a06d6c..1be546837d 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.4.0 +ENV NODE_VERSION 19.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 94b5f96daa..8a49ff705b 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.4.0 +ENV NODE_VERSION 19.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index a2d8a61671..cc89b27f39 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.4.0 +ENV NODE_VERSION 19.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index 8258749f7d..1a827eaa0a 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.4.0 +ENV NODE_VERSION 19.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 9c84e644a0f4b45527e740a4969fd33b71cbf451 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 07:00:46 +0000 Subject: [PATCH 624/818] chore(deps): bump docker/build-push-action from 3 to 4 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 99559c506d..21b1a51268 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v3 - name: Build image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v4 with: push: false load: true From f996e97a2e6d2aae2de3b869e083a253733f07a8 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 3 Feb 2023 00:17:03 +0000 Subject: [PATCH 625/818] feat: Node.js 18.14.0, 19.6.0 --- 18/alpine3.16/Dockerfile | 4 ++-- 18/alpine3.17/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 19/alpine3.16/Dockerfile | 4 ++-- 19/alpine3.17/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 1585ead1f9..3b23b1c0d6 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.13.0 +ENV NODE_VERSION 18.14.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="96973d2cf66fd5c1b0a02b9eeaa248b8e8a29e93cfc79d73fb99c396ec41eac7" \ + CHECKSUM="b58339afbfa329c94d2764fc7fac4750fc1cbb99c4aa6bf65509200d69e2e3b0" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 0941169c58..255425c4af 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.13.0 +ENV NODE_VERSION 18.14.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="96973d2cf66fd5c1b0a02b9eeaa248b8e8a29e93cfc79d73fb99c396ec41eac7" \ + CHECKSUM="b58339afbfa329c94d2764fc7fac4750fc1cbb99c4aa6bf65509200d69e2e3b0" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index e5108d30fc..d551a1e04d 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.13.0 +ENV NODE_VERSION 18.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 67a15e0a53..49b141dadb 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.13.0 +ENV NODE_VERSION 18.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 9ba01805b1..7d7190f9e8 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.13.0 +ENV NODE_VERSION 18.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 96a88d03bd..4dc54b4ff6 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.13.0 +ENV NODE_VERSION 18.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 0449530417..61008f89a0 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.5.0 +ENV NODE_VERSION 19.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="f7eb17cd6f5821f2dbe697956fd93ef4caaafc0385cbd85df4d47eb5fd9ee5aa" \ + CHECKSUM="fcf7c5c876cacabc8d4559ee3d4b7a2de83804e036ba89a80d3bd602f5f6fa97" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index a400e7ff18..4a8be4504e 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.5.0 +ENV NODE_VERSION 19.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="f7eb17cd6f5821f2dbe697956fd93ef4caaafc0385cbd85df4d47eb5fd9ee5aa" \ + CHECKSUM="fcf7c5c876cacabc8d4559ee3d4b7a2de83804e036ba89a80d3bd602f5f6fa97" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 1be546837d..03bbcebd08 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.5.0 +ENV NODE_VERSION 19.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 8a49ff705b..5b03cf78ba 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.5.0 +ENV NODE_VERSION 19.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index cc89b27f39..1c78706238 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.5.0 +ENV NODE_VERSION 19.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index 1a827eaa0a..cefcabff38 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.5.0 +ENV NODE_VERSION 19.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From e56a0dfbdd8fb79ae2b77b9f9ec8f1a4cacb708d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 07:57:03 +0000 Subject: [PATCH 626/818] chore(deps): bump crazy-max/ghaction-dump-context from 1 to 2 Bumps [crazy-max/ghaction-dump-context](https://github.com/crazy-max/ghaction-dump-context) from 1 to 2. - [Release notes](https://github.com/crazy-max/ghaction-dump-context/releases) - [Changelog](https://github.com/crazy-max/ghaction-dump-context/blob/master/CHANGELOG.md) - [Commits](https://github.com/crazy-max/ghaction-dump-context/compare/v1...v2) --- updated-dependencies: - dependency-name: crazy-max/ghaction-dump-context dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 41557a8853..edcad08713 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -65,4 +65,4 @@ jobs: - name: Dump context if: always() - uses: crazy-max/ghaction-dump-context@v1 + uses: crazy-max/ghaction-dump-context@v2 From e75fa5270326ffaff8fee03153f3bf16860084d4 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 17 Feb 2023 07:04:15 +0000 Subject: [PATCH 627/818] feat: Node.js --- 14/alpine3.16/Dockerfile | 4 ++-- 14/alpine3.17/Dockerfile | 4 ++-- 14/bullseye-slim/Dockerfile | 2 +- 14/bullseye/Dockerfile | 2 +- 14/buster-slim/Dockerfile | 2 +- 14/buster/Dockerfile | 2 +- 16/alpine3.16/Dockerfile | 4 ++-- 16/alpine3.17/Dockerfile | 4 ++-- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 19/alpine3.16/Dockerfile | 4 ++-- 19/alpine3.17/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/14/alpine3.16/Dockerfile b/14/alpine3.16/Dockerfile index a8fd74d836..dc091a7e5b 100644 --- a/14/alpine3.16/Dockerfile +++ b/14/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 14.21.2 +ENV NODE_VERSION 14.21.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="069d9b0f9c01fa269dfe71e0b65f04a151c233c81bd998b59894c5f717f79877" \ + CHECKSUM="39c334bd7ef3a6e5a5a396e08b3edbe335d86161bbfba222c75aa4a3518af942" \ ;; \ *) ;; \ esac \ diff --git a/14/alpine3.17/Dockerfile b/14/alpine3.17/Dockerfile index 3ab731e2a0..d872faac73 100644 --- a/14/alpine3.17/Dockerfile +++ b/14/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 14.21.2 +ENV NODE_VERSION 14.21.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="069d9b0f9c01fa269dfe71e0b65f04a151c233c81bd998b59894c5f717f79877" \ + CHECKSUM="39c334bd7ef3a6e5a5a396e08b3edbe335d86161bbfba222c75aa4a3518af942" \ ;; \ *) ;; \ esac \ diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile index 9f0f6297e6..d5f89b13cf 100644 --- a/14/bullseye-slim/Dockerfile +++ b/14/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 14.21.2 +ENV NODE_VERSION 14.21.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile index b5e21a6e6a..e370507495 100644 --- a/14/bullseye/Dockerfile +++ b/14/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 14.21.2 +ENV NODE_VERSION 14.21.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile index b772830736..50f28f590c 100644 --- a/14/buster-slim/Dockerfile +++ b/14/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.21.2 +ENV NODE_VERSION 14.21.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile index 288b7a7363..576eab176b 100644 --- a/14/buster/Dockerfile +++ b/14/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.21.2 +ENV NODE_VERSION 14.21.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index ccc956aa63..62a0032593 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.19.0 +ENV NODE_VERSION 16.19.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="f5817883eb3009972a031d635ea71ed8377808a6e831ae1c72e063e888cdd318" \ + CHECKSUM="8f14f84b7011f468e06affe9102b57140452078510c43f86feb2b7266b516b28" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile index f5670946c7..16e863648b 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 16.19.0 +ENV NODE_VERSION 16.19.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="f5817883eb3009972a031d635ea71ed8377808a6e831ae1c72e063e888cdd318" \ + CHECKSUM="8f14f84b7011f468e06affe9102b57140452078510c43f86feb2b7266b516b28" \ ;; \ *) ;; \ esac \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 727ac5dba9..b9933a2f15 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.19.0 +ENV NODE_VERSION 16.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index f2a1c508cd..2976ae5f32 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.19.0 +ENV NODE_VERSION 16.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index e6fe5ba9a1..10bbd4234a 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.19.0 +ENV NODE_VERSION 16.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 02fa81abce..35dbca26af 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.19.0 +ENV NODE_VERSION 16.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index d551a1e04d..8317cac854 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.14.0 +ENV NODE_VERSION 18.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 49b141dadb..85adc561cb 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.14.0 +ENV NODE_VERSION 18.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 7d7190f9e8..78cd657d67 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.14.0 +ENV NODE_VERSION 18.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 4dc54b4ff6..4f17c86158 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.14.0 +ENV NODE_VERSION 18.14.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 61008f89a0..3c18284131 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.6.0 +ENV NODE_VERSION 19.6.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="fcf7c5c876cacabc8d4559ee3d4b7a2de83804e036ba89a80d3bd602f5f6fa97" \ + CHECKSUM="75d0c43a3f6de0fe7116f6998b810e763b6236c0ea859cb95bf4cef923f27a65" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index 4a8be4504e..81a9da98d3 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.6.0 +ENV NODE_VERSION 19.6.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="fcf7c5c876cacabc8d4559ee3d4b7a2de83804e036ba89a80d3bd602f5f6fa97" \ + CHECKSUM="75d0c43a3f6de0fe7116f6998b810e763b6236c0ea859cb95bf4cef923f27a65" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 03bbcebd08..5a48a3b01d 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.6.0 +ENV NODE_VERSION 19.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 5b03cf78ba..47f595f42f 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.6.0 +ENV NODE_VERSION 19.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index 1c78706238..0faafe647a 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.6.0 +ENV NODE_VERSION 19.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index cefcabff38..146dfbb6c4 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.6.0 +ENV NODE_VERSION 19.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f1a59606440d4eb82e5854ee6705880461528e9d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 17 Feb 2023 11:03:59 +0000 Subject: [PATCH 628/818] feat: Node.js 18.14.1 --- 18/alpine3.16/Dockerfile | 4 ++-- 18/alpine3.17/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 3b23b1c0d6..64a2d5f4ed 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.14.0 +ENV NODE_VERSION 18.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="b58339afbfa329c94d2764fc7fac4750fc1cbb99c4aa6bf65509200d69e2e3b0" \ + CHECKSUM="4d145b9c96b8c573d8f338af25121da441bd779195c1bcd05c34eca6ec8fffee" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 255425c4af..cfd0aaa581 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.14.0 +ENV NODE_VERSION 18.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="b58339afbfa329c94d2764fc7fac4750fc1cbb99c4aa6bf65509200d69e2e3b0" \ + CHECKSUM="4d145b9c96b8c573d8f338af25121da441bd779195c1bcd05c34eca6ec8fffee" \ ;; \ *) ;; \ esac \ From 75078c03974ab650f54c2435581c095e040c9295 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 17 Feb 2023 17:26:46 -0500 Subject: [PATCH 629/818] ci: Remove At sign from team mention config --- .github/workflows/automatic-updates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index c02a94b50b..61046ab363 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -33,4 +33,4 @@ jobs: title: "feat: Node.js ${{ steps.updt.outputs.result }}" delete-branch: true team-reviewers: | - @nodejs/docker + nodejs/docker From cd41dbe222da1ce72d61d8fbaa06ac79316ac6d5 Mon Sep 17 00:00:00 2001 From: Rohit Jha Date: Mon, 20 Feb 2023 11:30:02 -0800 Subject: [PATCH 630/818] fix checksums for Node.js 16.19.1 and 18.14.1 on Alpine 3.16 and 3.17 --- 16/alpine3.16/Dockerfile | 2 +- 16/alpine3.17/Dockerfile | 2 +- 18/alpine3.16/Dockerfile | 2 +- 18/alpine3.17/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index 62a0032593..dc66f47f2b 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="8f14f84b7011f468e06affe9102b57140452078510c43f86feb2b7266b516b28" \ + CHECKSUM="f701dbe93da8be3198d3b6a2ba0044c2f5d142b3acabefb7a3ffeb31245b88df" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile index 16e863648b..7c85091da5 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="8f14f84b7011f468e06affe9102b57140452078510c43f86feb2b7266b516b28" \ + CHECKSUM="f701dbe93da8be3198d3b6a2ba0044c2f5d142b3acabefb7a3ffeb31245b88df" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 64a2d5f4ed..04ec33b4ce 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="4d145b9c96b8c573d8f338af25121da441bd779195c1bcd05c34eca6ec8fffee" \ + CHECKSUM="3e6d3061d34518acea378e49cfaaf58420f1ddcd1756b61701436bc430504e84" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index cfd0aaa581..918881729b 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \ && case "${alpineArch##*-}" in \ x86_64) \ ARCH='x64' \ - CHECKSUM="4d145b9c96b8c573d8f338af25121da441bd779195c1bcd05c34eca6ec8fffee" \ + CHECKSUM="3e6d3061d34518acea378e49cfaaf58420f1ddcd1756b61701436bc430504e84" \ ;; \ *) ;; \ esac \ From cd7015f45666d2cd6e81f507ee362ca7ada1bfee Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 22 Feb 2023 02:39:52 +0000 Subject: [PATCH 631/818] feat: Node.js 18.14.2, 19.7.0 --- 18/alpine3.16/Dockerfile | 4 ++-- 18/alpine3.17/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 19/alpine3.16/Dockerfile | 4 ++-- 19/alpine3.17/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 04ec33b4ce..4d3c8b6d72 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.14.1 +ENV NODE_VERSION 18.14.2 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="3e6d3061d34518acea378e49cfaaf58420f1ddcd1756b61701436bc430504e84" \ + CHECKSUM="96d95e426ca110dd667de37746d6feb58c6e131f612296e550017b449eec7f21" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 918881729b..5c5322aa23 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.14.1 +ENV NODE_VERSION 18.14.2 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="3e6d3061d34518acea378e49cfaaf58420f1ddcd1756b61701436bc430504e84" \ + CHECKSUM="96d95e426ca110dd667de37746d6feb58c6e131f612296e550017b449eec7f21" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 8317cac854..c8c9a6ec0b 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.14.1 +ENV NODE_VERSION 18.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 85adc561cb..a4efb4081b 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.14.1 +ENV NODE_VERSION 18.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 78cd657d67..8cabe6f08c 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.14.1 +ENV NODE_VERSION 18.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 4f17c86158..5982cf660b 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.14.1 +ENV NODE_VERSION 18.14.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 3c18284131..f8adb55329 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.6.1 +ENV NODE_VERSION 19.7.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="75d0c43a3f6de0fe7116f6998b810e763b6236c0ea859cb95bf4cef923f27a65" \ + CHECKSUM="a3bf3bd218fd77aa91e187ae5c77964820a35c0f58018151aa9653e2fc5b2313" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index 81a9da98d3..a4e5b40fa0 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.6.1 +ENV NODE_VERSION 19.7.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="75d0c43a3f6de0fe7116f6998b810e763b6236c0ea859cb95bf4cef923f27a65" \ + CHECKSUM="a3bf3bd218fd77aa91e187ae5c77964820a35c0f58018151aa9653e2fc5b2313" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 5a48a3b01d..860341cfd8 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.6.1 +ENV NODE_VERSION 19.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 47f595f42f..d20caa2983 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.6.1 +ENV NODE_VERSION 19.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index 0faafe647a..f62b81ca6c 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.6.1 +ENV NODE_VERSION 19.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index 146dfbb6c4..9dc9bc2f5c 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.6.1 +ENV NODE_VERSION 19.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8c8d822cd2171d349fedf19361b2166840523365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Arboleda?= Date: Thu, 2 Mar 2023 23:55:57 -0500 Subject: [PATCH 632/818] keys: add key for @juanarbol --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index a0f2ccc76e..811410fc5f 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,6 +1,7 @@ 4ED778F539E3634C779C87C6D7062848A1AB005C 141F07595B7B3FFE74309A937405533BE57C7D57 74F12602B6F1C4E913FAA37AD3A89613643B6201 +DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 61FC681DFB92A079F1685E77973F295594EC4689 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 From 0adf29a4daa744d828d23a8de4c4397dc43d5761 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 7 Mar 2023 19:47:16 -0500 Subject: [PATCH 633/818] feat: Node.js 18.15.0 --- 18/alpine3.16/Dockerfile | 5 +++-- 18/alpine3.17/Dockerfile | 5 +++-- 18/bullseye-slim/Dockerfile | 3 ++- 18/bullseye/Dockerfile | 3 ++- 18/buster-slim/Dockerfile | 3 ++- 18/buster/Dockerfile | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index 4d3c8b6d72..bab778cb2f 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.14.2 +ENV NODE_VERSION 18.15.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="96d95e426ca110dd667de37746d6feb58c6e131f612296e550017b449eec7f21" \ + CHECKSUM="6c53e3e6a592dc8b304632b63d616978a06d9daad3157f063deabee8245e1541" \ ;; \ *) ;; \ esac \ @@ -39,6 +39,7 @@ RUN addgroup -g 1000 node \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 5c5322aa23..995e26d6c2 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.14.2 +ENV NODE_VERSION 18.15.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="96d95e426ca110dd667de37746d6feb58c6e131f612296e550017b449eec7f21" \ + CHECKSUM="6c53e3e6a592dc8b304632b63d616978a06d9daad3157f063deabee8245e1541" \ ;; \ *) ;; \ esac \ @@ -39,6 +39,7 @@ RUN addgroup -g 1000 node \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index c8c9a6ec0b..dd35bdeda4 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.14.2 +ENV NODE_VERSION 18.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index a4efb4081b..9ccf461e39 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.14.2 +ENV NODE_VERSION 18.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 8cabe6f08c..8a447451e4 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.14.2 +ENV NODE_VERSION 18.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 5982cf660b..ce22a999a8 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.14.2 +ENV NODE_VERSION 18.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ From 30e942efc9f1ff1aaaee6867881efc0170c494b8 Mon Sep 17 00:00:00 2001 From: Florian Mutter Date: Wed, 8 Mar 2023 11:28:50 +0100 Subject: [PATCH 634/818] Add `--init` to `docker run` example Make example `docker run` command follow best practice described in section `## Handling Kernel Signals` --- docs/BestPractices.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index d15c0964e4..66c300dd25 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -166,6 +166,7 @@ Here is an example of how you would run a default Node.JS Docker Containerized a ``` $ docker run \ + --init \ -e "NODE_ENV=production" \ -u "node" \ -m "300M" --memory-swap "1G" \ From 7abbf9f3d902b901da72714bcc30b5a92831547e Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 15 Mar 2023 17:15:45 -0400 Subject: [PATCH 635/818] feat: Node.js 19.8.1 --- 19/alpine3.16/Dockerfile | 5 +++-- 19/alpine3.17/Dockerfile | 5 +++-- 19/bullseye-slim/Dockerfile | 3 ++- 19/bullseye/Dockerfile | 3 ++- 19/buster-slim/Dockerfile | 3 ++- 19/buster/Dockerfile | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index f8adb55329..9bd0372a06 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.7.0 +ENV NODE_VERSION 19.8.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="a3bf3bd218fd77aa91e187ae5c77964820a35c0f58018151aa9653e2fc5b2313" \ + CHECKSUM="3106608fc62f92519578148e872a6862f36ea7b1ef6ac7c1475e2064fe65a9c6" \ ;; \ *) ;; \ esac \ @@ -39,6 +39,7 @@ RUN addgroup -g 1000 node \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index a4e5b40fa0..a09f18a7ce 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.7.0 +ENV NODE_VERSION 19.8.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="a3bf3bd218fd77aa91e187ae5c77964820a35c0f58018151aa9653e2fc5b2313" \ + CHECKSUM="3106608fc62f92519578148e872a6862f36ea7b1ef6ac7c1475e2064fe65a9c6" \ ;; \ *) ;; \ esac \ @@ -39,6 +39,7 @@ RUN addgroup -g 1000 node \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index 860341cfd8..c9e6d42a09 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.7.0 +ENV NODE_VERSION 19.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index d20caa2983..270cd6317e 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.7.0 +ENV NODE_VERSION 19.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index f62b81ca6c..d4b9d5052e 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.7.0 +ENV NODE_VERSION 19.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index 9dc9bc2f5c..e3c06ed2d9 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.7.0 +ENV NODE_VERSION 19.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ From be47decfc9dbb2aaa5618a3e0e2e5859334dba19 Mon Sep 17 00:00:00 2001 From: odan Date: Thu, 23 Mar 2023 01:50:50 +0900 Subject: [PATCH 636/818] chore: replace lots0logs/gh-action-get-changed-files to tj-actions/changed-files --- .github/workflows/build-test.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 21b1a51268..45af20612c 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -21,15 +21,16 @@ jobs: runs-on: ubuntu-latest steps: - - name: Calculate file differences - uses: lots0logs/gh-action-get-changed-files@2.1.4 - id: diff - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Checkout uses: actions/checkout@v3 + - name: Calculate file differences + id: changed-files + uses: tj-actions/changed-files@v35 + with: + json: true + json_raw_format: true + - name: Generate testing matrix uses: actions/github-script@v6 id: generator @@ -38,9 +39,9 @@ jobs: script: | const script = require(`${process.env.GITHUB_WORKSPACE}/genMatrix.js`) return script( - ${{ steps.diff.outputs.added }}, - ${{ steps.diff.outputs.modified }}, - ${{ steps.diff.outputs.renamed }}, + ${{ steps.changed-files.outputs.added_files }}, + ${{ steps.changed-files.outputs.modified_files }}, + ${{ steps.changed-files.outputs.renamed_files }}, ); outputs: From d35337401fa3ae3a4120cd3eb1ab5c6af387c27e Mon Sep 17 00:00:00 2001 From: odan Date: Sat, 25 Mar 2023 01:34:51 +0900 Subject: [PATCH 637/818] chore: fix id of tj-actions/changed-files --- .github/workflows/build-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 45af20612c..dc3db2b929 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v3 - name: Calculate file differences - id: changed-files + id: diff uses: tj-actions/changed-files@v35 with: json: true @@ -39,9 +39,9 @@ jobs: script: | const script = require(`${process.env.GITHUB_WORKSPACE}/genMatrix.js`) return script( - ${{ steps.changed-files.outputs.added_files }}, - ${{ steps.changed-files.outputs.modified_files }}, - ${{ steps.changed-files.outputs.renamed_files }}, + ${{ steps.diff.outputs.added_files }}, + ${{ steps.diff.outputs.modified_files }}, + ${{ steps.diff.outputs.renamed_files }}, ); outputs: From bd6c00f07c5a3b311ce0e346ab69df6b9ef8d08f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 29 Mar 2023 17:22:50 -0400 Subject: [PATCH 638/818] feat: Node.js 16.20.0 --- 16/alpine3.16/Dockerfile | 5 +++-- 16/alpine3.17/Dockerfile | 5 +++-- 16/bullseye-slim/Dockerfile | 3 ++- 16/bullseye/Dockerfile | 3 ++- 16/buster-slim/Dockerfile | 3 ++- 16/buster/Dockerfile | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.16/Dockerfile index dc66f47f2b..020a4729c8 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 16.19.1 +ENV NODE_VERSION 16.20.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="f701dbe93da8be3198d3b6a2ba0044c2f5d142b3acabefb7a3ffeb31245b88df" \ + CHECKSUM="b3f80fe7d0f1af6fe25ffedc7237ca519965d08fc800eab29cf45cd5b90cdb26" \ ;; \ *) ;; \ esac \ @@ -39,6 +39,7 @@ RUN addgroup -g 1000 node \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile index 7c85091da5..d45280c9a8 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 16.19.1 +ENV NODE_VERSION 16.20.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="f701dbe93da8be3198d3b6a2ba0044c2f5d142b3acabefb7a3ffeb31245b88df" \ + CHECKSUM="b3f80fe7d0f1af6fe25ffedc7237ca519965d08fc800eab29cf45cd5b90cdb26" \ ;; \ *) ;; \ esac \ @@ -39,6 +39,7 @@ RUN addgroup -g 1000 node \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index b9933a2f15..04ec63109b 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.19.1 +ENV NODE_VERSION 16.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 2976ae5f32..9bda6cd10a 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.19.1 +ENV NODE_VERSION 16.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 10bbd4234a..280f1432f0 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.19.1 +ENV NODE_VERSION 16.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,6 +23,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index 35dbca26af..b034997a93 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.19.1 +ENV NODE_VERSION 16.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,6 +21,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ From 9f4db301c43cdaf37efea90af299f14842a430c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:56:49 +0000 Subject: [PATCH 639/818] chore(deps): bump peter-evans/create-pull-request from 4 to 5 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/official-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 61046ab363..224dd3090a 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -23,7 +23,7 @@ jobs: - name: Create update PR id: cpr - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v5 with: token: ${{ secrets.GH_API_TOKEN }} author: "Node.js GitHub Bot " diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index edcad08713..341640fc5c 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -38,7 +38,7 @@ jobs: - name: Create PR in official-images id: create-pr - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v5 with: token: ${{ secrets.GH_API_TOKEN }} push-to-fork: nodejs/official-images From 57d9a8d34b548c79fda1f7a43095d6614536323f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:56:51 +0000 Subject: [PATCH 640/818] chore(deps): bump peter-evans/create-or-update-comment from 2 to 3 Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 2 to 3. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v2...v3) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index edcad08713..4a2b1c1a9c 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -56,7 +56,7 @@ jobs: echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}" - name: Create PR comment - uses: peter-evans/create-or-update-comment@v2 + uses: peter-evans/create-or-update-comment@v3 if: ${{ steps.create-pr.outputs.pull-request-url != '' }} with: issue-number: ${{ github.event.pull_request.number }} From 7a8d51d0e6acd67d14059140231ea52c7be8f023 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 11 Apr 2023 01:42:17 -0400 Subject: [PATCH 641/818] feat: Node.js 19.9.0 --- 19/alpine3.16/Dockerfile | 4 ++-- 19/alpine3.17/Dockerfile | 4 ++-- 19/bullseye-slim/Dockerfile | 2 +- 19/bullseye/Dockerfile | 2 +- 19/buster-slim/Dockerfile | 2 +- 19/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.16/Dockerfile index 9bd0372a06..c1bf444b88 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 19.8.1 +ENV NODE_VERSION 19.9.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="3106608fc62f92519578148e872a6862f36ea7b1ef6ac7c1475e2064fe65a9c6" \ + CHECKSUM="d63db62d7c45fbad739ff5b9e67fa4b31a6993a4d8e9d021997a938760bfef89" \ ;; \ *) ;; \ esac \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index a09f18a7ce..e90dc92796 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 19.8.1 +ENV NODE_VERSION 19.9.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="3106608fc62f92519578148e872a6862f36ea7b1ef6ac7c1475e2064fe65a9c6" \ + CHECKSUM="d63db62d7c45fbad739ff5b9e67fa4b31a6993a4d8e9d021997a938760bfef89" \ ;; \ *) ;; \ esac \ diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile index c9e6d42a09..5688b43cad 100644 --- a/19/bullseye-slim/Dockerfile +++ b/19/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 19.8.1 +ENV NODE_VERSION 19.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile index 270cd6317e..0085a3684c 100644 --- a/19/bullseye/Dockerfile +++ b/19/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 19.8.1 +ENV NODE_VERSION 19.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile index d4b9d5052e..0e6055d067 100644 --- a/19/buster-slim/Dockerfile +++ b/19/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 19.8.1 +ENV NODE_VERSION 19.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile index e3c06ed2d9..008f0e7de3 100644 --- a/19/buster/Dockerfile +++ b/19/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 19.8.1 +ENV NODE_VERSION 19.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 4c95f887f7863eccc17d66729cd24ecc230209a2 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 13 Apr 2023 00:57:06 -0400 Subject: [PATCH 642/818] feat: Node.js 18.16.0 --- 18/alpine3.16/Dockerfile | 4 ++-- 18/alpine3.17/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.16/Dockerfile index bab778cb2f..6faa357cb6 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 18.15.0 +ENV NODE_VERSION 18.16.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="6c53e3e6a592dc8b304632b63d616978a06d9daad3157f063deabee8245e1541" \ + CHECKSUM="d093ef223708a6702db1dc591911f3b23481cb55a337df3adf80b6effaba90b2" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 995e26d6c2..552a1495d5 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.15.0 +ENV NODE_VERSION 18.16.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="6c53e3e6a592dc8b304632b63d616978a06d9daad3157f063deabee8245e1541" \ + CHECKSUM="d093ef223708a6702db1dc591911f3b23481cb55a337df3adf80b6effaba90b2" \ ;; \ *) ;; \ esac \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index dd35bdeda4..e2fddb5926 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.15.0 +ENV NODE_VERSION 18.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 9ccf461e39..4c469d3c1b 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.15.0 +ENV NODE_VERSION 18.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 8a447451e4..195f5c5de1 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.15.0 +ENV NODE_VERSION 18.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index ce22a999a8..e3de67091d 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.15.0 +ENV NODE_VERSION 18.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 56ab53b4849a2fbadccf787edf1530cf7139b6b5 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 19 Apr 2023 03:04:46 +0900 Subject: [PATCH 643/818] feat: remove EOL Node.js 14 Signed-off-by: Sora Morimoto --- 14/alpine3.16/Dockerfile | 96 --------------------------- 14/alpine3.16/docker-entrypoint.sh | 11 --- 14/alpine3.17/Dockerfile | 96 --------------------------- 14/alpine3.17/docker-entrypoint.sh | 11 --- 14/bullseye-slim/Dockerfile | 92 ------------------------- 14/bullseye-slim/docker-entrypoint.sh | 11 --- 14/bullseye/Dockerfile | 68 ------------------- 14/bullseye/docker-entrypoint.sh | 11 --- 14/buster-slim/Dockerfile | 92 ------------------------- 14/buster-slim/docker-entrypoint.sh | 11 --- 14/buster/Dockerfile | 68 ------------------- 14/buster/docker-entrypoint.sh | 11 --- versions.json | 51 -------------- 13 files changed, 629 deletions(-) delete mode 100644 14/alpine3.16/Dockerfile delete mode 100755 14/alpine3.16/docker-entrypoint.sh delete mode 100644 14/alpine3.17/Dockerfile delete mode 100755 14/alpine3.17/docker-entrypoint.sh delete mode 100644 14/bullseye-slim/Dockerfile delete mode 100755 14/bullseye-slim/docker-entrypoint.sh delete mode 100644 14/bullseye/Dockerfile delete mode 100755 14/bullseye/docker-entrypoint.sh delete mode 100644 14/buster-slim/Dockerfile delete mode 100755 14/buster-slim/docker-entrypoint.sh delete mode 100644 14/buster/Dockerfile delete mode 100755 14/buster/docker-entrypoint.sh diff --git a/14/alpine3.16/Dockerfile b/14/alpine3.16/Dockerfile deleted file mode 100644 index dc091a7e5b..0000000000 --- a/14/alpine3.16/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM alpine:3.16 - -ENV NODE_VERSION 14.21.3 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="39c334bd7ef3a6e5a5a396e08b3edbe335d86161bbfba222c75aa4a3518af942" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/alpine3.16/docker-entrypoint.sh b/14/alpine3.16/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/alpine3.16/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/alpine3.17/Dockerfile b/14/alpine3.17/Dockerfile deleted file mode 100644 index d872faac73..0000000000 --- a/14/alpine3.17/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM alpine:3.17 - -ENV NODE_VERSION 14.21.3 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="39c334bd7ef3a6e5a5a396e08b3edbe335d86161bbfba222c75aa4a3518af942" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/alpine3.17/docker-entrypoint.sh b/14/alpine3.17/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/alpine3.17/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/bullseye-slim/Dockerfile b/14/bullseye-slim/Dockerfile deleted file mode 100644 index d5f89b13cf..0000000000 --- a/14/bullseye-slim/Dockerfile +++ /dev/null @@ -1,92 +0,0 @@ -FROM debian:bullseye-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 14.21.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/bullseye-slim/docker-entrypoint.sh b/14/bullseye-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/bullseye-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/bullseye/Dockerfile b/14/bullseye/Dockerfile deleted file mode 100644 index e370507495..0000000000 --- a/14/bullseye/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM buildpack-deps:bullseye - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 14.21.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/bullseye/docker-entrypoint.sh b/14/bullseye/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/bullseye/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/buster-slim/Dockerfile b/14/buster-slim/Dockerfile deleted file mode 100644 index 50f28f590c..0000000000 --- a/14/buster-slim/Dockerfile +++ /dev/null @@ -1,92 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 14.21.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/buster-slim/docker-entrypoint.sh b/14/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/14/buster/Dockerfile b/14/buster/Dockerfile deleted file mode 100644 index 576eab176b..0000000000 --- a/14/buster/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 14.21.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/14/buster/docker-entrypoint.sh b/14/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/14/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index 1176e5eaa3..f9db593324 100644 --- a/versions.json +++ b/versions.json @@ -151,56 +151,5 @@ "arm64v8" ] } - }, - "14": { - "start": "2020-04-21", - "lts": "2020-10-27", - "maintenance": "2021-10-19", - "end": "2023-04-30", - "codename": "fermium", - "alpine-default": "alpine3.17", - "debian-default": "buster", - "variants": { - "alpine3.16": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.17": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8" - ] - } } } From 2ba234d0ebc92c4b802d859c5690670550bc6f11 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 19 Apr 2023 02:58:05 +0900 Subject: [PATCH 644/818] feat: Node.js 20.0.0 Signed-off-by: Sora Morimoto --- 20/alpine3.16/Dockerfile | 97 +++++++++++++++++++++++++++ 20/alpine3.16/docker-entrypoint.sh | 11 +++ 20/alpine3.17/Dockerfile | 97 +++++++++++++++++++++++++++ 20/alpine3.17/docker-entrypoint.sh | 11 +++ 20/bullseye-slim/Dockerfile | 93 +++++++++++++++++++++++++ 20/bullseye-slim/docker-entrypoint.sh | 11 +++ 20/bullseye/Dockerfile | 69 +++++++++++++++++++ 20/bullseye/docker-entrypoint.sh | 11 +++ 20/buster-slim/Dockerfile | 93 +++++++++++++++++++++++++ 20/buster-slim/docker-entrypoint.sh | 11 +++ 20/buster/Dockerfile | 69 +++++++++++++++++++ 20/buster/docker-entrypoint.sh | 11 +++ versions.json | 51 ++++++++++++++ 13 files changed, 635 insertions(+) create mode 100644 20/alpine3.16/Dockerfile create mode 100755 20/alpine3.16/docker-entrypoint.sh create mode 100644 20/alpine3.17/Dockerfile create mode 100755 20/alpine3.17/docker-entrypoint.sh create mode 100644 20/bullseye-slim/Dockerfile create mode 100755 20/bullseye-slim/docker-entrypoint.sh create mode 100644 20/bullseye/Dockerfile create mode 100755 20/bullseye/docker-entrypoint.sh create mode 100644 20/buster-slim/Dockerfile create mode 100755 20/buster-slim/docker-entrypoint.sh create mode 100644 20/buster/Dockerfile create mode 100755 20/buster/docker-entrypoint.sh diff --git a/20/alpine3.16/Dockerfile b/20/alpine3.16/Dockerfile new file mode 100644 index 0000000000..1ebe2a87a9 --- /dev/null +++ b/20/alpine3.16/Dockerfile @@ -0,0 +1,97 @@ +FROM alpine:3.16 + +ENV NODE_VERSION 20.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="8a637ef2fbac8c50b08129b8cbd80a8175a3d6c8b06615de100170d795af8668" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/alpine3.16/docker-entrypoint.sh b/20/alpine3.16/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/alpine3.16/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile new file mode 100644 index 0000000000..69aaf0e5ad --- /dev/null +++ b/20/alpine3.17/Dockerfile @@ -0,0 +1,97 @@ +FROM alpine:3.17 + +ENV NODE_VERSION 20.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="8a637ef2fbac8c50b08129b8cbd80a8175a3d6c8b06615de100170d795af8668" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/alpine3.17/docker-entrypoint.sh b/20/alpine3.17/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/alpine3.17/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..87e1f739a9 --- /dev/null +++ b/20/bullseye-slim/Dockerfile @@ -0,0 +1,93 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 20.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/bullseye-slim/docker-entrypoint.sh b/20/bullseye-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile new file mode 100644 index 0000000000..972a81412b --- /dev/null +++ b/20/bullseye/Dockerfile @@ -0,0 +1,69 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 20.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/bullseye/docker-entrypoint.sh b/20/bullseye/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/bullseye/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile new file mode 100644 index 0000000000..93fd70bf6b --- /dev/null +++ b/20/buster-slim/Dockerfile @@ -0,0 +1,93 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 20.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/buster-slim/docker-entrypoint.sh b/20/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/buster-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile new file mode 100644 index 0000000000..f4f309c10f --- /dev/null +++ b/20/buster/Dockerfile @@ -0,0 +1,69 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 20.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/buster/docker-entrypoint.sh b/20/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/buster/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index 1176e5eaa3..509701a9b1 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,55 @@ { + "20": { + "start": "2023-04-18", + "lts": "2023-10-24", + "maintenance": "2024-10-22", + "end": "2026-04-30", + "codename": "", + "alpine-default": "alpine3.17", + "debian-default": "bullseye", + "variants": { + "alpine3.16": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.17": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, "19": { "start": "2022-10-18", "lts": "", From 4bda55337ef11b9b2dbb80ee6576870e258a035b Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 4 May 2023 12:24:39 +0000 Subject: [PATCH 645/818] feat: Node.js 20.1.0 --- 20/alpine3.16/Dockerfile | 4 ++-- 20/alpine3.17/Dockerfile | 4 ++-- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/20/alpine3.16/Dockerfile b/20/alpine3.16/Dockerfile index 1ebe2a87a9..e695f6a574 100644 --- a/20/alpine3.16/Dockerfile +++ b/20/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 20.0.0 +ENV NODE_VERSION 20.1.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="8a637ef2fbac8c50b08129b8cbd80a8175a3d6c8b06615de100170d795af8668" \ + CHECKSUM="b31fc454021d88346f82dc4eac9da43798d00ffa00cfa839dfe8651453d063ee" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 69aaf0e5ad..75f71b83ca 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.0.0 +ENV NODE_VERSION 20.1.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="8a637ef2fbac8c50b08129b8cbd80a8175a3d6c8b06615de100170d795af8668" \ + CHECKSUM="b31fc454021d88346f82dc4eac9da43798d00ffa00cfa839dfe8651453d063ee" \ ;; \ *) ;; \ esac \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 87e1f739a9..5868cf3c7d 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.0.0 +ENV NODE_VERSION 20.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 972a81412b..b0a1cd0e43 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.0.0 +ENV NODE_VERSION 20.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 93fd70bf6b..6bc0e9cea3 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.0.0 +ENV NODE_VERSION 20.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index f4f309c10f..e1f8e2e823 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.0.0 +ENV NODE_VERSION 20.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 510d29310b47fbe7c6cfe9c0d0bc4f9e1ff59713 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 16 May 2023 16:23:16 +0000 Subject: [PATCH 646/818] feat: Node.js 20.2.0 --- 20/alpine3.16/Dockerfile | 4 ++-- 20/alpine3.17/Dockerfile | 4 ++-- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/20/alpine3.16/Dockerfile b/20/alpine3.16/Dockerfile index e695f6a574..f4c95a2b58 100644 --- a/20/alpine3.16/Dockerfile +++ b/20/alpine3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ENV NODE_VERSION 20.1.0 +ENV NODE_VERSION 20.2.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="b31fc454021d88346f82dc4eac9da43798d00ffa00cfa839dfe8651453d063ee" \ + CHECKSUM="598adbb518f3fb77b648dbfb5375d54ba8aa99378415993e2252e03d31259b84" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 75f71b83ca..31d6323fdd 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.1.0 +ENV NODE_VERSION 20.2.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="b31fc454021d88346f82dc4eac9da43798d00ffa00cfa839dfe8651453d063ee" \ + CHECKSUM="598adbb518f3fb77b648dbfb5375d54ba8aa99378415993e2252e03d31259b84" \ ;; \ *) ;; \ esac \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 5868cf3c7d..6249ebe0e8 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.1.0 +ENV NODE_VERSION 20.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index b0a1cd0e43..886eee6bb2 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.1.0 +ENV NODE_VERSION 20.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 6bc0e9cea3..40d01d470a 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.1.0 +ENV NODE_VERSION 20.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index e1f8e2e823..9ac6a72518 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.1.0 +ENV NODE_VERSION 20.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5a5c547c7f1a5acf600653d09069c9566f1757c8 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 10 May 2023 11:59:37 +0200 Subject: [PATCH 647/818] Add Alpine 3.18 variant Also remove Alpine 3.16 --- 16/{alpine3.16 => alpine3.18}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 18/{alpine3.16 => alpine3.18}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 19/{alpine3.16 => alpine3.18}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 20/{alpine3.16 => alpine3.18}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 architectures | 14 +++++------ config | 2 +- versions.json | 24 +++++++++---------- 11 files changed, 24 insertions(+), 24 deletions(-) rename 16/{alpine3.16 => alpine3.18}/Dockerfile (99%) rename 16/{alpine3.16 => alpine3.18}/docker-entrypoint.sh (100%) rename 18/{alpine3.16 => alpine3.18}/Dockerfile (99%) rename 18/{alpine3.16 => alpine3.18}/docker-entrypoint.sh (100%) rename 19/{alpine3.16 => alpine3.18}/Dockerfile (99%) rename 19/{alpine3.16 => alpine3.18}/docker-entrypoint.sh (100%) rename 20/{alpine3.16 => alpine3.18}/Dockerfile (99%) rename 20/{alpine3.16 => alpine3.18}/docker-entrypoint.sh (100%) diff --git a/16/alpine3.16/Dockerfile b/16/alpine3.18/Dockerfile similarity index 99% rename from 16/alpine3.16/Dockerfile rename to 16/alpine3.18/Dockerfile index 020a4729c8..a6d1d87162 100644 --- a/16/alpine3.16/Dockerfile +++ b/16/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.18 ENV NODE_VERSION 16.20.0 diff --git a/16/alpine3.16/docker-entrypoint.sh b/16/alpine3.18/docker-entrypoint.sh similarity index 100% rename from 16/alpine3.16/docker-entrypoint.sh rename to 16/alpine3.18/docker-entrypoint.sh diff --git a/18/alpine3.16/Dockerfile b/18/alpine3.18/Dockerfile similarity index 99% rename from 18/alpine3.16/Dockerfile rename to 18/alpine3.18/Dockerfile index 6faa357cb6..4a79346c3c 100644 --- a/18/alpine3.16/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.18 ENV NODE_VERSION 18.16.0 diff --git a/18/alpine3.16/docker-entrypoint.sh b/18/alpine3.18/docker-entrypoint.sh similarity index 100% rename from 18/alpine3.16/docker-entrypoint.sh rename to 18/alpine3.18/docker-entrypoint.sh diff --git a/19/alpine3.16/Dockerfile b/19/alpine3.18/Dockerfile similarity index 99% rename from 19/alpine3.16/Dockerfile rename to 19/alpine3.18/Dockerfile index c1bf444b88..784d3a3728 100644 --- a/19/alpine3.16/Dockerfile +++ b/19/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.18 ENV NODE_VERSION 19.9.0 diff --git a/19/alpine3.16/docker-entrypoint.sh b/19/alpine3.18/docker-entrypoint.sh similarity index 100% rename from 19/alpine3.16/docker-entrypoint.sh rename to 19/alpine3.18/docker-entrypoint.sh diff --git a/20/alpine3.16/Dockerfile b/20/alpine3.18/Dockerfile similarity index 99% rename from 20/alpine3.16/Dockerfile rename to 20/alpine3.18/Dockerfile index f4c95a2b58..ba3e82432d 100644 --- a/20/alpine3.16/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.18 ENV NODE_VERSION 20.2.0 diff --git a/20/alpine3.16/docker-entrypoint.sh b/20/alpine3.18/docker-entrypoint.sh similarity index 100% rename from 20/alpine3.16/docker-entrypoint.sh rename to 20/alpine3.18/docker-entrypoint.sh diff --git a/architectures b/architectures index 094b44113f..35472178f8 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim -arm32v6 alpine3.16,alpine3.17 -arm32v7 alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim -arm64v8 alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim -i386 alpine3.16,alpine3.17 -ppc64le alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.16,alpine3.17,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim +arm32v6 alpine3.17,alpine3.18 +arm32v7 alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim +arm64v8 alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim +i386 alpine3.17,alpine3.18 +ppc64le alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index c5f634c115..5bcef7797e 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant bullseye -alpine_version 3.17 +alpine_version 3.18 debian_versions stretch bullseye buster diff --git a/versions.json b/versions.json index f8d6a047a3..3c97ae1ee7 100644 --- a/versions.json +++ b/versions.json @@ -5,10 +5,10 @@ "maintenance": "2024-10-22", "end": "2026-04-30", "codename": "", - "alpine-default": "alpine3.17", + "alpine-default": "alpine3.18", "debian-default": "bullseye", "variants": { - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", @@ -16,7 +16,7 @@ "ppc64le", "s390x" ], - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -56,10 +56,10 @@ "maintenance": "2023-04-01", "end": "2023-06-01", "codename": "", - "alpine-default": "alpine3.17", + "alpine-default": "alpine3.18", "debian-default": "bullseye", "variants": { - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", @@ -67,7 +67,7 @@ "ppc64le", "s390x" ], - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -107,10 +107,10 @@ "maintenance": "2023-10-18", "end": "2025-04-30", "codename": "hydrogen", - "alpine-default": "alpine3.17", + "alpine-default": "alpine3.18", "debian-default": "bullseye", "variants": { - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", @@ -118,7 +118,7 @@ "ppc64le", "s390x" ], - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -158,10 +158,10 @@ "maintenance": "2022-10-18", "end": "2024-04-30", "codename": "gallium", - "alpine-default": "alpine3.17", + "alpine-default": "alpine3.18", "debian-default": "buster", "variants": { - "alpine3.16": [ + "alpine3.17": [ "amd64", "arm32v6", "arm32v7", @@ -169,7 +169,7 @@ "ppc64le", "s390x" ], - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", From d951a7ff95eac09985446409589d6ea75ac42f96 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 10 May 2023 18:51:57 +0200 Subject: [PATCH 648/818] Use temporary gpg directory to disable automatic use of keybox daemon --- 16/alpine3.17/Dockerfile | 8 ++++++++ 16/alpine3.18/Dockerfile | 8 ++++++++ 18/alpine3.17/Dockerfile | 8 ++++++++ 18/alpine3.18/Dockerfile | 8 ++++++++ 19/alpine3.17/Dockerfile | 8 ++++++++ 19/alpine3.18/Dockerfile | 8 ++++++++ 20/alpine3.17/Dockerfile | 8 ++++++++ 20/alpine3.18/Dockerfile | 8 ++++++++ Dockerfile-alpine.template | 8 ++++++++ 9 files changed, 72 insertions(+) diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile index d45280c9a8..4b5e6bdbec 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/16/alpine3.18/Dockerfile b/16/alpine3.18/Dockerfile index a6d1d87162..a5f6838ee4 100644 --- a/16/alpine3.18/Dockerfile +++ b/16/alpine3.18/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 552a1495d5..5c95e2e6ab 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 4a79346c3c..c0870b3110 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile index e90dc92796..85f68f6375 100644 --- a/19/alpine3.17/Dockerfile +++ b/19/alpine3.17/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/19/alpine3.18/Dockerfile b/19/alpine3.18/Dockerfile index 784d3a3728..a4356915d7 100644 --- a/19/alpine3.18/Dockerfile +++ b/19/alpine3.18/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 31d6323fdd..8293b75dc1 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index ba3e82432d..1ee8625e95 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ @@ -53,6 +55,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -73,6 +77,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 1.22.19 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -82,6 +88,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index c2e2c5a5a9..553da29bf6 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -34,6 +34,8 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ "${NODE_KEYS[@]}" @@ -44,6 +46,8 @@ RUN addgroup -g 1000 node \ && 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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xf "node-v$NODE_VERSION.tar.xz" \ && cd "node-v$NODE_VERSION" \ @@ -64,6 +68,8 @@ RUN addgroup -g 1000 node \ ENV YARN_VERSION 0.0.0 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ "${YARN_KEYS[@]}" ; do \ @@ -73,6 +79,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ From 6f1e8ad293ef56a39706334f70c65b611b8ea2bb Mon Sep 17 00:00:00 2001 From: Jesper Noordsij <45041769+jnoordsij@users.noreply.github.com> Date: Wed, 24 May 2023 18:22:14 +0200 Subject: [PATCH 649/818] Adjust typo in PR template Also slightly reword for better readability --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3c2c1b3e6a..6fadc5bdf3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -37,7 +37,7 @@ What types of changes does your code introduce? Put an `x` in all the boxes that - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) -- [ ] Others (non of above) +- [ ] Other (none of the above) ## Checklist From 2d0cae79b912981651ad0ecce134c3315acacfbe Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 3 Jun 2023 12:19:57 -0400 Subject: [PATCH 650/818] feat: drop EOL Node 19 --- 19/alpine3.17/Dockerfile | 105 -------------------------- 19/alpine3.17/docker-entrypoint.sh | 11 --- 19/alpine3.18/Dockerfile | 105 -------------------------- 19/alpine3.18/docker-entrypoint.sh | 11 --- 19/bullseye-slim/Dockerfile | 93 ----------------------- 19/bullseye-slim/docker-entrypoint.sh | 11 --- 19/bullseye/Dockerfile | 69 ----------------- 19/bullseye/docker-entrypoint.sh | 11 --- 19/buster-slim/Dockerfile | 93 ----------------------- 19/buster-slim/docker-entrypoint.sh | 11 --- 19/buster/Dockerfile | 69 ----------------- 19/buster/docker-entrypoint.sh | 11 --- versions.json | 51 ------------- 13 files changed, 651 deletions(-) delete mode 100644 19/alpine3.17/Dockerfile delete mode 100755 19/alpine3.17/docker-entrypoint.sh delete mode 100644 19/alpine3.18/Dockerfile delete mode 100755 19/alpine3.18/docker-entrypoint.sh delete mode 100644 19/bullseye-slim/Dockerfile delete mode 100755 19/bullseye-slim/docker-entrypoint.sh delete mode 100644 19/bullseye/Dockerfile delete mode 100755 19/bullseye/docker-entrypoint.sh delete mode 100644 19/buster-slim/Dockerfile delete mode 100755 19/buster-slim/docker-entrypoint.sh delete mode 100644 19/buster/Dockerfile delete mode 100755 19/buster/docker-entrypoint.sh diff --git a/19/alpine3.17/Dockerfile b/19/alpine3.17/Dockerfile deleted file mode 100644 index 85f68f6375..0000000000 --- a/19/alpine3.17/Dockerfile +++ /dev/null @@ -1,105 +0,0 @@ -FROM alpine:3.17 - -ENV NODE_VERSION 19.9.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="d63db62d7c45fbad739ff5b9e67fa4b31a6993a4d8e9d021997a938760bfef89" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/19/alpine3.17/docker-entrypoint.sh b/19/alpine3.17/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/19/alpine3.17/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/19/alpine3.18/Dockerfile b/19/alpine3.18/Dockerfile deleted file mode 100644 index a4356915d7..0000000000 --- a/19/alpine3.18/Dockerfile +++ /dev/null @@ -1,105 +0,0 @@ -FROM alpine:3.18 - -ENV NODE_VERSION 19.9.0 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="d63db62d7c45fbad739ff5b9e67fa4b31a6993a4d8e9d021997a938760bfef89" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/19/alpine3.18/docker-entrypoint.sh b/19/alpine3.18/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/19/alpine3.18/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/19/bullseye-slim/Dockerfile b/19/bullseye-slim/Dockerfile deleted file mode 100644 index 5688b43cad..0000000000 --- a/19/bullseye-slim/Dockerfile +++ /dev/null @@ -1,93 +0,0 @@ -FROM debian:bullseye-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 19.9.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/19/bullseye-slim/docker-entrypoint.sh b/19/bullseye-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/19/bullseye-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/19/bullseye/Dockerfile b/19/bullseye/Dockerfile deleted file mode 100644 index 0085a3684c..0000000000 --- a/19/bullseye/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM buildpack-deps:bullseye - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 19.9.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/19/bullseye/docker-entrypoint.sh b/19/bullseye/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/19/bullseye/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/19/buster-slim/Dockerfile b/19/buster-slim/Dockerfile deleted file mode 100644 index 0e6055d067..0000000000 --- a/19/buster-slim/Dockerfile +++ /dev/null @@ -1,93 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 19.9.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/19/buster-slim/docker-entrypoint.sh b/19/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/19/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/19/buster/Dockerfile b/19/buster/Dockerfile deleted file mode 100644 index 008f0e7de3..0000000000 --- a/19/buster/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 19.9.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/19/buster/docker-entrypoint.sh b/19/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/19/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index 3c97ae1ee7..3842481493 100644 --- a/versions.json +++ b/versions.json @@ -50,57 +50,6 @@ ] } }, - "19": { - "start": "2022-10-18", - "lts": "", - "maintenance": "2023-04-01", - "end": "2023-06-01", - "codename": "", - "alpine-default": "alpine3.18", - "debian-default": "bullseye", - "variants": { - "alpine3.17": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.18": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8" - ] - } - }, "18": { "start": "2022-04-19", "lts": "2022-10-25", From cf175362b1011bd85052a0034a4d3f8dae45345f Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 9 Jun 2023 13:22:11 +0000 Subject: [PATCH 651/818] feat: Node.js 20.3.0 --- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 8293b75dc1..36b05da343 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.2.0 +ENV NODE_VERSION 20.3.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="598adbb518f3fb77b648dbfb5375d54ba8aa99378415993e2252e03d31259b84" \ + CHECKSUM="f3ad9443e8d9d53bfc00ec875181e9dc2ccf86205a50fce119e0610cdba8ccf1" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 1ee8625e95..b163c1dab8 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.2.0 +ENV NODE_VERSION 20.3.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="598adbb518f3fb77b648dbfb5375d54ba8aa99378415993e2252e03d31259b84" \ + CHECKSUM="f3ad9443e8d9d53bfc00ec875181e9dc2ccf86205a50fce119e0610cdba8ccf1" \ ;; \ *) ;; \ esac \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 6249ebe0e8..62bae64f82 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.2.0 +ENV NODE_VERSION 20.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 886eee6bb2..91c4d80ca2 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.2.0 +ENV NODE_VERSION 20.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 40d01d470a..44223b0791 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.2.0 +ENV NODE_VERSION 20.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 9ac6a72518..429256c888 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.2.0 +ENV NODE_VERSION 20.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 92f7975318fe8d49e83653bf93a27e4af4a4872c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 18 Apr 2023 09:24:37 +0300 Subject: [PATCH 652/818] Add images for debian bookworm --- 16/bookworm-slim/Dockerfile | 93 +++++++++++++++++++++++++++ 16/bookworm-slim/docker-entrypoint.sh | 11 ++++ 16/bookworm/Dockerfile | 69 ++++++++++++++++++++ 16/bookworm/docker-entrypoint.sh | 11 ++++ 18/bookworm-slim/Dockerfile | 93 +++++++++++++++++++++++++++ 18/bookworm-slim/docker-entrypoint.sh | 11 ++++ 18/bookworm/Dockerfile | 69 ++++++++++++++++++++ 18/bookworm/docker-entrypoint.sh | 11 ++++ 20/bookworm-slim/Dockerfile | 93 +++++++++++++++++++++++++++ 20/bookworm-slim/docker-entrypoint.sh | 11 ++++ 20/bookworm/Dockerfile | 69 ++++++++++++++++++++ 20/bookworm/docker-entrypoint.sh | 11 ++++ README.md | 7 ++ SECURITY.md | 2 +- architectures | 10 +-- config | 4 +- update.sh | 2 +- versions.json | 46 ++++++++++++- 18 files changed, 612 insertions(+), 11 deletions(-) create mode 100644 16/bookworm-slim/Dockerfile create mode 100755 16/bookworm-slim/docker-entrypoint.sh create mode 100644 16/bookworm/Dockerfile create mode 100755 16/bookworm/docker-entrypoint.sh create mode 100644 18/bookworm-slim/Dockerfile create mode 100755 18/bookworm-slim/docker-entrypoint.sh create mode 100644 18/bookworm/Dockerfile create mode 100755 18/bookworm/docker-entrypoint.sh create mode 100644 20/bookworm-slim/Dockerfile create mode 100755 20/bookworm-slim/docker-entrypoint.sh create mode 100644 20/bookworm/Dockerfile create mode 100755 20/bookworm/docker-entrypoint.sh diff --git a/16/bookworm-slim/Dockerfile b/16/bookworm-slim/Dockerfile new file mode 100644 index 0000000000..229f6104ca --- /dev/null +++ b/16/bookworm-slim/Dockerfile @@ -0,0 +1,93 @@ +FROM debian:bookworm-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.20.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/bookworm-slim/docker-entrypoint.sh b/16/bookworm-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/16/bookworm-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile new file mode 100644 index 0000000000..e300c616cd --- /dev/null +++ b/16/bookworm/Dockerfile @@ -0,0 +1,69 @@ +FROM buildpack-deps:bookworm + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 16.20.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/16/bookworm/docker-entrypoint.sh b/16/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/16/bookworm/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile new file mode 100644 index 0000000000..31fd28c35a --- /dev/null +++ b/18/bookworm-slim/Dockerfile @@ -0,0 +1,93 @@ +FROM debian:bookworm-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.16.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/bookworm-slim/docker-entrypoint.sh b/18/bookworm-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/bookworm-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile new file mode 100644 index 0000000000..3299cf4acf --- /dev/null +++ b/18/bookworm/Dockerfile @@ -0,0 +1,69 @@ +FROM buildpack-deps:bookworm + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 18.16.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/18/bookworm/docker-entrypoint.sh b/18/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/18/bookworm/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile new file mode 100644 index 0000000000..4c80425cfb --- /dev/null +++ b/20/bookworm-slim/Dockerfile @@ -0,0 +1,93 @@ +FROM debian:bookworm-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 20.3.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { print $(NF-1) }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/bookworm-slim/docker-entrypoint.sh b/20/bookworm-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/bookworm-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile new file mode 100644 index 0000000000..8b02c7536c --- /dev/null +++ b/20/bookworm/Dockerfile @@ -0,0 +1,69 @@ +FROM buildpack-deps:bookworm + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 20.3.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/20/bookworm/docker-entrypoint.sh b/20/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/20/bookworm/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/README.md b/README.md index ee6b4b97d6..628409b584 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ The official Node.js docker image, made with love by the node community. - [`node:alpine`](#nodealpine) - [`node:buster`](#nodebuster) - [`node:bullseye`](#nodebullseye) + - [`node:bookworm`](#nodebookworm) - [`node:slim`](#nodeslim) - [License](#license) - [Supported Docker versions](#supported-docker-versions) @@ -204,6 +205,12 @@ This image is based on version 11 of [Debian](http://debian.org), available in [the `debian` official image](https://hub.docker.com/_/debian). +### `node:bookworm` + +This image is based on version 12 of +[Debian](http://debian.org), available in +[the `debian` official image](https://hub.docker.com/_/debian). + ### `node:slim` This image does not contain the common packages contained in the default tag and diff --git a/SECURITY.md b/SECURITY.md index 340da3d7c2..7224eff51d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,6 +7,6 @@ Security issues relating to Node.js project should follow the process documented CVEs for the base image packages should be reported to those repositories. Nothing to address those CVEs is in the hands of this repos. - [Alpine](https://github.com/alpinelinux/docker-alpine) -- [Debian (buster, bullseye)](https://github.com/debuerreotype/docker-debian-artifacts) +- [Debian (buster, bullseye, bookworm)](https://github.com/debuerreotype/docker-debian-artifacts) When base images are patched, the images are rebuilt and rolled out to the Docker hub without intervention by this repo. This process is explained in . diff --git a/architectures b/architectures index 35472178f8..7d01f66683 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim arm32v6 alpine3.17,alpine3.18 -arm32v7 alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim -arm64v8 alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim +arm32v7 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm64v8 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim i386 alpine3.17,alpine3.18 -ppc64le alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.17,alpine3.18,bullseye,bullseye-slim,buster,buster-slim +ppc64le alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index 5bcef7797e..c166905165 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist -default_variant bullseye +default_variant bookworm alpine_version 3.18 -debian_versions stretch bullseye buster +debian_versions bookworm bullseye buster diff --git a/update.sh b/update.sh index 799f4afce2..9a321c800c 100755 --- a/update.sh +++ b/update.sh @@ -16,7 +16,7 @@ function usage() { - update.sh 8,10 # Update all variants of version 8 and 10 - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn - update.sh 8 buster-slim,buster # Update only buster's slim and buster variants for version 8 - - update.sh -s 8 stretch # Update only stretch variant for version 8, skip updating Alpine and Yarn + - update.sh -s 8 bullseye # Update only bullseye variant for version 8, skip updating Alpine and Yarn - update.sh . alpine # Update the alpine variant for all versions OPTIONS: diff --git a/versions.json b/versions.json index 3842481493..1f275a3fd8 100644 --- a/versions.json +++ b/versions.json @@ -6,7 +6,7 @@ "end": "2026-04-30", "codename": "", "alpine-default": "alpine3.18", - "debian-default": "bullseye", + "debian-default": "bookworm", "variants": { "alpine3.17": [ "amd64", @@ -24,6 +24,20 @@ "ppc64le", "s390x" ], + "bookworm": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "bullseye": [ "amd64", "arm32v7", @@ -57,7 +71,7 @@ "end": "2025-04-30", "codename": "hydrogen", "alpine-default": "alpine3.18", - "debian-default": "bullseye", + "debian-default": "bookworm", "variants": { "alpine3.17": [ "amd64", @@ -75,6 +89,20 @@ "ppc64le", "s390x" ], + "bookworm": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "bullseye": [ "amd64", "arm32v7", @@ -126,6 +154,20 @@ "ppc64le", "s390x" ], + "bookworm": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], "bullseye": [ "amd64", "arm32v7", From 6db34246b9688f6a4b877f3ffb4cc8a422cecace Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 11 Jun 2023 10:08:21 +0300 Subject: [PATCH 653/818] README: Fix broken link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 628409b584..61749a2efb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Node.js -[![dockeri.co](http://dockeri.co/image/_/node)](https://registry.hub.docker.com/_/node/) +[![dockeri.co](https://dockerico.blankenship.io/image/node)](https://hub.docker.com/_/node) [![GitHub issues](https://img.shields.io/github/issues/nodejs/docker-node.svg "GitHub issues")](https://github.com/nodejs/docker-node) [![GitHub stars](https://img.shields.io/github/stars/nodejs/docker-node.svg "GitHub stars")](https://github.com/nodejs/docker-node) From d9c01570c0f72a40cbaece69c378d7c8187c56e9 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 21 Jun 2023 09:20:11 +0000 Subject: [PATCH 654/818] feat: Node.js 16.20.1, 18.16.1, 20.3.1 --- 16/alpine3.17/Dockerfile | 4 ++-- 16/alpine3.18/Dockerfile | 4 ++-- 16/bookworm-slim/Dockerfile | 2 +- 16/bookworm/Dockerfile | 2 +- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 18/alpine3.17/Dockerfile | 4 ++-- 18/alpine3.18/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile index 4b5e6bdbec..8fd2381dd8 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 16.20.0 +ENV NODE_VERSION 16.20.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="b3f80fe7d0f1af6fe25ffedc7237ca519965d08fc800eab29cf45cd5b90cdb26" \ + CHECKSUM="320cb39e6d3cab1682c6fd97ae9e4e748783143262cc6ff96c93a4f44e818404" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.18/Dockerfile b/16/alpine3.18/Dockerfile index a5f6838ee4..81f481fc01 100644 --- a/16/alpine3.18/Dockerfile +++ b/16/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 16.20.0 +ENV NODE_VERSION 16.20.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="b3f80fe7d0f1af6fe25ffedc7237ca519965d08fc800eab29cf45cd5b90cdb26" \ + CHECKSUM="320cb39e6d3cab1682c6fd97ae9e4e748783143262cc6ff96c93a4f44e818404" \ ;; \ *) ;; \ esac \ diff --git a/16/bookworm-slim/Dockerfile b/16/bookworm-slim/Dockerfile index 229f6104ca..0298c05ba1 100644 --- a/16/bookworm-slim/Dockerfile +++ b/16/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 16.20.0 +ENV NODE_VERSION 16.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile index e300c616cd..854a5293ef 100644 --- a/16/bookworm/Dockerfile +++ b/16/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 16.20.0 +ENV NODE_VERSION 16.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 04ec63109b..0ac5780fe3 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.20.0 +ENV NODE_VERSION 16.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 9bda6cd10a..0adcfce9e0 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.20.0 +ENV NODE_VERSION 16.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 280f1432f0..0244c7b03b 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.20.0 +ENV NODE_VERSION 16.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index b034997a93..abe8a3cc6d 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.20.0 +ENV NODE_VERSION 16.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 5c95e2e6ab..99efaf5098 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.16.0 +ENV NODE_VERSION 18.16.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="d093ef223708a6702db1dc591911f3b23481cb55a337df3adf80b6effaba90b2" \ + CHECKSUM="aaf8f7ad6191dd62228b16071364d900a4ac3ef65c4931bc2a11925c2f72fb83" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index c0870b3110..5a7faa335f 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.16.0 +ENV NODE_VERSION 18.16.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="d093ef223708a6702db1dc591911f3b23481cb55a337df3adf80b6effaba90b2" \ + CHECKSUM="aaf8f7ad6191dd62228b16071364d900a4ac3ef65c4931bc2a11925c2f72fb83" \ ;; \ *) ;; \ esac \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 31fd28c35a..bdcfd95c46 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.16.0 +ENV NODE_VERSION 18.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 3299cf4acf..51561a3125 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.16.0 +ENV NODE_VERSION 18.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index e2fddb5926..19d5b00556 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.16.0 +ENV NODE_VERSION 18.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 4c469d3c1b..d0cec2e57e 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.16.0 +ENV NODE_VERSION 18.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 195f5c5de1..0666c4e2bb 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.16.0 +ENV NODE_VERSION 18.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index e3de67091d..33671903ed 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.16.0 +ENV NODE_VERSION 18.16.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 36b05da343..5c58e1d30c 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.3.0 +ENV NODE_VERSION 20.3.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="f3ad9443e8d9d53bfc00ec875181e9dc2ccf86205a50fce119e0610cdba8ccf1" \ + CHECKSUM="7317d150f4c37570f2c8967492f58e0dcc65487548eb59f6e7ec80deb12a5a23" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index b163c1dab8..78993738f9 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.3.0 +ENV NODE_VERSION 20.3.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="f3ad9443e8d9d53bfc00ec875181e9dc2ccf86205a50fce119e0610cdba8ccf1" \ + CHECKSUM="7317d150f4c37570f2c8967492f58e0dcc65487548eb59f6e7ec80deb12a5a23" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 4c80425cfb..442c3d4122 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.3.0 +ENV NODE_VERSION 20.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 8b02c7536c..018be487b9 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.3.0 +ENV NODE_VERSION 20.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 62bae64f82..266dda4a97 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.3.0 +ENV NODE_VERSION 20.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 91c4d80ca2..456c1d0e93 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.3.0 +ENV NODE_VERSION 20.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 44223b0791..7fc30e7ae1 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.3.0 +ENV NODE_VERSION 20.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 429256c888..b617aa3e9e 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.3.0 +ENV NODE_VERSION 20.3.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From cfff93f2d62adbf04629cea8dbc8f6c5700351f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 07:57:14 +0000 Subject: [PATCH 655/818] chore(deps): bump tj-actions/changed-files from 35 to 37 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 35 to 37. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v35...v37) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index dc3db2b929..999af6663f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v35 + uses: tj-actions/changed-files@v37 with: json: true json_raw_format: true From a9702c9a6111be461c356b8b61983d568bd39414 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Tue, 27 Jun 2023 13:52:25 -0700 Subject: [PATCH 656/818] Update ldd|awk to account for Bookworm's merged /usr --- 16/bookworm-slim/Dockerfile | 4 ++-- 16/bullseye-slim/Dockerfile | 4 ++-- 16/buster-slim/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 4 ++-- 18/bullseye-slim/Dockerfile | 4 ++-- 18/buster-slim/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 4 ++-- 20/bullseye-slim/Dockerfile | 4 ++-- 20/buster-slim/Dockerfile | 4 ++-- Dockerfile-slim.template | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/16/bookworm-slim/Dockerfile b/16/bookworm-slim/Dockerfile index 0298c05ba1..c712cd2519 100644 --- a/16/bookworm-slim/Dockerfile +++ b/16/bookworm-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index 0ac5780fe3..edb62a430f 100644 --- a/16/bullseye-slim/Dockerfile +++ b/16/bullseye-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index 0244c7b03b..b7cf81f82c 100644 --- a/16/buster-slim/Dockerfile +++ b/16/buster-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index bdcfd95c46..21a17f28de 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 19d5b00556..6bc737afda 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/bullseye-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 0666c4e2bb..c1a06e5418 100644 --- a/18/buster-slim/Dockerfile +++ b/18/buster-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 442c3d4122..eba8396881 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 266dda4a97..e6aff3c7d4 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/bullseye-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 7fc30e7ae1..e42dda8eae 100644 --- a/20/buster-slim/Dockerfile +++ b/20/buster-slim/Dockerfile @@ -42,7 +42,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -77,7 +77,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index aa7816d963..21d8de9e1e 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -33,7 +33,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ @@ -68,7 +68,7 @@ RUN set -ex \ && apt-mark auto '.*' > /dev/null \ && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ | sort -u \ | xargs -r dpkg-query --search \ | cut -d: -f1 \ From 31bc0387d4a2eea9e9fee4d5b1f8dca0e0596dca Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 7 Jul 2023 11:48:09 +0000 Subject: [PATCH 657/818] feat: Node.js 20.4.0 --- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 5c58e1d30c..06f1334c10 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.3.1 +ENV NODE_VERSION 20.4.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="7317d150f4c37570f2c8967492f58e0dcc65487548eb59f6e7ec80deb12a5a23" \ + CHECKSUM="5c2d38503139d70de2ccd01842a6efc873b3c21b1db2be6009bf57c94e35ba9e" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 78993738f9..f66665210f 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.3.1 +ENV NODE_VERSION 20.4.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="7317d150f4c37570f2c8967492f58e0dcc65487548eb59f6e7ec80deb12a5a23" \ + CHECKSUM="5c2d38503139d70de2ccd01842a6efc873b3c21b1db2be6009bf57c94e35ba9e" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index eba8396881..28a43a7c91 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.3.1 +ENV NODE_VERSION 20.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 018be487b9..b4f3615371 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.3.1 +ENV NODE_VERSION 20.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index e6aff3c7d4..d8442d6e07 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.3.1 +ENV NODE_VERSION 20.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 456c1d0e93..97e4347ae8 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.3.1 +ENV NODE_VERSION 20.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index e42dda8eae..1f4f68a186 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.3.1 +ENV NODE_VERSION 20.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index b617aa3e9e..43581a1cf3 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.3.1 +ENV NODE_VERSION 20.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 57d57436d1cb175e5f7c8d501df5893556c886c2 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 19 Jul 2023 00:56:54 +0000 Subject: [PATCH 658/818] feat: Node.js 18.17.0 --- 18/alpine3.17/Dockerfile | 4 ++-- 18/alpine3.18/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 99efaf5098..af256ab606 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.16.1 +ENV NODE_VERSION 18.17.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="aaf8f7ad6191dd62228b16071364d900a4ac3ef65c4931bc2a11925c2f72fb83" \ + CHECKSUM="8797aaf41e34e7c145ebc33b3184e5757696dc7b2eb2d0f7ec5dc748efab2297" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 5a7faa335f..4fb63df09a 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.16.1 +ENV NODE_VERSION 18.17.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="aaf8f7ad6191dd62228b16071364d900a4ac3ef65c4931bc2a11925c2f72fb83" \ + CHECKSUM="8797aaf41e34e7c145ebc33b3184e5757696dc7b2eb2d0f7ec5dc748efab2297" \ ;; \ *) ;; \ esac \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 21a17f28de..1b95bbebf5 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.16.1 +ENV NODE_VERSION 18.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 51561a3125..dec479cfcb 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.16.1 +ENV NODE_VERSION 18.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 6bc737afda..ec9cb0e4d4 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.16.1 +ENV NODE_VERSION 18.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index d0cec2e57e..3170d26f22 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.16.1 +ENV NODE_VERSION 18.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index c1a06e5418..df26a053d2 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.16.1 +ENV NODE_VERSION 18.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 33671903ed..ba36086364 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.16.1 +ENV NODE_VERSION 18.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 4f443163bbf6e3c2e1436c2835829bccc2267c61 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 21 Jul 2023 19:03:53 +0000 Subject: [PATCH 659/818] feat: Node.js 20.5.0 --- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 06f1334c10..ff5ab90f85 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.4.0 +ENV NODE_VERSION 20.5.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="5c2d38503139d70de2ccd01842a6efc873b3c21b1db2be6009bf57c94e35ba9e" \ + CHECKSUM="92e5f55bad8f89b633bfe48956406415f89c3a45323830363c297fc5e5ab10a0" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index f66665210f..91e60d3979 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.4.0 +ENV NODE_VERSION 20.5.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="5c2d38503139d70de2ccd01842a6efc873b3c21b1db2be6009bf57c94e35ba9e" \ + CHECKSUM="92e5f55bad8f89b633bfe48956406415f89c3a45323830363c297fc5e5ab10a0" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 28a43a7c91..2815295efb 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.4.0 +ENV NODE_VERSION 20.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index b4f3615371..506a886128 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.4.0 +ENV NODE_VERSION 20.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index d8442d6e07..215d6e56a9 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.4.0 +ENV NODE_VERSION 20.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 97e4347ae8..4a3636cf19 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.4.0 +ENV NODE_VERSION 20.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 1f4f68a186..bfb517520b 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.4.0 +ENV NODE_VERSION 20.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 43581a1cf3..11a0042934 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.4.0 +ENV NODE_VERSION 20.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6c73d9ddb6a9b36c4a97f86bd3a50e15b2fe6bb4 Mon Sep 17 00:00:00 2001 From: Conicaw Date: Wed, 9 Aug 2023 18:12:23 -0500 Subject: [PATCH 660/818] ci(build-test): don't escape json for changed-files action Pass escape_json: false to have changed-files not escape the json it returns since we directly use it as arguments without any parsing. --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 999af6663f..08d9b63aa2 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -29,7 +29,7 @@ jobs: uses: tj-actions/changed-files@v37 with: json: true - json_raw_format: true + escape_json: false - name: Generate testing matrix uses: actions/github-script@v6 From 1a4f3d2d0c914b4468ba9675cedf70a2f4f0f82d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 10 Aug 2023 09:45:03 +0000 Subject: [PATCH 661/818] feat: Node.js --- 16/alpine3.17/Dockerfile | 4 ++-- 16/alpine3.18/Dockerfile | 4 ++-- 16/bookworm-slim/Dockerfile | 2 +- 16/bookworm/Dockerfile | 2 +- 16/bullseye-slim/Dockerfile | 2 +- 16/bullseye/Dockerfile | 2 +- 16/buster-slim/Dockerfile | 2 +- 16/buster/Dockerfile | 2 +- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile index 8fd2381dd8..c5ca1106c9 100644 --- a/16/alpine3.17/Dockerfile +++ b/16/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 16.20.1 +ENV NODE_VERSION 16.20.2 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="320cb39e6d3cab1682c6fd97ae9e4e748783143262cc6ff96c93a4f44e818404" \ + CHECKSUM="d2df78a192bd78b958e19a77821916a38def5e9e46c0c9a0989fdf5eb6c14a7e" \ ;; \ *) ;; \ esac \ diff --git a/16/alpine3.18/Dockerfile b/16/alpine3.18/Dockerfile index 81f481fc01..443036c698 100644 --- a/16/alpine3.18/Dockerfile +++ b/16/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 16.20.1 +ENV NODE_VERSION 16.20.2 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="320cb39e6d3cab1682c6fd97ae9e4e748783143262cc6ff96c93a4f44e818404" \ + CHECKSUM="d2df78a192bd78b958e19a77821916a38def5e9e46c0c9a0989fdf5eb6c14a7e" \ ;; \ *) ;; \ esac \ diff --git a/16/bookworm-slim/Dockerfile b/16/bookworm-slim/Dockerfile index c712cd2519..c27c59527f 100644 --- a/16/bookworm-slim/Dockerfile +++ b/16/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 16.20.1 +ENV NODE_VERSION 16.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile index 854a5293ef..93b539f640 100644 --- a/16/bookworm/Dockerfile +++ b/16/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 16.20.1 +ENV NODE_VERSION 16.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile index edb62a430f..8d07782d47 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.20.1 +ENV NODE_VERSION 16.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile index 0adcfce9e0..3da01c1282 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.20.1 +ENV NODE_VERSION 16.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile index b7cf81f82c..996d92ea89 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.20.1 +ENV NODE_VERSION 16.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile index abe8a3cc6d..be8dd69746 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.20.1 +ENV NODE_VERSION 16.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 1b95bbebf5..55f7bd603f 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.17.0 +ENV NODE_VERSION 18.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index dec479cfcb..ec2275884e 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.17.0 +ENV NODE_VERSION 18.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index ec9cb0e4d4..12efee3992 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.17.0 +ENV NODE_VERSION 18.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 3170d26f22..e3996e6769 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.17.0 +ENV NODE_VERSION 18.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index df26a053d2..1adb30ab5a 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.17.0 +ENV NODE_VERSION 18.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index ba36086364..49e3a03fd7 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.17.0 +ENV NODE_VERSION 18.17.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index ff5ab90f85..021914666a 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.5.0 +ENV NODE_VERSION 20.5.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="92e5f55bad8f89b633bfe48956406415f89c3a45323830363c297fc5e5ab10a0" \ + CHECKSUM="423f32ff3c8abc720afb54d768b8b9201903135c799003813550ba84ab22bf66" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 91e60d3979..69a6eac1fd 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.5.0 +ENV NODE_VERSION 20.5.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="92e5f55bad8f89b633bfe48956406415f89c3a45323830363c297fc5e5ab10a0" \ + CHECKSUM="423f32ff3c8abc720afb54d768b8b9201903135c799003813550ba84ab22bf66" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 2815295efb..886dcb4ab6 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.5.0 +ENV NODE_VERSION 20.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 506a886128..6fdca8bb91 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.5.0 +ENV NODE_VERSION 20.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 215d6e56a9..df1d38f99f 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.5.0 +ENV NODE_VERSION 20.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 4a3636cf19..fe4b376d22 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.5.0 +ENV NODE_VERSION 20.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index bfb517520b..e98f9bf0aa 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.5.0 +ENV NODE_VERSION 20.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 11a0042934..b31db29ca0 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.5.0 +ENV NODE_VERSION 20.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8c40f63ed62b2fde41903b097391b74f15f32cea Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 10 Aug 2023 11:18:53 +0000 Subject: [PATCH 662/818] feat: Node.js 18.17.1 --- 18/alpine3.17/Dockerfile | 4 ++-- 18/alpine3.18/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index af256ab606..43a100ff76 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.17.0 +ENV NODE_VERSION 18.17.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="8797aaf41e34e7c145ebc33b3184e5757696dc7b2eb2d0f7ec5dc748efab2297" \ + CHECKSUM="a67f0b51f0951382709abb5613ee577b5af648752ed363ae32411214041f4e73" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 4fb63df09a..1aca0cd5d8 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.17.0 +ENV NODE_VERSION 18.17.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="8797aaf41e34e7c145ebc33b3184e5757696dc7b2eb2d0f7ec5dc748efab2297" \ + CHECKSUM="a67f0b51f0951382709abb5613ee577b5af648752ed363ae32411214041f4e73" \ ;; \ *) ;; \ esac \ From d61d2d8a40aa75f5e3e935e5b5f73c868f8457c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Wed, 16 Aug 2023 11:00:53 +0200 Subject: [PATCH 663/818] keys: add key for @ulisesgascon --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index 811410fc5f..d7f6b3537e 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -8,3 +8,4 @@ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C 108F52B48DB57BB0CC439B2997B01419BD92F80A +A363A499291CBBC940DD62E41F10027AF002F8B0 From 85d34a8b5bebc29d27e62af95e0b827de84b9a1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 07:18:19 +0000 Subject: [PATCH 664/818] chore(deps): bump tj-actions/changed-files from 37 to 38 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 37 to 38. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v37...v38) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 08d9b63aa2..a54050bcce 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v37 + uses: tj-actions/changed-files@v38 with: json: true escape_json: false From 9d803e372efa567d0673d022db279af556237bbf Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 4 Sep 2023 23:53:29 -0400 Subject: [PATCH 665/818] feat: Node.js 20.6.0 --- 20/alpine3.17/Dockerfile | 5 +++-- 20/alpine3.18/Dockerfile | 5 +++-- 20/bookworm-slim/Dockerfile | 3 ++- 20/bookworm/Dockerfile | 3 ++- 20/bullseye-slim/Dockerfile | 3 ++- 20/bullseye/Dockerfile | 3 ++- 20/buster-slim/Dockerfile | 3 ++- 20/buster/Dockerfile | 3 ++- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 021914666a..62851c9d2d 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.5.1 +ENV NODE_VERSION 20.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="423f32ff3c8abc720afb54d768b8b9201903135c799003813550ba84ab22bf66" \ + CHECKSUM="20676ba829e95e56c2264fc3a281ed62786e0030e86efc20bc413375a1e806ad" \ ;; \ *) ;; \ esac \ @@ -48,6 +48,7 @@ RUN addgroup -g 1000 node \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 69a6eac1fd..add8389a64 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.5.1 +ENV NODE_VERSION 20.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="423f32ff3c8abc720afb54d768b8b9201903135c799003813550ba84ab22bf66" \ + CHECKSUM="20676ba829e95e56c2264fc3a281ed62786e0030e86efc20bc413375a1e806ad" \ ;; \ *) ;; \ esac \ @@ -48,6 +48,7 @@ RUN addgroup -g 1000 node \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 886dcb4ab6..8f608eee53 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.5.1 +ENV NODE_VERSION 20.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -30,6 +30,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 6fdca8bb91..06b940e076 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.5.1 +ENV NODE_VERSION 20.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index df1d38f99f..ec8329c9b6 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.5.1 +ENV NODE_VERSION 20.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -30,6 +30,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index fe4b376d22..2e43066c46 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.5.1 +ENV NODE_VERSION 20.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index e98f9bf0aa..e38819f3f4 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.5.1 +ENV NODE_VERSION 20.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -30,6 +30,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index b31db29ca0..ddd6095df2 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.5.1 +ENV NODE_VERSION 20.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From c17837cfd164d6ac864cdd484baca47ed78c7ecf Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 4 Sep 2023 23:58:57 -0400 Subject: [PATCH 666/818] chore: Remove EOL Node 16 --- 16/alpine3.17/Dockerfile | 105 -------------------------- 16/alpine3.17/docker-entrypoint.sh | 11 --- 16/alpine3.18/Dockerfile | 105 -------------------------- 16/alpine3.18/docker-entrypoint.sh | 11 --- 16/bookworm-slim/Dockerfile | 93 ----------------------- 16/bookworm-slim/docker-entrypoint.sh | 11 --- 16/bookworm/Dockerfile | 69 ----------------- 16/bookworm/docker-entrypoint.sh | 11 --- 16/bullseye-slim/Dockerfile | 93 ----------------------- 16/bullseye-slim/docker-entrypoint.sh | 11 --- 16/bullseye/Dockerfile | 69 ----------------- 16/bullseye/docker-entrypoint.sh | 11 --- 16/buster-slim/Dockerfile | 93 ----------------------- 16/buster-slim/docker-entrypoint.sh | 11 --- 16/buster/Dockerfile | 69 ----------------- 16/buster/docker-entrypoint.sh | 11 --- versions.json | 65 ---------------- 17 files changed, 849 deletions(-) delete mode 100644 16/alpine3.17/Dockerfile delete mode 100755 16/alpine3.17/docker-entrypoint.sh delete mode 100644 16/alpine3.18/Dockerfile delete mode 100755 16/alpine3.18/docker-entrypoint.sh delete mode 100644 16/bookworm-slim/Dockerfile delete mode 100755 16/bookworm-slim/docker-entrypoint.sh delete mode 100644 16/bookworm/Dockerfile delete mode 100755 16/bookworm/docker-entrypoint.sh delete mode 100644 16/bullseye-slim/Dockerfile delete mode 100755 16/bullseye-slim/docker-entrypoint.sh delete mode 100644 16/bullseye/Dockerfile delete mode 100755 16/bullseye/docker-entrypoint.sh delete mode 100644 16/buster-slim/Dockerfile delete mode 100755 16/buster-slim/docker-entrypoint.sh delete mode 100644 16/buster/Dockerfile delete mode 100755 16/buster/docker-entrypoint.sh diff --git a/16/alpine3.17/Dockerfile b/16/alpine3.17/Dockerfile deleted file mode 100644 index c5ca1106c9..0000000000 --- a/16/alpine3.17/Dockerfile +++ /dev/null @@ -1,105 +0,0 @@ -FROM alpine:3.17 - -ENV NODE_VERSION 16.20.2 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="d2df78a192bd78b958e19a77821916a38def5e9e46c0c9a0989fdf5eb6c14a7e" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/alpine3.17/docker-entrypoint.sh b/16/alpine3.17/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/alpine3.17/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/alpine3.18/Dockerfile b/16/alpine3.18/Dockerfile deleted file mode 100644 index 443036c698..0000000000 --- a/16/alpine3.18/Dockerfile +++ /dev/null @@ -1,105 +0,0 @@ -FROM alpine:3.18 - -ENV NODE_VERSION 16.20.2 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="d2df78a192bd78b958e19a77821916a38def5e9e46c0c9a0989fdf5eb6c14a7e" \ - ;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/alpine3.18/docker-entrypoint.sh b/16/alpine3.18/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/alpine3.18/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/bookworm-slim/Dockerfile b/16/bookworm-slim/Dockerfile deleted file mode 100644 index c27c59527f..0000000000 --- a/16/bookworm-slim/Dockerfile +++ /dev/null @@ -1,93 +0,0 @@ -FROM debian:bookworm-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.20.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/bookworm-slim/docker-entrypoint.sh b/16/bookworm-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/bookworm-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/bookworm/Dockerfile b/16/bookworm/Dockerfile deleted file mode 100644 index 93b539f640..0000000000 --- a/16/bookworm/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM buildpack-deps:bookworm - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.20.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/bookworm/docker-entrypoint.sh b/16/bookworm/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/bookworm/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/bullseye-slim/Dockerfile b/16/bullseye-slim/Dockerfile deleted file mode 100644 index 8d07782d47..0000000000 --- a/16/bullseye-slim/Dockerfile +++ /dev/null @@ -1,93 +0,0 @@ -FROM debian:bullseye-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.20.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/bullseye-slim/docker-entrypoint.sh b/16/bullseye-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/bullseye-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/bullseye/Dockerfile b/16/bullseye/Dockerfile deleted file mode 100644 index 3da01c1282..0000000000 --- a/16/bullseye/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM buildpack-deps:bullseye - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.20.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/bullseye/docker-entrypoint.sh b/16/bullseye/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/bullseye/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/buster-slim/Dockerfile b/16/buster-slim/Dockerfile deleted file mode 100644 index 996d92ea89..0000000000 --- a/16/buster-slim/Dockerfile +++ /dev/null @@ -1,93 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.20.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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 \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/buster-slim/docker-entrypoint.sh b/16/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/16/buster/Dockerfile b/16/buster/Dockerfile deleted file mode 100644 index be8dd69746..0000000000 --- a/16/buster/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 16.20.2 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - 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 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/16/buster/docker-entrypoint.sh b/16/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/16/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index 1f275a3fd8..699e090d2b 100644 --- a/versions.json +++ b/versions.json @@ -128,70 +128,5 @@ "arm64v8" ] } - }, - "16": { - "start": "2021-04-20", - "lts": "2021-10-26", - "maintenance": "2022-10-18", - "end": "2024-04-30", - "codename": "gallium", - "alpine-default": "alpine3.18", - "debian-default": "buster", - "variants": { - "alpine3.17": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.18": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bookworm": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bookworm-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8" - ] - } } } From 34a8bf0ce5431ec2c05bd13788d3c988bf15659b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 07:14:15 +0000 Subject: [PATCH 667/818] chore(deps): bump tj-actions/changed-files from 38 to 39 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 38 to 39. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v38...v39) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a54050bcce..d078e9781a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: json: true escape_json: false From aaae8ece6853807dd8ada820d05500f25a974254 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 07:14:18 +0000 Subject: [PATCH 668/818] chore(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/build-test.yml | 4 ++-- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- .github/workflows/missing-checksum.yml | 2 +- .github/workflows/official-pr.yml | 4 ++-- .github/workflows/shfmt.yml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 224dd3090a..5a1f13f8d5 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -10,7 +10,7 @@ jobs: if: github.repository_owner == 'nodejs' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run automation script uses: actions/github-script@v6 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a54050bcce..740d144d0e 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Calculate file differences id: diff @@ -66,7 +66,7 @@ jobs: script: return "${{ matrix.version }}".split('.')[0] - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build image uses: docker/build-push-action@v4 diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 334eba263e..3a33227174 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -14,7 +14,7 @@ jobs: name: Doc TOC Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: node-version: 'lts/*' diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 50f78bfdbc..58cd23d3b2 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -9,7 +9,7 @@ jobs: eclint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: node-version: 'lts/*' diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 29230d41a1..b2867eb2d5 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -13,7 +13,7 @@ jobs: markdown-link-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: node-version: 'lts/*' diff --git a/.github/workflows/missing-checksum.yml b/.github/workflows/missing-checksum.yml index 95b2af526a..70637004f1 100644 --- a/.github/workflows/missing-checksum.yml +++ b/.github/workflows/missing-checksum.yml @@ -13,7 +13,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Count number of Alpine Dockersfiles without CHECKSUM run: | diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index c9bad613a3..fd8c509ba0 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -19,14 +19,14 @@ jobs: steps: - name: Checkout the docker-node repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: docker-node ref: ${{ github.base_ref }} fetch-depth: 50 - name: Checkout the official-images repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: official-images repository: docker-library/official-images diff --git a/.github/workflows/shfmt.yml b/.github/workflows/shfmt.yml index 7b8d4b76cf..6fc68a571c 100644 --- a/.github/workflows/shfmt.yml +++ b/.github/workflows/shfmt.yml @@ -12,12 +12,12 @@ jobs: shfmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: docker run -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . - run: git diff --color --exit-code shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: shellcheck *.sh From 1a2a796a6fecfda1f23f24551f2937f6b61830c6 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 8 Sep 2023 23:24:03 -0400 Subject: [PATCH 669/818] feat: Node.js 20.6.1 --- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 62851c9d2d..bf7fe6cea4 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.6.0 +ENV NODE_VERSION 20.6.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="20676ba829e95e56c2264fc3a281ed62786e0030e86efc20bc413375a1e806ad" \ + CHECKSUM="65a650b8ae115cb660850c6cf99ed55e572f7c4dce1b9f36492d4870e792beb4" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index add8389a64..610319f859 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.6.0 +ENV NODE_VERSION 20.6.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="20676ba829e95e56c2264fc3a281ed62786e0030e86efc20bc413375a1e806ad" \ + CHECKSUM="65a650b8ae115cb660850c6cf99ed55e572f7c4dce1b9f36492d4870e792beb4" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 8f608eee53..aa2e99d938 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.6.0 +ENV NODE_VERSION 20.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 06b940e076..1b97e8a9fa 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.6.0 +ENV NODE_VERSION 20.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index ec8329c9b6..89f7b9072f 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.6.0 +ENV NODE_VERSION 20.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 2e43066c46..1594c99866 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.6.0 +ENV NODE_VERSION 20.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index e38819f3f4..9b9c158949 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.6.0 +ENV NODE_VERSION 20.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index ddd6095df2..48c8eb563b 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.6.0 +ENV NODE_VERSION 20.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From a157e80dddeb00f621d918106302f7dfad163037 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 07:50:39 +0000 Subject: [PATCH 670/818] chore(deps): bump docker/build-push-action from 4 to 5 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 08aedd5c07..d73e6400ab 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@v4 - name: Build image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: push: false load: true From e6f6cb357f0815040d00b733adc2423ddeb0f982 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 25 Apr 2023 12:28:52 -0400 Subject: [PATCH 671/818] feat: drop arm32v7 buster for Node 20 --- versions.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/versions.json b/versions.json index 699e090d2b..393968afff 100644 --- a/versions.json +++ b/versions.json @@ -54,12 +54,10 @@ ], "buster": [ "amd64", - "arm32v7", "arm64v8" ], "buster-slim": [ "amd64", - "arm32v7", "arm64v8" ] } From ce9bfa282b62ece538fef25b954ade4401a7c8c7 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 19 Sep 2023 06:33:42 +0000 Subject: [PATCH 672/818] feat: Node.js 18.18.0, 20.7.0 --- 18/alpine3.17/Dockerfile | 5 +++-- 18/alpine3.18/Dockerfile | 5 +++-- 18/bookworm-slim/Dockerfile | 3 ++- 18/bookworm/Dockerfile | 3 ++- 18/bullseye-slim/Dockerfile | 3 ++- 18/bullseye/Dockerfile | 3 ++- 18/buster-slim/Dockerfile | 3 ++- 18/buster/Dockerfile | 3 ++- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 16 files changed, 28 insertions(+), 20 deletions(-) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 43a100ff76..b0839cef75 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.17.1 +ENV NODE_VERSION 18.18.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="a67f0b51f0951382709abb5613ee577b5af648752ed363ae32411214041f4e73" \ + CHECKSUM="1159f06f17f7c2e582c77e4602249b440bd1daab667694063f1d61fb621aa65c" \ ;; \ *) ;; \ esac \ @@ -48,6 +48,7 @@ RUN addgroup -g 1000 node \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 1aca0cd5d8..0cf5405e0c 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.17.1 +ENV NODE_VERSION 18.18.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="a67f0b51f0951382709abb5613ee577b5af648752ed363ae32411214041f4e73" \ + CHECKSUM="1159f06f17f7c2e582c77e4602249b440bd1daab667694063f1d61fb621aa65c" \ ;; \ *) ;; \ esac \ @@ -48,6 +48,7 @@ RUN addgroup -g 1000 node \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 55f7bd603f..3525959bd7 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.17.1 +ENV NODE_VERSION 18.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -30,6 +30,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index ec2275884e..3cc58d7de3 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.17.1 +ENV NODE_VERSION 18.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 12efee3992..cb08c06e82 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.17.1 +ENV NODE_VERSION 18.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -30,6 +30,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index e3996e6769..08baf972cf 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.17.1 +ENV NODE_VERSION 18.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 1adb30ab5a..40f18cf4fa 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.17.1 +ENV NODE_VERSION 18.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -30,6 +30,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 49e3a03fd7..46d3f9ddb8 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.17.1 +ENV NODE_VERSION 18.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -28,6 +28,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index bf7fe6cea4..2cfb4b1151 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.6.1 +ENV NODE_VERSION 20.7.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="65a650b8ae115cb660850c6cf99ed55e572f7c4dce1b9f36492d4870e792beb4" \ + CHECKSUM="b2513e8c5a6abf793b7e810f644dbe698ee51c1feb84912707c70a308021c171" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 610319f859..a5749cfb8f 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.6.1 +ENV NODE_VERSION 20.7.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="65a650b8ae115cb660850c6cf99ed55e572f7c4dce1b9f36492d4870e792beb4" \ + CHECKSUM="b2513e8c5a6abf793b7e810f644dbe698ee51c1feb84912707c70a308021c171" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index aa2e99d938..9f7b716e40 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.6.1 +ENV NODE_VERSION 20.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 1b97e8a9fa..cc678db7e7 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.6.1 +ENV NODE_VERSION 20.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 89f7b9072f..ddb2708e8d 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.6.1 +ENV NODE_VERSION 20.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 1594c99866..88e70e8b4c 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.6.1 +ENV NODE_VERSION 20.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 9b9c158949..cf602e5340 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.6.1 +ENV NODE_VERSION 20.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 48c8eb563b..88b6ec743f 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.6.1 +ENV NODE_VERSION 20.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 7bf57de587ce3e911bbdd2b03a488d1c8c9c3e68 Mon Sep 17 00:00:00 2001 From: Yehonatan Zecharia Date: Sun, 25 Jun 2023 18:12:37 +0300 Subject: [PATCH 673/818] Remove unused OpenSSL headers to save ~34MB of image size --- Dockerfile-slim.template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 21d8de9e1e..f0fdec65c1 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 0.0.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -31,6 +31,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ From 924180b5b542e723b61a790141412869cc57bb4b Mon Sep 17 00:00:00 2001 From: Yehonatan Zecharia Date: Sun, 25 Jun 2023 18:12:44 +0300 Subject: [PATCH 674/818] Run ./update.sh --- 18/bookworm-slim/Dockerfile | 16 +++++++++------- 18/bullseye-slim/Dockerfile | 16 +++++++++------- 18/buster-slim/Dockerfile | 16 +++++++++------- 20/bookworm-slim/Dockerfile | 16 +++++++++------- 20/bullseye-slim/Dockerfile | 16 +++++++++------- 20/buster-slim/Dockerfile | 16 +++++++++------- 6 files changed, 54 insertions(+), 42 deletions(-) diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 3525959bd7..7eb67c0893 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 18.18.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -41,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index cb08c06e82..6b0b3ed7fa 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/bullseye-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 18.18.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -41,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 40f18cf4fa..16452ad8aa 100644 --- a/18/buster-slim/Dockerfile +++ b/18/buster-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 18.18.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -41,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 9f7b716e40..7fc9491129 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 20.7.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -41,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index ddb2708e8d..76f6bd5f00 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/bullseye-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 20.7.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -41,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index cf602e5340..9a51e63bb6 100644 --- a/20/buster-slim/Dockerfile +++ b/20/buster-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 20.7.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -41,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ From 230b9852645e170167a2aac1cfa246d069c23cc3 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 29 Sep 2023 09:33:10 +0000 Subject: [PATCH 675/818] feat: Node.js 20.8.0 --- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 2cfb4b1151..23b4a323e8 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.7.0 +ENV NODE_VERSION 20.8.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="b2513e8c5a6abf793b7e810f644dbe698ee51c1feb84912707c70a308021c171" \ + CHECKSUM="31e1b7e011ede1a6de2e1185228cfbd3a2ea4c5639ae6bc3e4357efa69f7a2b2" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index a5749cfb8f..cfdf82d034 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.7.0 +ENV NODE_VERSION 20.8.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="b2513e8c5a6abf793b7e810f644dbe698ee51c1feb84912707c70a308021c171" \ + CHECKSUM="31e1b7e011ede1a6de2e1185228cfbd3a2ea4c5639ae6bc3e4357efa69f7a2b2" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 9f7b716e40..c62c9a26b0 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.7.0 +ENV NODE_VERSION 20.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index cc678db7e7..92a07ed8fb 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.7.0 +ENV NODE_VERSION 20.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index ddb2708e8d..c0596e0b9b 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.7.0 +ENV NODE_VERSION 20.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 88e70e8b4c..7e6086c53c 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.7.0 +ENV NODE_VERSION 20.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index cf602e5340..183584c563 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.7.0 +ENV NODE_VERSION 20.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 88b6ec743f..d8e531c394 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.7.0 +ENV NODE_VERSION 20.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 72958a9258fdd3cbdd390b64d11f1d1f60071cb3 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 17 May 2023 13:45:31 +0200 Subject: [PATCH 676/818] Use temporary GNUPGHOME directory when using gpg in image builds --- 18/bookworm-slim/Dockerfile | 9 +++++++++ 18/bookworm/Dockerfile | 8 ++++++++ 18/bullseye-slim/Dockerfile | 9 +++++++++ 18/bullseye/Dockerfile | 8 ++++++++ 18/buster-slim/Dockerfile | 9 +++++++++ 18/buster/Dockerfile | 8 ++++++++ 20/bookworm-slim/Dockerfile | 9 +++++++++ 20/bookworm/Dockerfile | 8 ++++++++ 20/bullseye-slim/Dockerfile | 9 +++++++++ 20/bullseye/Dockerfile | 8 ++++++++ 20/buster-slim/Dockerfile | 9 +++++++++ 20/buster/Dockerfile | 8 ++++++++ Dockerfile-debian.template | 8 ++++++++ Dockerfile-slim.template | 9 +++++++++ 14 files changed, 119 insertions(+) diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 3525959bd7..bbad02ab7b 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 3cc58d7de3..1ef3738749 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index cb08c06e82..45cdf6a2fb 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/bullseye-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 08baf972cf..7ed0f42364 100644 --- a/18/bullseye/Dockerfile +++ b/18/bullseye/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 40f18cf4fa..0ef5073d31 100644 --- a/18/buster-slim/Dockerfile +++ b/18/buster-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 46d3f9ddb8..be572a35a1 100644 --- a/18/buster/Dockerfile +++ b/18/buster/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index c62c9a26b0..c7e2f95c8f 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 92a07ed8fb..07e1aacd0f 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index c0596e0b9b..395fd78026 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/bullseye-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 7e6086c53c..a134eb1e27 100644 --- a/20/bullseye/Dockerfile +++ b/20/bullseye/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 183584c563..f40e790f5d 100644 --- a/20/buster-slim/Dockerfile +++ b/20/buster-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index d8e531c394..5ac59945b9 100644 --- a/20/buster/Dockerfile +++ b/20/buster/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 17962567fa..fc05538071 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -26,6 +28,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -37,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 0.0.0 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ "${YARN_KEYS[@]}" ; do \ @@ -46,6 +52,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 21d8de9e1e..68da00d4c1 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ "${NODE_KEYS[@]}" ; do \ @@ -28,6 +31,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -51,6 +56,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ "${YARN_KEYS[@]}" ; do \ @@ -60,6 +67,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ From 5803273beedb045fe6ad8be0a8fdab94681d2b2c Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 11 Oct 2023 18:04:32 +0000 Subject: [PATCH 677/818] feat: Node.js 18.18.1 --- 18/alpine3.17/Dockerfile | 4 ++-- 18/alpine3.18/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index b0839cef75..d5ed8ae7d8 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.18.0 +ENV NODE_VERSION 18.18.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="1159f06f17f7c2e582c77e4602249b440bd1daab667694063f1d61fb621aa65c" \ + CHECKSUM="a204e380b2bf5386b7a0142b8fbb6bf99e2ec74a66b48c59fc47869ef0602e8e" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 0cf5405e0c..ad54143628 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.18.0 +ENV NODE_VERSION 18.18.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="1159f06f17f7c2e582c77e4602249b440bd1daab667694063f1d61fb621aa65c" \ + CHECKSUM="a204e380b2bf5386b7a0142b8fbb6bf99e2ec74a66b48c59fc47869ef0602e8e" \ ;; \ *) ;; \ esac \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 3525959bd7..9f2e57b0bf 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.18.0 +ENV NODE_VERSION 18.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 3cc58d7de3..0c0158f5e5 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.18.0 +ENV NODE_VERSION 18.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index cb08c06e82..a124ba7477 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.18.0 +ENV NODE_VERSION 18.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 08baf972cf..5d1b031bff 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.18.0 +ENV NODE_VERSION 18.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 40f18cf4fa..3b3b3a3c27 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.18.0 +ENV NODE_VERSION 18.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 46d3f9ddb8..63ebc2bec3 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.18.0 +ENV NODE_VERSION 18.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6c20762ebfb6ab35c874c4fe540a55ab8fd6c49d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Sat, 14 Oct 2023 08:33:16 +0000 Subject: [PATCH 678/818] feat: Node.js 18.18.2, 20.8.1 --- 18/alpine3.17/Dockerfile | 4 ++-- 18/alpine3.18/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index d5ed8ae7d8..471ed14ce0 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.18.1 +ENV NODE_VERSION 18.18.2 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="a204e380b2bf5386b7a0142b8fbb6bf99e2ec74a66b48c59fc47869ef0602e8e" \ + CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" \ ;; \ *) ;; \ esac \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index ad54143628..b1fbc44266 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.18.1 +ENV NODE_VERSION 18.18.2 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="a204e380b2bf5386b7a0142b8fbb6bf99e2ec74a66b48c59fc47869ef0602e8e" \ + CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" \ ;; \ *) ;; \ esac \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 9f2e57b0bf..30f0536584 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.18.1 +ENV NODE_VERSION 18.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 0c0158f5e5..e9c84e1975 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.18.1 +ENV NODE_VERSION 18.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index a124ba7477..1a3f6341a1 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.18.1 +ENV NODE_VERSION 18.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 5d1b031bff..ead159ebeb 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.18.1 +ENV NODE_VERSION 18.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 3b3b3a3c27..56598f88af 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.18.1 +ENV NODE_VERSION 18.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 63ebc2bec3..1973045d2f 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.18.1 +ENV NODE_VERSION 18.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index 23b4a323e8..e735694f27 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.8.0 +ENV NODE_VERSION 20.8.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="31e1b7e011ede1a6de2e1185228cfbd3a2ea4c5639ae6bc3e4357efa69f7a2b2" \ + CHECKSUM="15a1120027d72ff891cd9ce6e6705181cd589e609f94aca362f2d32fc9871a14" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index cfdf82d034..91edd35c7e 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.8.0 +ENV NODE_VERSION 20.8.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="31e1b7e011ede1a6de2e1185228cfbd3a2ea4c5639ae6bc3e4357efa69f7a2b2" \ + CHECKSUM="15a1120027d72ff891cd9ce6e6705181cd589e609f94aca362f2d32fc9871a14" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index c62c9a26b0..179eb55891 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.8.0 +ENV NODE_VERSION 20.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 92a07ed8fb..060cf432e2 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.8.0 +ENV NODE_VERSION 20.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index c0596e0b9b..b877b366e9 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.8.0 +ENV NODE_VERSION 20.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 7e6086c53c..25a2e47196 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.8.0 +ENV NODE_VERSION 20.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 183584c563..1a2f2aefdd 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.8.0 +ENV NODE_VERSION 20.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index d8e531c394..a4e8536404 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.8.0 +ENV NODE_VERSION 20.8.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c3b405debb5e5153fc2ace45097e2d7a4e0fa20f Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 18 Oct 2023 09:41:00 +0200 Subject: [PATCH 679/818] feat: Node.js 21.0.0 --- 21/alpine3.17/Dockerfile | 106 ++++++++++++++++++++++++++ 21/alpine3.17/docker-entrypoint.sh | 11 +++ 21/alpine3.18/Dockerfile | 106 ++++++++++++++++++++++++++ 21/alpine3.18/docker-entrypoint.sh | 11 +++ 21/bookworm-slim/Dockerfile | 94 +++++++++++++++++++++++ 21/bookworm-slim/docker-entrypoint.sh | 11 +++ 21/bookworm/Dockerfile | 70 +++++++++++++++++ 21/bookworm/docker-entrypoint.sh | 11 +++ 21/bullseye-slim/Dockerfile | 94 +++++++++++++++++++++++ 21/bullseye-slim/docker-entrypoint.sh | 11 +++ 21/bullseye/Dockerfile | 70 +++++++++++++++++ 21/bullseye/docker-entrypoint.sh | 11 +++ 21/buster-slim/Dockerfile | 94 +++++++++++++++++++++++ 21/buster-slim/docker-entrypoint.sh | 11 +++ 21/buster/Dockerfile | 70 +++++++++++++++++ 21/buster/docker-entrypoint.sh | 11 +++ versions.json | 65 ++++++++++++++++ 17 files changed, 857 insertions(+) create mode 100644 21/alpine3.17/Dockerfile create mode 100755 21/alpine3.17/docker-entrypoint.sh create mode 100644 21/alpine3.18/Dockerfile create mode 100755 21/alpine3.18/docker-entrypoint.sh create mode 100644 21/bookworm-slim/Dockerfile create mode 100755 21/bookworm-slim/docker-entrypoint.sh create mode 100644 21/bookworm/Dockerfile create mode 100755 21/bookworm/docker-entrypoint.sh create mode 100644 21/bullseye-slim/Dockerfile create mode 100755 21/bullseye-slim/docker-entrypoint.sh create mode 100644 21/bullseye/Dockerfile create mode 100755 21/bullseye/docker-entrypoint.sh create mode 100644 21/buster-slim/Dockerfile create mode 100755 21/buster-slim/docker-entrypoint.sh create mode 100644 21/buster/Dockerfile create mode 100755 21/buster/docker-entrypoint.sh diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.17/Dockerfile new file mode 100644 index 0000000000..c1c7476a8e --- /dev/null +++ b/21/alpine3.17/Dockerfile @@ -0,0 +1,106 @@ +FROM alpine:3.17 + +ENV NODE_VERSION 21.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="d69d70fb49598ab5bb18b270fd828d524f52b703a39ae15d5d24193baf93c3bf" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/alpine3.17/docker-entrypoint.sh b/21/alpine3.17/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/alpine3.17/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile new file mode 100644 index 0000000000..b44d2f9c4b --- /dev/null +++ b/21/alpine3.18/Dockerfile @@ -0,0 +1,106 @@ +FROM alpine:3.18 + +ENV NODE_VERSION 21.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) \ + ARCH='x64' \ + CHECKSUM="d69d70fb49598ab5bb18b270fd828d524f52b703a39ae15d5d24193baf93c3bf" \ + ;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/alpine3.18/docker-entrypoint.sh b/21/alpine3.18/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/alpine3.18/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile new file mode 100644 index 0000000000..5af62b77c1 --- /dev/null +++ b/21/bookworm-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:bookworm-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 21.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/bookworm-slim/docker-entrypoint.sh b/21/bookworm-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/bookworm-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile new file mode 100644 index 0000000000..aebdd13046 --- /dev/null +++ b/21/bookworm/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:bookworm + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 21.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/bookworm/docker-entrypoint.sh b/21/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/bookworm/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..a311321559 --- /dev/null +++ b/21/bullseye-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 21.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/bullseye-slim/docker-entrypoint.sh b/21/bullseye-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile new file mode 100644 index 0000000000..92a4432ae3 --- /dev/null +++ b/21/bullseye/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 21.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/bullseye/docker-entrypoint.sh b/21/bullseye/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/bullseye/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/21/buster-slim/Dockerfile b/21/buster-slim/Dockerfile new file mode 100644 index 0000000000..931bef1605 --- /dev/null +++ b/21/buster-slim/Dockerfile @@ -0,0 +1,94 @@ +FROM debian:buster-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 21.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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 \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/buster-slim/docker-entrypoint.sh b/21/buster-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/buster-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/21/buster/Dockerfile b/21/buster/Dockerfile new file mode 100644 index 0000000000..aaec834959 --- /dev/null +++ b/21/buster/Dockerfile @@ -0,0 +1,70 @@ +FROM buildpack-deps:buster + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 21.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + 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 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/21/buster/docker-entrypoint.sh b/21/buster/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/21/buster/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index 699e090d2b..57413da78f 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,69 @@ { + "21": { + "start": "2023-10-17", + "lts": "", + "maintenance": "2024-04-01", + "end": "2024-06-01", + "codename": "", + "alpine-default": "alpine3.18", + "debian-default": "bookworm", + "variants": { + "alpine3.17": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.18": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "buster": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "buster-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, "20": { "start": "2023-04-18", "lts": "2023-10-24", From 593dd75b22cbaf846e223b9b48736fc7b7b27871 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 18 Oct 2023 13:00:24 +0200 Subject: [PATCH 680/818] Update v21 templates to include changes from #1901 --- 21/bookworm-slim/Dockerfile | 9 +++++++++ 21/bookworm/Dockerfile | 8 ++++++++ 21/bullseye-slim/Dockerfile | 9 +++++++++ 21/bullseye/Dockerfile | 8 ++++++++ 21/buster-slim/Dockerfile | 9 +++++++++ 21/buster/Dockerfile | 8 ++++++++ 6 files changed, 51 insertions(+) diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 5af62b77c1..a52c0e3e9b 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index aebdd13046..e151aaa300 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index a311321559..5b7df1bd4e 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/bullseye-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 92a4432ae3..785016edaf 100644 --- a/21/bullseye/Dockerfile +++ b/21/bullseye/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/21/buster-slim/Dockerfile b/21/buster-slim/Dockerfile index 931bef1605..0494261edf 100644 --- a/21/buster-slim/Dockerfile +++ b/21/buster-slim/Dockerfile @@ -19,6 +19,9 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # libatomic1 for arm && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ @@ -38,6 +41,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -61,6 +66,8 @@ RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -70,6 +77,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ diff --git a/21/buster/Dockerfile b/21/buster/Dockerfile index aaec834959..bfaae1c2aa 100644 --- a/21/buster/Dockerfile +++ b/21/buster/Dockerfile @@ -15,6 +15,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ i386) ARCH='x86';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ @@ -36,6 +38,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && 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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ @@ -47,6 +51,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ ENV YARN_VERSION 1.22.19 RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ && for key in \ 6A010C5166006599AA17F08146C2130DFD2497F5 \ ; do \ @@ -56,6 +62,8 @@ RUN set -ex \ && 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" \ && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ && mkdir -p /opt \ && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ From 1e7c74a2145982e410ced8be413da8b14ae0ee7e Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 18 Oct 2023 13:01:36 +0200 Subject: [PATCH 681/818] Do not make buster variant for v21 image --- 21/buster-slim/Dockerfile | 103 ---------------------------- 21/buster-slim/docker-entrypoint.sh | 11 --- 21/buster/Dockerfile | 78 --------------------- 21/buster/docker-entrypoint.sh | 11 --- versions.json | 10 --- 5 files changed, 213 deletions(-) delete mode 100644 21/buster-slim/Dockerfile delete mode 100755 21/buster-slim/docker-entrypoint.sh delete mode 100644 21/buster/Dockerfile delete mode 100755 21/buster/docker-entrypoint.sh diff --git a/21/buster-slim/Dockerfile b/21/buster-slim/Dockerfile deleted file mode 100644 index 0494261edf..0000000000 --- a/21/buster-slim/Dockerfile +++ /dev/null @@ -1,103 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 21.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/buster-slim/docker-entrypoint.sh b/21/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/21/buster/Dockerfile b/21/buster/Dockerfile deleted file mode 100644 index bfaae1c2aa..0000000000 --- a/21/buster/Dockerfile +++ /dev/null @@ -1,78 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 21.0.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/buster/docker-entrypoint.sh b/21/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index 57413da78f..9e1f78452c 100644 --- a/versions.json +++ b/versions.json @@ -51,16 +51,6 @@ "arm64v8", "ppc64le", "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8" ] } }, From a090a371cd07499b50c077335d2f004083a55ae4 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 19 Oct 2023 15:55:06 -0400 Subject: [PATCH 682/818] Fix the gap between the start of a maintenance period for an LTS and the new LTS start --- stackbrew.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackbrew.js b/stackbrew.js index 9142b3b91d..58bec1daaf 100755 --- a/stackbrew.js +++ b/stackbrew.js @@ -38,7 +38,7 @@ for (version of versions) { let maintenance = new Date(`${config[version].maintenance}T00:00:00.00`).getTime(); let isCurrent = foundCurrent ? false : isNaN(lts) || lts >= now; foundCurrent = isCurrent || foundCurrent; - let isLTS = foundLTS ? false : (maintenance >= now) && (now >= lts); + let isLTS = foundLTS ? false : (now >= lts); foundLTS = isLTS || foundLTS; let codename = config[version].codename let defaultAlpine = config[version]['alpine-default'] From f044847f3fa97647f44bdaf557590002ce394266 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 07:02:56 +0000 Subject: [PATCH 683/818] chore(deps): bump actions/setup-node from 3 to 4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 3a33227174..07789f625a 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 58cd23d3b2..a7690eb12f 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index b2867eb2d5..84c6a8c7e9 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' - name: Install markdown-link-check From 62c2e3cfb17ba8d9167b0daebbff9ea5ecaef6e4 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 25 Oct 2023 04:04:28 +0000 Subject: [PATCH 684/818] feat: Node.js 20.9.0, 21.1.0 --- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 21/alpine3.17/Dockerfile | 4 ++-- 21/alpine3.18/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index e735694f27..dc46a75281 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.8.1 +ENV NODE_VERSION 20.9.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="15a1120027d72ff891cd9ce6e6705181cd589e609f94aca362f2d32fc9871a14" \ + CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" \ ;; \ *) ;; \ esac \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 91edd35c7e..011f5222ac 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.8.1 +ENV NODE_VERSION 20.9.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="15a1120027d72ff891cd9ce6e6705181cd589e609f94aca362f2d32fc9871a14" \ + CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" \ ;; \ *) ;; \ esac \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index cc065f9ca8..36bf144e75 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.8.1 +ENV NODE_VERSION 20.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 3ed4dfbf50..35734a5d10 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.8.1 +ENV NODE_VERSION 20.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 65f20f2d71..0780ada029 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.8.1 +ENV NODE_VERSION 20.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index a45fd96dde..16906793bd 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.8.1 +ENV NODE_VERSION 20.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 331f1d40e2..e21ea76e75 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.8.1 +ENV NODE_VERSION 20.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 6a36b441de..59c62adb4c 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.8.1 +ENV NODE_VERSION 20.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.17/Dockerfile index c1c7476a8e..54ba8fdfaf 100644 --- a/21/alpine3.17/Dockerfile +++ b/21/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 21.0.0 +ENV NODE_VERSION 21.1.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="d69d70fb49598ab5bb18b270fd828d524f52b703a39ae15d5d24193baf93c3bf" \ + CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" \ ;; \ *) ;; \ esac \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index b44d2f9c4b..bb468226ec 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.0.0 +ENV NODE_VERSION 21.1.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="d69d70fb49598ab5bb18b270fd828d524f52b703a39ae15d5d24193baf93c3bf" \ + CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" \ ;; \ *) ;; \ esac \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index a52c0e3e9b..d97fba8c3b 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.0.0 +ENV NODE_VERSION 21.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index e151aaa300..70aab56a13 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.0.0 +ENV NODE_VERSION 21.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 5b7df1bd4e..15b1d6424a 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.0.0 +ENV NODE_VERSION 21.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 785016edaf..41a8240750 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.0.0 +ENV NODE_VERSION 21.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From bfcdac3f9e677f7c76efbc5db96447adda894afc Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 25 Oct 2023 02:15:03 -0400 Subject: [PATCH 685/818] feat: Nodejs 20 LTS Iron codename --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 9e1f78452c..29687e36b2 100644 --- a/versions.json +++ b/versions.json @@ -59,7 +59,7 @@ "lts": "2023-10-24", "maintenance": "2024-10-22", "end": "2026-04-30", - "codename": "", + "codename": "iron", "alpine-default": "alpine3.18", "debian-default": "bookworm", "variants": { From 98279e9517405bb3593fd3983b7196b108617a71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 07:35:43 +0000 Subject: [PATCH 686/818] chore(deps): bump tj-actions/changed-files from 39 to 40 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 39 to 40. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v39...v40) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index d73e6400ab..0fb616b57b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v39 + uses: tj-actions/changed-files@v40 with: json: true escape_json: false From f4d5953516e5394914a15dba22936b10e64eff77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Silva?= <66086228+otaviosilva22@users.noreply.github.com> Date: Thu, 9 Nov 2023 11:29:17 -0300 Subject: [PATCH 687/818] Update README.md Update docker-compose example with ports usage, because is better and more cofiable than expose usage --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 83f9bdb0fb..092bee8039 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,8 @@ services: - NODE_ENV=production volumes: - ./:/home/node/app - expose: - - "8081" + ports: + - "8081": "8081" command: "npm start" ``` From 390cb75062f874e0f931c3f462552ceff97fbf2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Silva?= <66086228+otaviosilva22@users.noreply.github.com> Date: Thu, 9 Nov 2023 12:41:06 -0300 Subject: [PATCH 688/818] docs: update README.md to include ports Update readme.md include both method to expose the container. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 092bee8039..d4125f2440 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,9 @@ services: - NODE_ENV=production volumes: - ./:/home/node/app - ports: + expose: + - "8081" + ports: #use if it is necessary to expose the container to the host machine - "8081": "8081" command: "npm start" ``` From 5500ec831a9453a62c7221ab3c3a58958c4f7274 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 07:38:14 +0000 Subject: [PATCH 689/818] chore(deps): bump actions/github-script from 6 to 7 Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/build-test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 5a1f13f8d5..bc16f76f34 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - name: Run automation script - uses: actions/github-script@v6 + uses: actions/github-script@v7 id: updt with: result-encoding: string diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 0fb616b57b..ffcf701b7f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,7 +32,7 @@ jobs: escape_json: false - name: Generate testing matrix - uses: actions/github-script@v6 + uses: actions/github-script@v7 id: generator with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -59,7 +59,7 @@ jobs: steps: - name: Get short node version - uses: actions/github-script@v6 + uses: actions/github-script@v7 id: short-version with: result-encoding: string From 6759947fb34581bd9d144f0e9921d027b181435a Mon Sep 17 00:00:00 2001 From: Yehonatan Zecharia Date: Tue, 14 Nov 2023 10:12:31 +0200 Subject: [PATCH 690/818] Run update.sh for slim images (not ran after previous PR) --- 21/bookworm-slim/Dockerfile | 16 +++++++++------- 21/bullseye-slim/Dockerfile | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index d97fba8c3b..a20290975f 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 21.1.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -46,6 +46,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 15b1d6424a..7395249cf5 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/bullseye-slim/Dockerfile @@ -5,14 +5,14 @@ RUN groupadd --gid 1000 node \ ENV NODE_VERSION 21.1.0 -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ *) echo "unsupported architecture"; exit 1 ;; \ esac \ && set -ex \ @@ -46,6 +46,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apt-mark auto '.*' > /dev/null \ && find /usr/local -type f -executable -exec ldd '{}' ';' \ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ From 89afeedf0542d995e7be5e99e30719fc7b2f512d Mon Sep 17 00:00:00 2001 From: Yehonatan Zecharia Date: Tue, 14 Nov 2023 10:12:57 +0200 Subject: [PATCH 691/818] Remove unused openssl headers from alpine images as well --- Dockerfile-alpine.template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 553da29bf6..5da2bb7c64 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -8,12 +8,14 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM=CHECKSUM_x64 \ - ;; \ + x86_64) ARCH='x64' CHECKSUM=CHECKSUM_x64 OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ @@ -60,6 +62,8 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apk del .build-deps \ # smoke tests && node --version \ From e148eb79f51510593647e6a10574f8931bf16384 Mon Sep 17 00:00:00 2001 From: Yehonatan Zecharia Date: Tue, 14 Nov 2023 10:13:11 +0200 Subject: [PATCH 692/818] Run ./update.sh --- 18/alpine3.17/Dockerfile | 14 +++++++++----- 18/alpine3.18/Dockerfile | 14 +++++++++----- 20/alpine3.17/Dockerfile | 14 +++++++++----- 20/alpine3.18/Dockerfile | 14 +++++++++----- 21/alpine3.17/Dockerfile | 14 +++++++++----- 21/alpine3.18/Dockerfile | 14 +++++++++----- 6 files changed, 54 insertions(+), 30 deletions(-) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 471ed14ce0..55bf05a977 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -8,12 +8,14 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" \ - ;; \ + x86_64) ARCH='x64' CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ @@ -70,6 +72,8 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apk del .build-deps \ # smoke tests && node --version \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index b1fbc44266..669e2db841 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -8,12 +8,14 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" \ - ;; \ + x86_64) ARCH='x64' CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ @@ -70,6 +72,8 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apk del .build-deps \ # smoke tests && node --version \ diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index dc46a75281..aab1625b76 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -8,12 +8,14 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" \ - ;; \ + x86_64) ARCH='x64' CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ @@ -70,6 +72,8 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apk del .build-deps \ # smoke tests && node --version \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 011f5222ac..49271e365c 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -8,12 +8,14 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" \ - ;; \ + x86_64) ARCH='x64' CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ @@ -70,6 +72,8 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apk del .build-deps \ # smoke tests && node --version \ diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.17/Dockerfile index 54ba8fdfaf..1c8cfcb1ca 100644 --- a/21/alpine3.17/Dockerfile +++ b/21/alpine3.17/Dockerfile @@ -8,12 +8,14 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" \ - ;; \ + x86_64) ARCH='x64' CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ @@ -70,6 +72,8 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apk del .build-deps \ # smoke tests && node --version \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index bb468226ec..56920426c8 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -8,12 +8,14 @@ RUN addgroup -g 1000 node \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ curl \ - && ARCH= && alpineArch="$(apk --print-arch)" \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) \ - ARCH='x64' \ - CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" \ - ;; \ + x86_64) ARCH='x64' CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ *) ;; \ esac \ && if [ -n "${CHECKSUM}" ]; then \ @@ -70,6 +72,8 @@ RUN addgroup -g 1000 node \ && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ fi \ && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ && apk del .build-deps \ # smoke tests && node --version \ From ed83529ea65cfbeadda161ee501b4cf83444aa2d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 15 Nov 2023 20:33:13 +0000 Subject: [PATCH 693/818] feat: Node.js 21.2.0 --- 21/alpine3.17/Dockerfile | 4 ++-- 21/alpine3.18/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.17/Dockerfile index 1c8cfcb1ca..ad82a3078b 100644 --- a/21/alpine3.17/Dockerfile +++ b/21/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 21.1.0 +ENV NODE_VERSION 21.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e5d565cc86043625e3c15b8377e9c68b939beed323759a5bd6a69ee87f888ac8" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 56920426c8..1af6e7ab06 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.1.0 +ENV NODE_VERSION 21.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="987dac3f01a5b81bd3674edcf984161ed145995f2f11e7b5893249af5fa237e8" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e5d565cc86043625e3c15b8377e9c68b939beed323759a5bd6a69ee87f888ac8" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index a20290975f..91cb5c4c4e 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.1.0 +ENV NODE_VERSION 21.2.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 70aab56a13..1b22bfa3a6 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.1.0 +ENV NODE_VERSION 21.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 7395249cf5..5dde765487 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.1.0 +ENV NODE_VERSION 21.2.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 41a8240750..e8970d60a8 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.1.0 +ENV NODE_VERSION 21.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b98d3851de95667630dba35299898eeae1dd30e6 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 22 Nov 2023 21:33:26 +0000 Subject: [PATCH 694/818] feat: Node.js 20.10.0 --- 20/alpine3.17/Dockerfile | 4 ++-- 20/alpine3.18/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.17/Dockerfile index aab1625b76..0b75caf782 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 20.9.0 +ENV NODE_VERSION 20.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2c654df3615ed02dc1994f58bdbc6b5cd37fdc01f695188388326f12c753f01b" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 49271e365c..2739465202 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.9.0 +ENV NODE_VERSION 20.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a3cfa3eabebdcbb677256227b9ff44dad88bff37fd9de886077d670dc8fddb6b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2c654df3615ed02dc1994f58bdbc6b5cd37fdc01f695188388326f12c753f01b" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index e9990a7e6f..b8e187c19a 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.9.0 +ENV NODE_VERSION 20.10.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 35734a5d10..1f781d144b 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.9.0 +ENV NODE_VERSION 20.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 48851a93a4..a63c253ac2 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.9.0 +ENV NODE_VERSION 20.10.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 16906793bd..bd993ab1e3 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.9.0 +ENV NODE_VERSION 20.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 4a6ec90a3a..3aeb580cea 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.9.0 +ENV NODE_VERSION 20.10.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 59c62adb4c..f663ae8c19 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.9.0 +ENV NODE_VERSION 20.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f7676d2b8c17cbf25daed9cf8637abc9b4bd2e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Silva?= <66086228+otaviosilva22@users.noreply.github.com> Date: Thu, 30 Nov 2023 15:37:26 -0300 Subject: [PATCH 695/818] Update README.md add a space Co-authored-by: Peter Dave Hello --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4125f2440..73ce79566d 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ services: - ./:/home/node/app expose: - "8081" - ports: #use if it is necessary to expose the container to the host machine + ports: # use if it is necessary to expose the container to the host machine - "8081": "8081" command: "npm start" ``` From dbdbdaf1b7b7dfe71640a43053147fd00e21570b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Silva?= <66086228+otaviosilva22@users.noreply.github.com> Date: Fri, 1 Dec 2023 17:03:43 -0300 Subject: [PATCH 696/818] docs(README): link libc6-compat Broken libc6-compat link fix. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73ce79566d..478e20cd3f 100644 --- a/README.md +++ b/README.md @@ -186,7 +186,7 @@ variant is usually a very safe choice. See for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. One common issue that may arise is a missing shared library required for use of `process.dlopen`. To add the missing shared libraries -to your image, adding the [`libc6-compat`](https://pkgs.alpinelinux.org/package/edge/main/x86/libc6-compat) +to your image, adding the [`libc6-compat`](https://pkgs.alpinelinux.org/package/v3.10/main/x86_64/libc6-compat) package in your Dockerfile is recommended: `apk add --no-cache libc6-compat` To minimize image size, it's uncommon for additional related tools From f416b53801a9d49d6ce6b2c038c8bc9ed93625dd Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 1 Dec 2023 23:20:29 +0000 Subject: [PATCH 697/818] feat: Node.js 18.19.0, 21.3.0 --- 18/alpine3.17/Dockerfile | 4 ++-- 18/alpine3.18/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 21/alpine3.17/Dockerfile | 4 ++-- 21/alpine3.18/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.17/Dockerfile index 55bf05a977..09a8999203 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 18.18.2 +ENV NODE_VERSION 18.19.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="10b7b23b6b867a25f060a433b83f5c3ecb3bcf7cdba1c0ce46443065a832fd41" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 669e2db841..07310580ea 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.18.2 +ENV NODE_VERSION 18.19.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b02028add9898575516a2626a5f1a262f080291d8f253ba1fd61cedb0e476591" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="10b7b23b6b867a25f060a433b83f5c3ecb3bcf7cdba1c0ce46443065a832fd41" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index ee583e2feb..03a5a8e469 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.18.2 +ENV NODE_VERSION 18.19.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 2d97808c85..2c8db7feca 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.18.2 +ENV NODE_VERSION 18.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 1b702ae331..9f9c5f8c57 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.18.2 +ENV NODE_VERSION 18.19.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 0316628aae..b858b784e8 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.18.2 +ENV NODE_VERSION 18.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index d6a50f189d..3ce7b6c98b 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.18.2 +ENV NODE_VERSION 18.19.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 7959222daf..95836b2401 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.18.2 +ENV NODE_VERSION 18.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.17/Dockerfile index ad82a3078b..e68ed05cf4 100644 --- a/21/alpine3.17/Dockerfile +++ b/21/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 21.2.0 +ENV NODE_VERSION 21.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e5d565cc86043625e3c15b8377e9c68b939beed323759a5bd6a69ee87f888ac8" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d0b9a5cb59ddd403252235bcb4831c0ad9c5d555a018983e06eaafd9962999a1" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 1af6e7ab06..e29bbf734e 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.2.0 +ENV NODE_VERSION 21.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e5d565cc86043625e3c15b8377e9c68b939beed323759a5bd6a69ee87f888ac8" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d0b9a5cb59ddd403252235bcb4831c0ad9c5d555a018983e06eaafd9962999a1" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 91cb5c4c4e..9973ac2738 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.2.0 +ENV NODE_VERSION 21.3.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 1b22bfa3a6..7c973ba8eb 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.2.0 +ENV NODE_VERSION 21.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 5dde765487..e0cfe75166 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.2.0 +ENV NODE_VERSION 21.3.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index e8970d60a8..f145d113e2 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.2.0 +ENV NODE_VERSION 21.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 3d07b595c0bae7d2baf70bac31b09615103c7f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Silva?= <66086228+otaviosilva22@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:14:23 -0300 Subject: [PATCH 698/818] docs(README): update link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 478e20cd3f..73ce79566d 100644 --- a/README.md +++ b/README.md @@ -186,7 +186,7 @@ variant is usually a very safe choice. See for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images. One common issue that may arise is a missing shared library required for use of `process.dlopen`. To add the missing shared libraries -to your image, adding the [`libc6-compat`](https://pkgs.alpinelinux.org/package/v3.10/main/x86_64/libc6-compat) +to your image, adding the [`libc6-compat`](https://pkgs.alpinelinux.org/package/edge/main/x86/libc6-compat) package in your Dockerfile is recommended: `apk add --no-cache libc6-compat` To minimize image size, it's uncommon for additional related tools From d7c2df9571c94af0d4f4cdc1257c7efb00f6e547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Silva?= <66086228+otaviosilva22@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:00:34 -0300 Subject: [PATCH 699/818] docs(README): Add ports mapping to Docker Compose example Co-authored-by: Peter Dave Hello --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73ce79566d..b86c29ca71 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ services: expose: - "8081" ports: # use if it is necessary to expose the container to the host machine - - "8081": "8081" + - "8001:8001" command: "npm start" ``` From 6e6de6d890fce6946236cf403b0d5d5b33178e61 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 5 Dec 2023 18:22:55 +0000 Subject: [PATCH 700/818] feat: Node.js 21.4.0 --- 21/alpine3.17/Dockerfile | 4 ++-- 21/alpine3.18/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.17/Dockerfile index e68ed05cf4..cd9ada1073 100644 --- a/21/alpine3.17/Dockerfile +++ b/21/alpine3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ENV NODE_VERSION 21.3.0 +ENV NODE_VERSION 21.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="d0b9a5cb59ddd403252235bcb4831c0ad9c5d555a018983e06eaafd9962999a1" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="651a7c2631b19a0284e28e366a5ef1e1faf1e964f266714d69432be545fb2df6" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index e29bbf734e..53d5471f17 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.3.0 +ENV NODE_VERSION 21.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="d0b9a5cb59ddd403252235bcb4831c0ad9c5d555a018983e06eaafd9962999a1" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="651a7c2631b19a0284e28e366a5ef1e1faf1e964f266714d69432be545fb2df6" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 9973ac2738..7d90dd5f0b 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.3.0 +ENV NODE_VERSION 21.4.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 7c973ba8eb..7f78664404 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.3.0 +ENV NODE_VERSION 21.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index e0cfe75166..5bc66421c9 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.3.0 +ENV NODE_VERSION 21.4.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index f145d113e2..9d5c754a4a 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.3.0 +ENV NODE_VERSION 21.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 3546ba31aa42db88ddc1f0765fd343383f441428 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 10:59:20 +0100 Subject: [PATCH 701/818] Add Alpine 3.19 and drop 3.17 to architectures and versions.json Also set 3.19 as new default --- architectures | 14 +++++++------- config | 2 +- versions.json | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/architectures b/architectures index 7d01f66683..1ef81e6bb2 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -arm32v6 alpine3.17,alpine3.18 -arm32v7 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -arm64v8 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -i386 alpine3.17,alpine3.18 -ppc64le alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm32v6 alpine3.18,alpine3.19 +arm32v7 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm64v8 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +i386 alpine3.18,alpine3.19 +ppc64le alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index c166905165..7c216ecdee 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant bookworm -alpine_version 3.18 +alpine_version 3.19 debian_versions bookworm bullseye buster diff --git a/versions.json b/versions.json index 29687e36b2..15e45e5f37 100644 --- a/versions.json +++ b/versions.json @@ -5,10 +5,10 @@ "maintenance": "2024-04-01", "end": "2024-06-01", "codename": "", - "alpine-default": "alpine3.18", + "alpine-default": "alpine3.19", "debian-default": "bookworm", "variants": { - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -16,7 +16,7 @@ "ppc64le", "s390x" ], - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -60,10 +60,10 @@ "maintenance": "2024-10-22", "end": "2026-04-30", "codename": "iron", - "alpine-default": "alpine3.18", + "alpine-default": "alpine3.19", "debian-default": "bookworm", "variants": { - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -71,7 +71,7 @@ "ppc64le", "s390x" ], - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -125,10 +125,10 @@ "maintenance": "2023-10-18", "end": "2025-04-30", "codename": "hydrogen", - "alpine-default": "alpine3.18", + "alpine-default": "alpine3.19", "debian-default": "bookworm", "variants": { - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -136,7 +136,7 @@ "ppc64le", "s390x" ], - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", From 5bb305299145aa996bd3e0a701e5a3c3d587ad82 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 10:59:38 +0100 Subject: [PATCH 702/818] Update templates to add Alpine 3.19 and drop 3.17 --- 18/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 18/{alpine3.17 => alpine3.19}/docker-entrypoint.sh | 0 20/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 20/{alpine3.17 => alpine3.19}/docker-entrypoint.sh | 0 21/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 21/{alpine3.17 => alpine3.19}/docker-entrypoint.sh | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename 18/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 18/{alpine3.17 => alpine3.19}/docker-entrypoint.sh (100%) rename 20/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 20/{alpine3.17 => alpine3.19}/docker-entrypoint.sh (100%) rename 21/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 21/{alpine3.17 => alpine3.19}/docker-entrypoint.sh (100%) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.19/Dockerfile similarity index 99% rename from 18/alpine3.17/Dockerfile rename to 18/alpine3.19/Dockerfile index 09a8999203..dbf0731639 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.19 ENV NODE_VERSION 18.19.0 diff --git a/18/alpine3.17/docker-entrypoint.sh b/18/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 18/alpine3.17/docker-entrypoint.sh rename to 18/alpine3.19/docker-entrypoint.sh diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.19/Dockerfile similarity index 99% rename from 20/alpine3.17/Dockerfile rename to 20/alpine3.19/Dockerfile index 0b75caf782..e70d6a1b18 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.19 ENV NODE_VERSION 20.10.0 diff --git a/20/alpine3.17/docker-entrypoint.sh b/20/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 20/alpine3.17/docker-entrypoint.sh rename to 20/alpine3.19/docker-entrypoint.sh diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.19/Dockerfile similarity index 99% rename from 21/alpine3.17/Dockerfile rename to 21/alpine3.19/Dockerfile index cd9ada1073..1d16c5c5dc 100644 --- a/21/alpine3.17/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.19 ENV NODE_VERSION 21.4.0 diff --git a/21/alpine3.17/docker-entrypoint.sh b/21/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 21/alpine3.17/docker-entrypoint.sh rename to 21/alpine3.19/docker-entrypoint.sh From 9ee59bf646e8be3ff6ae849e8119312f198be55c Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 20 Dec 2023 03:47:54 +0000 Subject: [PATCH 703/818] feat: Node.js 21.5.0 --- 21/alpine3.18/Dockerfile | 4 ++-- 21/alpine3.19/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 53d5471f17..f3b3f924d8 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.4.0 +ENV NODE_VERSION 21.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="651a7c2631b19a0284e28e366a5ef1e1faf1e964f266714d69432be545fb2df6" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2c1625cac330b8174dd01470fb3beb6097e8846b44bb4b9ad1f0dd19aab1a29f" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 1d16c5c5dc..9fb75ba090 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.4.0 +ENV NODE_VERSION 21.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="651a7c2631b19a0284e28e366a5ef1e1faf1e964f266714d69432be545fb2df6" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2c1625cac330b8174dd01470fb3beb6097e8846b44bb4b9ad1f0dd19aab1a29f" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 7d90dd5f0b..5e5f352c49 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.4.0 +ENV NODE_VERSION 21.5.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 7f78664404..5815f840c6 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.4.0 +ENV NODE_VERSION 21.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 5bc66421c9..f49940f870 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.4.0 +ENV NODE_VERSION 21.5.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 9d5c754a4a..bb95c144cf 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.4.0 +ENV NODE_VERSION 21.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 67ca2c4390926d3b67ae937c2b178727bf9350da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 07:43:34 +0000 Subject: [PATCH 704/818] chore(deps): bump tj-actions/changed-files from 40 to 41 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v40...v41) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index ffcf701b7f..0b39b2fded 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v40 + uses: tj-actions/changed-files@v41 with: json: true escape_json: false From ab5769dc69feb4007d9aafb03316ea0e3edb4227 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 10 Jan 2024 20:48:18 +0000 Subject: [PATCH 705/818] feat: Node.js 20.11.0 --- 20/alpine3.18/Dockerfile | 4 ++-- 20/alpine3.19/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 2739465202..deae76b2ed 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.10.0 +ENV NODE_VERSION 20.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="2c654df3615ed02dc1994f58bdbc6b5cd37fdc01f695188388326f12c753f01b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a8bec39586538896715be7a2ca7ef08727a58ad94d25876c5db11cafacff4c37" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index e70d6a1b18..36665248f0 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.10.0 +ENV NODE_VERSION 20.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="2c654df3615ed02dc1994f58bdbc6b5cd37fdc01f695188388326f12c753f01b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a8bec39586538896715be7a2ca7ef08727a58ad94d25876c5db11cafacff4c37" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index b8e187c19a..28beee5477 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.10.0 +ENV NODE_VERSION 20.11.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 1f781d144b..472b77454b 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.10.0 +ENV NODE_VERSION 20.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index a63c253ac2..fd9dda493b 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.10.0 +ENV NODE_VERSION 20.11.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index bd993ab1e3..2d586101fd 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.10.0 +ENV NODE_VERSION 20.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 3aeb580cea..165b30e785 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.10.0 +ENV NODE_VERSION 20.11.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index f663ae8c19..1c67b738bb 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.10.0 +ENV NODE_VERSION 20.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 5ce4dae24d8af4283baa45226b4de1827f128de3 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 16 Jan 2024 00:47:54 +0000 Subject: [PATCH 706/818] feat: Node.js 21.6.0 --- 21/alpine3.18/Dockerfile | 4 ++-- 21/alpine3.19/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index f3b3f924d8..9dccc6211f 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.5.0 +ENV NODE_VERSION 21.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="2c1625cac330b8174dd01470fb3beb6097e8846b44bb4b9ad1f0dd19aab1a29f" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5887d27926f1909cf109837feb330ddd315e4d477176028d4f5c6e2d94da3ca6" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 9fb75ba090..0b11c1d085 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.5.0 +ENV NODE_VERSION 21.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="2c1625cac330b8174dd01470fb3beb6097e8846b44bb4b9ad1f0dd19aab1a29f" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5887d27926f1909cf109837feb330ddd315e4d477176028d4f5c6e2d94da3ca6" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 5e5f352c49..02557c177c 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.5.0 +ENV NODE_VERSION 21.6.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 5815f840c6..5578a31f06 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.5.0 +ENV NODE_VERSION 21.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index f49940f870..83eeb7fcc4 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.5.0 +ENV NODE_VERSION 21.6.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index bb95c144cf..07daa12e04 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.5.0 +ENV NODE_VERSION 21.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From c8dabcd7b6b5dedb7e304da75d50203065add66b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 07:33:59 +0000 Subject: [PATCH 707/818] chore(deps): bump tj-actions/changed-files from 41 to 42 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 41 to 42. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v41...v42) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 0b39b2fded..e166a2a38f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v41 + uses: tj-actions/changed-files@v42 with: json: true escape_json: false From e3a10fc193a8777d8ec7d478b7850e09fc4d7a61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 07:34:39 +0000 Subject: [PATCH 708/818] chore(deps): bump peter-evans/create-or-update-comment from 3 to 4 Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 3 to 4. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v3...v4) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index fd8c509ba0..89fa631438 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -56,7 +56,7 @@ jobs: echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}" - name: Create PR comment - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 if: ${{ steps.create-pr.outputs.pull-request-url != '' }} with: issue-number: ${{ github.event.pull_request.number }} From f23e4825c88d41d6c46f9911f582ac6cc966abca Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 30 Jan 2024 09:48:08 +0000 Subject: [PATCH 709/818] feat: Node.js 21.6.1 --- 21/alpine3.18/Dockerfile | 4 ++-- 21/alpine3.19/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 9dccc6211f..8f9f25759e 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.6.0 +ENV NODE_VERSION 21.6.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5887d27926f1909cf109837feb330ddd315e4d477176028d4f5c6e2d94da3ca6" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ecfc8bb072634beb91ec53c9ef90ccbbbcc92d8260f296af7ebf61ed09f625f9" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 0b11c1d085..7aeabee03e 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.6.0 +ENV NODE_VERSION 21.6.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5887d27926f1909cf109837feb330ddd315e4d477176028d4f5c6e2d94da3ca6" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ecfc8bb072634beb91ec53c9ef90ccbbbcc92d8260f296af7ebf61ed09f625f9" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 02557c177c..e3a83c37fd 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.6.0 +ENV NODE_VERSION 21.6.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 5578a31f06..8dd4c60c1d 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.6.0 +ENV NODE_VERSION 21.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 83eeb7fcc4..d11c7e51c9 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.6.0 +ENV NODE_VERSION 21.6.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 07daa12e04..f63fafb263 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.6.0 +ENV NODE_VERSION 21.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8ad6a61032719a2d9e30c98cc9474ea2f5ddca0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:49:39 +0000 Subject: [PATCH 710/818] chore(deps): bump peter-evans/create-pull-request from 5 to 6 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/official-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index bc16f76f34..80cc3226c9 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -23,7 +23,7 @@ jobs: - name: Create update PR id: cpr - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GH_API_TOKEN }} author: "Node.js GitHub Bot " diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 89fa631438..3a577e2eb3 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -38,7 +38,7 @@ jobs: - name: Create PR in official-images id: create-pr - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GH_API_TOKEN }} push-to-fork: nodejs/official-images From b0fe827a42423e3c2ae5777b0c7e864732e078e5 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Wed, 14 Feb 2024 13:21:52 +0100 Subject: [PATCH 711/818] chore: avoid extra request when checking for MUSL builds --- build-automation.mjs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-automation.mjs b/build-automation.mjs index d294326386..9a085826bd 100644 --- a/build-automation.mjs +++ b/build-automation.mjs @@ -62,10 +62,10 @@ const checkForMuslVersionsAndSecurityReleases = async (github, versions) => { const { data: unofficialBuildsIndexText } = await github.request('https://unofficial-builds.nodejs.org/download/release/index.json'); for (let version of Object.keys(versions)) { - const { data: unofficialBuildsWebsiteText } = await github.request(`https://unofficial-builds.nodejs.org/download/release/v${versions[version].fullVersion}`); + const buildVersion = unofficialBuildsIndexText.find(indexVersion => indexVersion.version === `v${versions[version].fullVersion}`); - versions[version].muslBuildExists = unofficialBuildsWebsiteText.includes("musl"); - versions[version].isSecurityRelease = unofficialBuildsIndexText.find(indexVersion => indexVersion.version === `v${versions[version].fullVersion}`)?.security; + versions[version].muslBuildExists = buildVersion?.files.includes("linux-x64-musl") ?? false; + versions[version].isSecurityRelease = buildVersion?.security ?? false; } return versions; } catch (error) { From a54ad036b53ed4d64744aa5aba25e78be5e4e7b1 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 15 Feb 2024 19:04:07 +0000 Subject: [PATCH 712/818] feat: Node.js 18.19.1, 20.11.1, 21.6.2 --- 18/alpine3.18/Dockerfile | 4 ++-- 18/alpine3.19/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 20/alpine3.18/Dockerfile | 4 ++-- 20/alpine3.19/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 21/alpine3.18/Dockerfile | 4 ++-- 21/alpine3.19/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 07310580ea..605dd05089 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.19.0 +ENV NODE_VERSION 18.19.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="10b7b23b6b867a25f060a433b83f5c3ecb3bcf7cdba1c0ce46443065a832fd41" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="847973e34c5a579f706d9ad536ad3e35209cf4eac14ef9b88a8c842fd063c9cb" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index dbf0731639..19832cfb9a 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 18.19.0 +ENV NODE_VERSION 18.19.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="10b7b23b6b867a25f060a433b83f5c3ecb3bcf7cdba1c0ce46443065a832fd41" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="847973e34c5a579f706d9ad536ad3e35209cf4eac14ef9b88a8c842fd063c9cb" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 03a5a8e469..62fddf9a5a 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.19.0 +ENV NODE_VERSION 18.19.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 2c8db7feca..9aa47008f6 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.19.0 +ENV NODE_VERSION 18.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 9f9c5f8c57..1fbde4e16c 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.19.0 +ENV NODE_VERSION 18.19.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index b858b784e8..57dcd93585 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.19.0 +ENV NODE_VERSION 18.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 3ce7b6c98b..aa9af9c6c6 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.19.0 +ENV NODE_VERSION 18.19.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 95836b2401..43dc9f0f5e 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.19.0 +ENV NODE_VERSION 18.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index deae76b2ed..05ec754634 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.11.0 +ENV NODE_VERSION 20.11.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a8bec39586538896715be7a2ca7ef08727a58ad94d25876c5db11cafacff4c37" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5da733c21c3b51193a4fe9fc5be6cfa9a694d13b8d766eb02dbe4b8996547050" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index 36665248f0..d9ece486b4 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.11.0 +ENV NODE_VERSION 20.11.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a8bec39586538896715be7a2ca7ef08727a58ad94d25876c5db11cafacff4c37" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5da733c21c3b51193a4fe9fc5be6cfa9a694d13b8d766eb02dbe4b8996547050" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 28beee5477..4e8458e0c4 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.11.0 +ENV NODE_VERSION 20.11.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 472b77454b..7e87c1f931 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.11.0 +ENV NODE_VERSION 20.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index fd9dda493b..ca5a1c353a 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.11.0 +ENV NODE_VERSION 20.11.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 2d586101fd..e8872f2202 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.11.0 +ENV NODE_VERSION 20.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 165b30e785..d0d6ef1329 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.11.0 +ENV NODE_VERSION 20.11.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 1c67b738bb..3bd28a631a 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.11.0 +ENV NODE_VERSION 20.11.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 8f9f25759e..f8498830ad 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.6.1 +ENV NODE_VERSION 21.6.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ecfc8bb072634beb91ec53c9ef90ccbbbcc92d8260f296af7ebf61ed09f625f9" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="68ca8069f31636f361db63575b8925a239f36b903d80d3b889064dbd2724846d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 7aeabee03e..abd52136ab 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.6.1 +ENV NODE_VERSION 21.6.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ecfc8bb072634beb91ec53c9ef90ccbbbcc92d8260f296af7ebf61ed09f625f9" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="68ca8069f31636f361db63575b8925a239f36b903d80d3b889064dbd2724846d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index e3a83c37fd..01ef85b329 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.6.1 +ENV NODE_VERSION 21.6.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 8dd4c60c1d..6bc8eaff38 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.6.1 +ENV NODE_VERSION 21.6.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index d11c7e51c9..3365e0c3eb 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.6.1 +ENV NODE_VERSION 21.6.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index f63fafb263..8f44a187e9 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.6.1 +ENV NODE_VERSION 21.6.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 4a3a1bb20bab3794aff69c64d981c2b618aaf956 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 7 Mar 2024 01:41:14 +0000 Subject: [PATCH 713/818] feat: Node.js 21.7.0 --- 21/alpine3.18/Dockerfile | 4 ++-- 21/alpine3.19/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index f8498830ad..7ad61bc16d 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.6.2 +ENV NODE_VERSION 21.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="68ca8069f31636f361db63575b8925a239f36b903d80d3b889064dbd2724846d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="daaa8c4014251e70fd52603af4f724c62f19c5f7951a9fab43c16bef868870f4" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index abd52136ab..9a800ff5bc 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.6.2 +ENV NODE_VERSION 21.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="68ca8069f31636f361db63575b8925a239f36b903d80d3b889064dbd2724846d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="daaa8c4014251e70fd52603af4f724c62f19c5f7951a9fab43c16bef868870f4" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 01ef85b329..4d35e2269f 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.6.2 +ENV NODE_VERSION 21.7.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 6bc8eaff38..3a74d62620 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.6.2 +ENV NODE_VERSION 21.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 3365e0c3eb..906298d206 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.6.2 +ENV NODE_VERSION 21.7.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 8f44a187e9..f05ccd81f9 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.6.2 +ENV NODE_VERSION 21.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From d202cbe029887b12805d00fa76ca4b11950bffc6 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Sat, 9 Mar 2024 04:48:01 +0000 Subject: [PATCH 714/818] feat: Node.js 21.7.1 --- 21/alpine3.18/Dockerfile | 4 ++-- 21/alpine3.19/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 7ad61bc16d..3143aed4c1 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.7.0 +ENV NODE_VERSION 21.7.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="daaa8c4014251e70fd52603af4f724c62f19c5f7951a9fab43c16bef868870f4" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="80e5f4e1846e0d2692e58a9fc8c36dfba74d558ff02d0a53aa3bf5ba50a06778" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 9a800ff5bc..78b6c075e4 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.7.0 +ENV NODE_VERSION 21.7.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="daaa8c4014251e70fd52603af4f724c62f19c5f7951a9fab43c16bef868870f4" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="80e5f4e1846e0d2692e58a9fc8c36dfba74d558ff02d0a53aa3bf5ba50a06778" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 4d35e2269f..203ab02228 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.7.0 +ENV NODE_VERSION 21.7.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 3a74d62620..3161bda90d 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.7.0 +ENV NODE_VERSION 21.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 906298d206..0aae97bf14 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.7.0 +ENV NODE_VERSION 21.7.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index f05ccd81f9..97483fa3d5 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.7.0 +ENV NODE_VERSION 21.7.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8c766eded6033f7aa8ea0b70e6aaad7fafc3b45a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 07:13:40 +0000 Subject: [PATCH 715/818] chore(deps): bump tj-actions/changed-files from 42 to 43 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 42 to 43. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v42...v43) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index e166a2a38f..f093787c64 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v42 + uses: tj-actions/changed-files@v43 with: json: true escape_json: false From 227ac8bec7be994e70b17097f32da90802d80942 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 27 Mar 2024 03:21:05 +0000 Subject: [PATCH 716/818] feat: Node.js 18.20.0, 20.12.0 --- 18/alpine3.18/Dockerfile | 4 ++-- 18/alpine3.19/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 20/alpine3.18/Dockerfile | 4 ++-- 20/alpine3.19/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 605dd05089..6c1f26b4cf 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.19.1 +ENV NODE_VERSION 18.20.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="847973e34c5a579f706d9ad536ad3e35209cf4eac14ef9b88a8c842fd063c9cb" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d3f4b360ebaa1b7eb759416aa448568b55f604e09b5f92343a91b2d6062019d6" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index 19832cfb9a..0755bb284b 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 18.19.1 +ENV NODE_VERSION 18.20.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="847973e34c5a579f706d9ad536ad3e35209cf4eac14ef9b88a8c842fd063c9cb" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d3f4b360ebaa1b7eb759416aa448568b55f604e09b5f92343a91b2d6062019d6" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 62fddf9a5a..893a1db379 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.19.1 +ENV NODE_VERSION 18.20.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 9aa47008f6..4863ee9d9a 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.19.1 +ENV NODE_VERSION 18.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 1fbde4e16c..e2e69f816f 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.19.1 +ENV NODE_VERSION 18.20.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 57dcd93585..4a97632306 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.19.1 +ENV NODE_VERSION 18.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index aa9af9c6c6..a9839782c7 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.19.1 +ENV NODE_VERSION 18.20.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 43dc9f0f5e..7223e48721 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.19.1 +ENV NODE_VERSION 18.20.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 05ec754634..a43b46eac3 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.11.1 +ENV NODE_VERSION 20.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5da733c21c3b51193a4fe9fc5be6cfa9a694d13b8d766eb02dbe4b8996547050" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a5b000f1f3dc19c5a0ce2325130fb39c3fe76c29f24724f0b32dc0ca4e360dde" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index d9ece486b4..d256de7235 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.11.1 +ENV NODE_VERSION 20.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5da733c21c3b51193a4fe9fc5be6cfa9a694d13b8d766eb02dbe4b8996547050" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a5b000f1f3dc19c5a0ce2325130fb39c3fe76c29f24724f0b32dc0ca4e360dde" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 4e8458e0c4..ca940ed080 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.11.1 +ENV NODE_VERSION 20.12.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 7e87c1f931..1992be1333 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.11.1 +ENV NODE_VERSION 20.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index ca5a1c353a..cc00e2c465 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.11.1 +ENV NODE_VERSION 20.12.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index e8872f2202..eb9853c66a 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.11.1 +ENV NODE_VERSION 20.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index d0d6ef1329..e959a35be7 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.11.1 +ENV NODE_VERSION 20.12.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 3bd28a631a..7214defeee 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.11.1 +ENV NODE_VERSION 20.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1e555685e66cff734b5cd2cc388019d713875220 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 07:51:48 +0000 Subject: [PATCH 717/818] chore(deps): bump tj-actions/changed-files from 43 to 44 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 43 to 44. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v43...v44) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f093787c64..4b1c51ed1a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v43 + uses: tj-actions/changed-files@v44 with: json: true escape_json: false From 892f966b60df779063c2a788b7af04a52477ed43 Mon Sep 17 00:00:00 2001 From: marco-ippolito Date: Thu, 28 Mar 2024 19:39:23 +0100 Subject: [PATCH 718/818] doc: add release key for marco-ippolito --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index d7f6b3537e..b87f08dc12 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -9,3 +9,4 @@ C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C 108F52B48DB57BB0CC439B2997B01419BD92F80A A363A499291CBBC940DD62E41F10027AF002F8B0 +CC68F5A3106FF448322E48ED27F5E38D5B0A215F From 47b31096861bc6a877ae3d48aa1758d85128a011 Mon Sep 17 00:00:00 2001 From: Jana Rangasamy Date: Sat, 30 Mar 2024 13:43:02 +0530 Subject: [PATCH 719/818] docs: added punctuation --- README.md | 10 +++++----- docs/BestPractices.md | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b86c29ca71..341f6cd4ef 100644 --- a/README.md +++ b/README.md @@ -111,15 +111,15 @@ $ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app -w /usr/sr ### Verbosity -Prior to 8.7.0 and 6.11.4 the docker images overrode the default npm log -level from `warn` to `info`. However due to improvements to npm and new Docker +Prior to 8.7.0 and 6.11.4, the docker images overrode the default npm log +level from `warn` to `info`. However, due to improvements to npm and new Docker patterns (e.g. multi-stage builds) the working group reached a [consensus](https://github.com/nodejs/docker-node/issues/528) to revert the log level to npm defaults. If you need more verbose output, please use one of the following methods to change the verbosity level. #### Dockerfile -If you create your own `Dockerfile` which inherits from the `node` image you can +If you create your own `Dockerfile` which inherits from the `node` image, you can simply use `ENV` to override `NPM_CONFIG_LOGLEVEL`. ```dockerfile @@ -130,7 +130,7 @@ ENV NPM_CONFIG_LOGLEVEL info #### Docker Run -If you run the node image using `docker run` you can use the `-e` flag to +If you run the node image using `docker run`, you can use the `-e` flag to override `NPM_CONFIG_LOGLEVEL`. ```console @@ -139,7 +139,7 @@ $ docker run -e NPM_CONFIG_LOGLEVEL=info node ... #### NPM run -If you are running npm commands you can use `--loglevel` to control the +If you are running npm commands, you can use `--loglevel` to control the verbosity of the output. ```console diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 92fdc9efdb..6141a9a1d6 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -44,7 +44,7 @@ ENV PATH=$PATH:/home/node/.npm-global/bin # optionally if you want to run npm gl If you need to upgrade/downgrade `yarn` for a local install, you can do so by issuing the following commands in your `Dockerfile`: -> Note that if you create some other directory which is not a descendant one from where you ran the command, you will end up using the global (dated) version. If you wish to upgrade `yarn` globally follow the instructions in the next section. +> Note that if you create some other directory which is not a descendant one from where you ran the command, you will end up using the global (dated) version. If you wish to upgrade `yarn` globally, follow the instructions in the next section. > When following the local install instructions, due to duplicated yarn the image will end up being bigger. @@ -115,7 +115,7 @@ USER node Note that the `node` user is neither a build-time nor a run-time dependency and it can be removed or altered, as long as the functionality of the application you want to add to the container does not depend on it. -If you do not want nor need the user created in this image you can remove it with the following: +If you do not want nor need the user created in this image, you can remove it with the following: ```Dockerfile # For debian based images use: @@ -125,13 +125,13 @@ RUN userdel -r node RUN deluser --remove-home node ``` -If you need to change the uid/gid of the user you can use: +If you need to change the uid/gid of the user, you can use: ```Dockerfile RUN groupmod -g 999 node && usermod -u 999 -g 999 node ``` -If you need another name for the user (ex. `myapp`) execute: +If you need another name for the user (ex. `myapp`), execute: ```Dockerfile RUN usermod -d /home/myapp -l myapp node @@ -147,7 +147,7 @@ RUN deluser --remove-home node \ ## Memory -By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host you should limit how much memory they can consume. +By default, any Docker Container may consume as much of the hardware such as CPU and RAM. If you are running multiple containers on the same host, you should limit how much memory they can consume. ``` -m "300M" --memory-swap "1G" @@ -155,7 +155,7 @@ By default, any Docker Container may consume as much of the hardware such as CPU ## CMD -When creating an image, you can bypass the `package.json`'s `start` command and bake it directly into the image itself. First off this reduces the number of processes running inside of your container. Secondly it causes exit signals such as `SIGTERM` and `SIGINT` to be received by the Node.js process instead of npm swallowing them. +When creating an image, you can bypass the `package.json`'s `start` command and bake it directly into the image itself. First off, this reduces the number of processes running inside of your container. Secondly, it causes exit signals such as `SIGTERM` and `SIGINT` to be received by the Node.js process instead of npm swallowing them. ```Dockerfile CMD ["node","index.js"] @@ -192,7 +192,7 @@ RUN apk add --no-cache --virtual .gyp python3 make g++ \ && apk del .gyp ``` -And Here's a multistage build example +And, here's a multistage build example: ```Dockerfile FROM node:alpine as builder From 6a60b788fabfac92457f5a3eb7af1453bb3c67b9 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 4 Apr 2024 06:33:19 +0000 Subject: [PATCH 720/818] feat: Node.js 18.20.1, 20.12.1, 21.7.2 --- 18/alpine3.18/Dockerfile | 5 +++-- 18/alpine3.19/Dockerfile | 5 +++-- 18/bookworm-slim/Dockerfile | 3 ++- 18/bookworm/Dockerfile | 3 ++- 18/bullseye-slim/Dockerfile | 3 ++- 18/bullseye/Dockerfile | 3 ++- 18/buster-slim/Dockerfile | 3 ++- 18/buster/Dockerfile | 3 ++- 20/alpine3.18/Dockerfile | 5 +++-- 20/alpine3.19/Dockerfile | 5 +++-- 20/bookworm-slim/Dockerfile | 3 ++- 20/bookworm/Dockerfile | 3 ++- 20/bullseye-slim/Dockerfile | 3 ++- 20/bullseye/Dockerfile | 3 ++- 20/buster-slim/Dockerfile | 3 ++- 20/buster/Dockerfile | 3 ++- 21/alpine3.18/Dockerfile | 5 +++-- 21/alpine3.19/Dockerfile | 5 +++-- 21/bookworm-slim/Dockerfile | 3 ++- 21/bookworm/Dockerfile | 3 ++- 21/bullseye-slim/Dockerfile | 3 ++- 21/bullseye/Dockerfile | 3 ++- 22 files changed, 50 insertions(+), 28 deletions(-) diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 6c1f26b4cf..1b3c9fb34e 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.20.0 +ENV NODE_VERSION 18.20.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="d3f4b360ebaa1b7eb759416aa448568b55f604e09b5f92343a91b2d6062019d6" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="bcc97843fdb98da8328f509cf7b325a5db3df0777354d3c7b742221207f12629" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -51,6 +51,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index 0755bb284b..93843e5503 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 18.20.0 +ENV NODE_VERSION 18.20.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="d3f4b360ebaa1b7eb759416aa448568b55f604e09b5f92343a91b2d6062019d6" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="bcc97843fdb98da8328f509cf7b325a5db3df0777354d3c7b742221207f12629" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -51,6 +51,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 893a1db379..840c5a5fd1 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.0 +ENV NODE_VERSION 18.20.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 4863ee9d9a..fe70f1d49a 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.0 +ENV NODE_VERSION 18.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index e2e69f816f..0613f20535 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.0 +ENV NODE_VERSION 18.20.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 4a97632306..dbb43945ea 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.0 +ENV NODE_VERSION 18.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index a9839782c7..3495c24162 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.20.0 +ENV NODE_VERSION 18.20.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 7223e48721..15978647a6 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.20.0 +ENV NODE_VERSION 18.20.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index a43b46eac3..63c8bcdb92 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.12.0 +ENV NODE_VERSION 20.12.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a5b000f1f3dc19c5a0ce2325130fb39c3fe76c29f24724f0b32dc0ca4e360dde" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="510b531d09af7a86f34dcc6b600b5504794be1351105afa91b6a9986ac8bf2aa" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -51,6 +51,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index d256de7235..c35779a6c8 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.12.0 +ENV NODE_VERSION 20.12.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a5b000f1f3dc19c5a0ce2325130fb39c3fe76c29f24724f0b32dc0ca4e360dde" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="510b531d09af7a86f34dcc6b600b5504794be1351105afa91b6a9986ac8bf2aa" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -51,6 +51,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index ca940ed080..9640032b90 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.12.0 +ENV NODE_VERSION 20.12.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 1992be1333..e80af14ae5 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.12.0 +ENV NODE_VERSION 20.12.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index cc00e2c465..06dd4b30d3 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.12.0 +ENV NODE_VERSION 20.12.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index eb9853c66a..ac7d246f3b 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.12.0 +ENV NODE_VERSION 20.12.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index e959a35be7..6a848d2808 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.12.0 +ENV NODE_VERSION 20.12.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 7214defeee..1e36686929 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.12.0 +ENV NODE_VERSION 20.12.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 3143aed4c1..dc4635a813 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.7.1 +ENV NODE_VERSION 21.7.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="80e5f4e1846e0d2692e58a9fc8c36dfba74d558ff02d0a53aa3bf5ba50a06778" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="35a8e63673419f5bcbbae319c42651b49549e9941ac38016a2e57a52a2aa593d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -51,6 +51,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 78b6c075e4..819d588c27 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.7.1 +ENV NODE_VERSION 21.7.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="80e5f4e1846e0d2692e58a9fc8c36dfba74d558ff02d0a53aa3bf5ba50a06778" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="35a8e63673419f5bcbbae319c42651b49549e9941ac38016a2e57a52a2aa593d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -51,6 +51,7 @@ RUN addgroup -g 1000 node \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 203ab02228..4d63b841da 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.7.1 +ENV NODE_VERSION 21.7.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 3161bda90d..f884816bed 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.7.1 +ENV NODE_VERSION 21.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 0aae97bf14..d8b4490467 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.7.1 +ENV NODE_VERSION 21.7.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -34,6 +34,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 97483fa3d5..4e7175e7eb 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.7.1 +ENV NODE_VERSION 21.7.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -31,6 +31,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From 8a21ae5477ef226b3a15b0d0e5f94976b934080c Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Sat, 6 Apr 2024 10:44:42 -0400 Subject: [PATCH 721/818] Hide auto-generated files in code reviews --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 6313b56c57..0a080cf4b7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,5 @@ * text=auto eol=lf +/*/**/Dockerfile linguist-generated +/*/**/docker-entrypoint.sh linguist-generated +/Dockerfile*.template linguist-language=Dockerfile + From e8dc03502488e162b6860a6adc3ee8e8ae517e87 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 11 Apr 2024 02:25:13 +0000 Subject: [PATCH 722/818] feat: Node.js 18.20.2, 20.12.2, 21.7.3 --- 18/alpine3.18/Dockerfile | 4 ++-- 18/alpine3.19/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 20/alpine3.18/Dockerfile | 4 ++-- 20/alpine3.19/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 21/alpine3.18/Dockerfile | 4 ++-- 21/alpine3.19/Dockerfile | 4 ++-- 21/bookworm-slim/Dockerfile | 2 +- 21/bookworm/Dockerfile | 2 +- 21/bullseye-slim/Dockerfile | 2 +- 21/bullseye/Dockerfile | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 1b3c9fb34e..b36892f1eb 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.20.1 +ENV NODE_VERSION 18.20.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="bcc97843fdb98da8328f509cf7b325a5db3df0777354d3c7b742221207f12629" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="4405809e05e097f85f1ccb877456ed1e4b1c16e1e9e430286c2c33aeda8433bb" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index 93843e5503..3ac6410753 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 18.20.1 +ENV NODE_VERSION 18.20.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="bcc97843fdb98da8328f509cf7b325a5db3df0777354d3c7b742221207f12629" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="4405809e05e097f85f1ccb877456ed1e4b1c16e1e9e430286c2c33aeda8433bb" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 840c5a5fd1..c07fe50f47 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.1 +ENV NODE_VERSION 18.20.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index fe70f1d49a..ef0e96bf12 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.1 +ENV NODE_VERSION 18.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 0613f20535..d0d4abbe80 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.1 +ENV NODE_VERSION 18.20.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index dbb43945ea..6652af1996 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.1 +ENV NODE_VERSION 18.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 3495c24162..6e236d1c11 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.20.1 +ENV NODE_VERSION 18.20.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 15978647a6..c71a9eec0d 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.20.1 +ENV NODE_VERSION 18.20.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 63c8bcdb92..c1238b9c01 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.12.1 +ENV NODE_VERSION 20.12.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="510b531d09af7a86f34dcc6b600b5504794be1351105afa91b6a9986ac8bf2aa" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="61729a4b4adfefb48ed87034dbaff9129e1fd5b9396434708b0897217a6bf302" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index c35779a6c8..bc8d23db02 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.12.1 +ENV NODE_VERSION 20.12.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="510b531d09af7a86f34dcc6b600b5504794be1351105afa91b6a9986ac8bf2aa" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="61729a4b4adfefb48ed87034dbaff9129e1fd5b9396434708b0897217a6bf302" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 9640032b90..89ffd0b466 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.12.1 +ENV NODE_VERSION 20.12.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index e80af14ae5..d1d7fedc9a 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.12.1 +ENV NODE_VERSION 20.12.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 06dd4b30d3..0725c73ef1 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.12.1 +ENV NODE_VERSION 20.12.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index ac7d246f3b..637fcc8382 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.12.1 +ENV NODE_VERSION 20.12.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 6a848d2808..3830b1bbef 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.12.1 +ENV NODE_VERSION 20.12.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 1e36686929..a415963b97 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.12.1 +ENV NODE_VERSION 20.12.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index dc4635a813..0a07a97038 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 21.7.2 +ENV NODE_VERSION 21.7.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="35a8e63673419f5bcbbae319c42651b49549e9941ac38016a2e57a52a2aa593d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e57846ee4e87b7e9ae912faa3c58985187d38ad13a6e7861cb1bc157f8a3b68d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 819d588c27..3aca1847ca 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 21.7.2 +ENV NODE_VERSION 21.7.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="35a8e63673419f5bcbbae319c42651b49549e9941ac38016a2e57a52a2aa593d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e57846ee4e87b7e9ae912faa3c58985187d38ad13a6e7861cb1bc157f8a3b68d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 4d63b841da..bdf34fec52 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.7.2 +ENV NODE_VERSION 21.7.3 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index f884816bed..a9dac86b21 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 21.7.2 +ENV NODE_VERSION 21.7.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index d8b4490467..b22a82e9a6 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/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 21.7.2 +ENV NODE_VERSION 21.7.3 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 4e7175e7eb..9a60da6363 100644 --- a/21/bullseye/Dockerfile +++ b/21/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 21.7.2 +ENV NODE_VERSION 21.7.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 85591191fb940777d836f0d19847798f92ed6bdb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 12 Apr 2024 00:18:55 +0800 Subject: [PATCH 723/818] docs: update shared libs section for Alpine 3.19+ Starting from Alpine 3.19, the `gcompat` package should be used instead of `libc6-compat` to include missing shared libraries required for `process.dlopen`. This change is based on the latest Alpine Linux 3.19.0 release notes: https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.19.0 --- README.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 341f6cd4ef..d85e3a10e8 100644 --- a/README.md +++ b/README.md @@ -184,11 +184,19 @@ requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons -of using Alpine-based images. One common issue that may arise is a missing shared -library required for use of `process.dlopen`. To add the missing shared libraries -to your image, adding the [`libc6-compat`](https://pkgs.alpinelinux.org/package/edge/main/x86/libc6-compat) +of using Alpine-based images. + +One common issue that may arise is a missing shared library required for use of +`process.dlopen`. To add the missing shared libraries to your image: + +- For Alpine v3.18 and earlier, adding the +[`libc6-compat`](https://pkgs.alpinelinux.org/package/v3.18/main/x86/libc6-compat) package in your Dockerfile is recommended: `apk add --no-cache libc6-compat` +- Starting from Alpine v3.19, you can use the +[`gcompat`](https://pkgs.alpinelinux.org/package/v3.19/main/x86/gcompat) package +to add the missing shared libraries: `apk add --no-cache gcompat` + To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile From 715034c3dce29eea94e801fbf9c12435ffa5f9bb Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Fri, 12 Apr 2024 00:40:26 +0800 Subject: [PATCH 724/818] Pin markdown-link-check to v3.11.0 on GitHub Actions Pin to v3.11.0 in GitHub Actions workflow to avoid false positive 404 errors in CI. Refs: - https://github.com/tcort/markdown-link-check/issues/250 --- .github/workflows/markdown-link-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 84c6a8c7e9..3793d6358d 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -18,6 +18,6 @@ jobs: with: node-version: 'lts/*' - name: Install markdown-link-check - run: npm i -g markdown-link-check + run: npm i -g markdown-link-check@3.11.0 - name: Run markdown-link-check on MD files run: find . -name "*.md" | xargs -n 1 markdown-link-check -c markdown_link_check_config.json -q From 2570da300c5b4e135deb140bee732bceaf5f0a3f Mon Sep 17 00:00:00 2001 From: Mohamed EL-Habib Date: Mon, 25 Mar 2024 21:15:28 +0100 Subject: [PATCH 725/818] cleanup the /tmp folder to save 2.5Mo --- 18/alpine3.18/Dockerfile | 3 ++- 18/alpine3.19/Dockerfile | 3 ++- 18/bookworm-slim/Dockerfile | 3 ++- 18/bookworm/Dockerfile | 3 ++- 18/bullseye-slim/Dockerfile | 3 ++- 18/bullseye/Dockerfile | 3 ++- 18/buster-slim/Dockerfile | 3 ++- 18/buster/Dockerfile | 3 ++- 20/alpine3.18/Dockerfile | 3 ++- 20/alpine3.19/Dockerfile | 3 ++- 20/bookworm-slim/Dockerfile | 3 ++- 20/bookworm/Dockerfile | 3 ++- 20/bullseye-slim/Dockerfile | 3 ++- 20/bullseye/Dockerfile | 3 ++- 20/buster-slim/Dockerfile | 3 ++- 20/buster/Dockerfile | 3 ++- 21/alpine3.18/Dockerfile | 3 ++- 21/alpine3.19/Dockerfile | 3 ++- 21/bookworm-slim/Dockerfile | 3 ++- 21/bookworm/Dockerfile | 3 ++- 21/bullseye-slim/Dockerfile | 3 ++- 21/bullseye/Dockerfile | 3 ++- Dockerfile-alpine.template | 3 ++- Dockerfile-debian.template | 3 ++- Dockerfile-slim.template | 3 ++- 25 files changed, 50 insertions(+), 25 deletions(-) diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index 605dd05089..8d69cf1557 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -102,7 +102,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index 19832cfb9a..c7b26a26fb 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -102,7 +102,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 62fddf9a5a..c7c647b810 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 9aa47008f6..8afe3b4bd6 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 1fbde4e16c..51679afaee 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/bullseye-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 57dcd93585..a111a4ed8e 100644 --- a/18/bullseye/Dockerfile +++ b/18/bullseye/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index aa9af9c6c6..478aad991d 100644 --- a/18/buster-slim/Dockerfile +++ b/18/buster-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 43dc9f0f5e..e245928636 100644 --- a/18/buster/Dockerfile +++ b/18/buster/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index 05ec754634..14fee3a80e 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -102,7 +102,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index d9ece486b4..02d8e27e18 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -102,7 +102,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 4e8458e0c4..822feccba1 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 7e87c1f931..21202a32ce 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index ca5a1c353a..f08e83639e 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/bullseye-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index e8872f2202..c653868554 100644 --- a/20/bullseye/Dockerfile +++ b/20/bullseye/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index d0d6ef1329..a32d43743e 100644 --- a/20/buster-slim/Dockerfile +++ b/20/buster-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index 3bd28a631a..06d9fe0407 100644 --- a/20/buster/Dockerfile +++ b/20/buster/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.18/Dockerfile index 3143aed4c1..5bab487f5e 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.18/Dockerfile @@ -102,7 +102,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 78b6c075e4..414a14ac39 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -102,7 +102,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile index 203ab02228..9eff52e60a 100644 --- a/21/bookworm-slim/Dockerfile +++ b/21/bookworm-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile index 3161bda90d..7d3e0b2564 100644 --- a/21/bookworm/Dockerfile +++ b/21/bookworm/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile index 0aae97bf14..e45ab27d9b 100644 --- a/21/bullseye-slim/Dockerfile +++ b/21/bullseye-slim/Dockerfile @@ -97,7 +97,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile index 97483fa3d5..99a69fcef3 100644 --- a/21/bullseye/Dockerfile +++ b/21/bullseye/Dockerfile @@ -70,7 +70,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 5da2bb7c64..6860c7aaa2 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -92,7 +92,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ && apk del .build-deps-yarn \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index fc05538071..aa3f3c5ecb 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -60,7 +60,8 @@ RUN set -ex \ && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 50050a7d7e..876201d3fd 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -87,7 +87,8 @@ RUN set -ex \ | xargs -r apt-mark manual \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ # smoke test - && yarn --version + && yarn --version \ + && rm -rf /tmp/* COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] From cb5cffec8a0da9b152c87c57ddcff7a925ac5d45 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 17 Apr 2024 18:48:04 -0400 Subject: [PATCH 726/818] Revert "Hide auto-generated files in code reviews and format Dockerfile templates" --- .gitattributes | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 0a080cf4b7..6313b56c57 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1 @@ * text=auto eol=lf -/*/**/Dockerfile linguist-generated -/*/**/docker-entrypoint.sh linguist-generated -/Dockerfile*.template linguist-language=Dockerfile - From 0608bcafbfe780c6fc6de9be539e46ba73b37110 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 25 Apr 2024 16:26:41 +0200 Subject: [PATCH 727/818] chore: fix update script for mac silicon --- functions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions.sh b/functions.sh index df1883f732..e03cf874d2 100755 --- a/functions.sh +++ b/functions.sh @@ -32,6 +32,9 @@ function get_arch() { s390x) arch="s390x" ;; + arm64) + arch="amd64" + ;; aarch64) arch="arm64" ;; From ff8907ab35366821b8e7817eec1119e6d00692c0 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Wed, 24 Apr 2024 15:23:36 -0400 Subject: [PATCH 728/818] feat: Node.js 22.0.0 --- 22/alpine3.18/Dockerfile | 112 ++++++++++++++++++++++++++ 22/alpine3.18/docker-entrypoint.sh | 11 +++ 22/alpine3.19/Dockerfile | 112 ++++++++++++++++++++++++++ 22/alpine3.19/docker-entrypoint.sh | 11 +++ 22/bookworm-slim/Dockerfile | 107 ++++++++++++++++++++++++ 22/bookworm-slim/docker-entrypoint.sh | 11 +++ 22/bookworm/Dockerfile | 80 ++++++++++++++++++ 22/bookworm/docker-entrypoint.sh | 11 +++ 22/bullseye-slim/Dockerfile | 107 ++++++++++++++++++++++++ 22/bullseye-slim/docker-entrypoint.sh | 11 +++ 22/bullseye/Dockerfile | 80 ++++++++++++++++++ 22/bullseye/docker-entrypoint.sh | 11 +++ versions.json | 55 +++++++++++++ 13 files changed, 719 insertions(+) create mode 100644 22/alpine3.18/Dockerfile create mode 100755 22/alpine3.18/docker-entrypoint.sh create mode 100644 22/alpine3.19/Dockerfile create mode 100755 22/alpine3.19/docker-entrypoint.sh create mode 100644 22/bookworm-slim/Dockerfile create mode 100755 22/bookworm-slim/docker-entrypoint.sh create mode 100644 22/bookworm/Dockerfile create mode 100755 22/bookworm/docker-entrypoint.sh create mode 100644 22/bullseye-slim/Dockerfile create mode 100755 22/bullseye-slim/docker-entrypoint.sh create mode 100644 22/bullseye/Dockerfile create mode 100755 22/bullseye/docker-entrypoint.sh diff --git a/22/alpine3.18/Dockerfile b/22/alpine3.18/Dockerfile new file mode 100644 index 0000000000..21fddbb9ca --- /dev/null +++ b/22/alpine3.18/Dockerfile @@ -0,0 +1,112 @@ +FROM alpine:3.18 + +ENV NODE_VERSION 22.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64' CHECKSUM="0687dddb3a69d61951e102b7a31bb8e20398614665e020a415ad6908316b308a" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/22/alpine3.18/docker-entrypoint.sh b/22/alpine3.18/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/22/alpine3.18/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile new file mode 100644 index 0000000000..d79a458a8d --- /dev/null +++ b/22/alpine3.19/Dockerfile @@ -0,0 +1,112 @@ +FROM alpine:3.19 + +ENV NODE_VERSION 22.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64' CHECKSUM="0687dddb3a69d61951e102b7a31bb8e20398614665e020a415ad6908316b308a" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/22/alpine3.19/docker-entrypoint.sh b/22/alpine3.19/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/22/alpine3.19/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile new file mode 100644 index 0000000000..03410d05f7 --- /dev/null +++ b/22/bookworm-slim/Dockerfile @@ -0,0 +1,107 @@ +FROM debian:bookworm-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 22.0.0 + +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/22/bookworm-slim/docker-entrypoint.sh b/22/bookworm-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/22/bookworm-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile new file mode 100644 index 0000000000..6a1f765863 --- /dev/null +++ b/22/bookworm/Dockerfile @@ -0,0 +1,80 @@ +FROM buildpack-deps:bookworm + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 22.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/22/bookworm/docker-entrypoint.sh b/22/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/22/bookworm/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..7b5cdb2036 --- /dev/null +++ b/22/bullseye-slim/Dockerfile @@ -0,0 +1,107 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 22.0.0 + +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/22/bullseye-slim/docker-entrypoint.sh b/22/bullseye-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/22/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile new file mode 100644 index 0000000000..efdef6e02a --- /dev/null +++ b/22/bullseye/Dockerfile @@ -0,0 +1,80 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 22.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.19 + +RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/22/bullseye/docker-entrypoint.sh b/22/bullseye/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/22/bullseye/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index 5934472fdf..d87d833bb8 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,59 @@ { + "22": { + "start": "2024-04-23", + "lts": "2024-10-29", + "maintenance": "2025-10-21", + "end": "2027-04-30", + "codename": "", + "alpine-default": "alpine3.19", + "debian-default": "bookworm", + "variants": { + "alpine3.18": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "alpine3.19": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ] + } + }, "21": { "start": "2023-10-17", "lts": "", From cab20530fe21ce8989854152060591c83a6a7806 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 2 May 2024 16:22:57 +0000 Subject: [PATCH 729/818] feat: Node.js 22.1.0 --- 22/alpine3.18/Dockerfile | 4 ++-- 22/alpine3.19/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.18/Dockerfile b/22/alpine3.18/Dockerfile index 21fddbb9ca..c8e1646e4f 100644 --- a/22/alpine3.18/Dockerfile +++ b/22/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 22.0.0 +ENV NODE_VERSION 22.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="0687dddb3a69d61951e102b7a31bb8e20398614665e020a415ad6908316b308a" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="087edf483f8bf94acfd41bdada76a296d0673f7739ebfe1179971c90f34d3a95" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index d79a458a8d..a9cb18087c 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.0.0 +ENV NODE_VERSION 22.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="0687dddb3a69d61951e102b7a31bb8e20398614665e020a415ad6908316b308a" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="087edf483f8bf94acfd41bdada76a296d0673f7739ebfe1179971c90f34d3a95" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 03410d05f7..449ac4aba8 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.0.0 +ENV NODE_VERSION 22.1.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 6a1f765863..3737adb3ac 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.0.0 +ENV NODE_VERSION 22.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 7b5cdb2036..8ae4bc4d90 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.0.0 +ENV NODE_VERSION 22.1.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index efdef6e02a..7217fc8c12 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.0.0 +ENV NODE_VERSION 22.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 327062ece9d7406c9f463cb4006b599d5255d2cc Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 7 May 2024 19:33:08 +0000 Subject: [PATCH 730/818] feat: Node.js 20.13.0 --- 20/alpine3.18/Dockerfile | 4 ++-- 20/alpine3.19/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index faa5209a8c..fadb5ee72f 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.12.2 +ENV NODE_VERSION 20.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="61729a4b4adfefb48ed87034dbaff9129e1fd5b9396434708b0897217a6bf302" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a4b7f5281fa4616216e823f013b051c9328f7f3f73423460b6300758475fcc4c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index c915d57e1b..3cdd215c83 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.12.2 +ENV NODE_VERSION 20.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="61729a4b4adfefb48ed87034dbaff9129e1fd5b9396434708b0897217a6bf302" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a4b7f5281fa4616216e823f013b051c9328f7f3f73423460b6300758475fcc4c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 9b357c6251..37632ae19d 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.12.2 +ENV NODE_VERSION 20.13.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 21e6f06f4d..94f0692846 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.12.2 +ENV NODE_VERSION 20.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 3cd6cef8dd..78cbe0d7dd 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.12.2 +ENV NODE_VERSION 20.13.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 6aae693519..b7f5c16c38 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.12.2 +ENV NODE_VERSION 20.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index dcb2bc2037..c6b343bce1 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.12.2 +ENV NODE_VERSION 20.13.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index b1fae956c6..bed2c7bfc6 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.12.2 +ENV NODE_VERSION 20.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 375d663fe34b3e76ee41bff8bcac583da32fe0cb Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 9 May 2024 16:23:08 +0000 Subject: [PATCH 731/818] feat: Node.js 20.13.1 --- 20/alpine3.18/Dockerfile | 4 ++-- 20/alpine3.19/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.18/Dockerfile index fadb5ee72f..851a417b49 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 20.13.0 +ENV NODE_VERSION 20.13.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a4b7f5281fa4616216e823f013b051c9328f7f3f73423460b6300758475fcc4c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a723c5566edc88aa2d53704f40a8be5984a6bb1eeac2d952577c8a13b6aacb7b" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index 3cdd215c83..67abdd6eb8 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.13.0 +ENV NODE_VERSION 20.13.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a4b7f5281fa4616216e823f013b051c9328f7f3f73423460b6300758475fcc4c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a723c5566edc88aa2d53704f40a8be5984a6bb1eeac2d952577c8a13b6aacb7b" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 37632ae19d..dc88e0a44e 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.13.0 +ENV NODE_VERSION 20.13.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 94f0692846..a96fc884b7 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.13.0 +ENV NODE_VERSION 20.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 78cbe0d7dd..34b7c37eb7 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.13.0 +ENV NODE_VERSION 20.13.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index b7f5c16c38..7863972597 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.13.0 +ENV NODE_VERSION 20.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index c6b343bce1..eb6b0172bb 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.13.0 +ENV NODE_VERSION 20.13.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index bed2c7bfc6..df1241b66e 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.13.0 +ENV NODE_VERSION 20.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b2c124a3e923e366e9ff8a3abf7ca691aeccccc1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 11 May 2024 13:50:25 -0400 Subject: [PATCH 732/818] chore: Restore Linguist highlighting for templates --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 6313b56c57..f83023c169 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ * text=auto eol=lf +/Dockerfile*.template linguist-language=Dockerfile From 8739d1ef1a30a7910331ebfd979b6361eeb47b61 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 14 May 2024 10:25:27 -0400 Subject: [PATCH 733/818] fixup --- functions.sh | 7 ++----- update.sh | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/functions.sh b/functions.sh index e03cf874d2..bee3dafe05 100755 --- a/functions.sh +++ b/functions.sh @@ -32,17 +32,14 @@ function get_arch() { s390x) arch="s390x" ;; - arm64) - arch="amd64" - ;; - aarch64) + aarch64 | arm64) arch="arm64" ;; armv7l) arch="arm32v7" ;; *) - echo "$0 does not support architecture ${arch} ... aborting" + echo "$0 does not support architecture ${arch:-unknown} ... aborting" exit 1 ;; esac diff --git a/update.sh b/update.sh index 9a321c800c..cbdaa9a0d7 100755 --- a/update.sh +++ b/update.sh @@ -126,7 +126,7 @@ function update_node_version() { ( cp "${template}" "${dockerfile}-tmp" local fromprefix="" - if [ "${arch}" != "amd64" ]; then + if [ "${arch}" != "amd64" ] && [ "${arch}" != "arm64" ]; then fromprefix="${arch}\\/" fi From 14ae63a78d5e38557a56822bd2b1094d038e52a4 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 16 May 2024 09:20:43 +0000 Subject: [PATCH 734/818] feat: Node.js 22.2.0 --- 22/alpine3.18/Dockerfile | 4 ++-- 22/alpine3.19/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.18/Dockerfile b/22/alpine3.18/Dockerfile index c8e1646e4f..bbe342a3b9 100644 --- a/22/alpine3.18/Dockerfile +++ b/22/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 22.1.0 +ENV NODE_VERSION 22.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="087edf483f8bf94acfd41bdada76a296d0673f7739ebfe1179971c90f34d3a95" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="34c57b553f6e7c32927d295acd9d90b21d60a2d41618bab3e495cf0444e276d8" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index a9cb18087c..4a152e0f45 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.1.0 +ENV NODE_VERSION 22.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="087edf483f8bf94acfd41bdada76a296d0673f7739ebfe1179971c90f34d3a95" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="34c57b553f6e7c32927d295acd9d90b21d60a2d41618bab3e495cf0444e276d8" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 449ac4aba8..697b2c40e9 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.1.0 +ENV NODE_VERSION 22.2.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 3737adb3ac..3bc29e364c 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.1.0 +ENV NODE_VERSION 22.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 8ae4bc4d90..426e3f6349 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.1.0 +ENV NODE_VERSION 22.2.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 7217fc8c12..5a25c602b9 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.1.0 +ENV NODE_VERSION 22.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From d3965ef329265accff145164f06653216e416685 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 21 May 2024 13:48:08 +0000 Subject: [PATCH 735/818] feat: Node.js 18.20.3 --- 18/alpine3.18/Dockerfile | 4 ++-- 18/alpine3.19/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 18/buster-slim/Dockerfile | 2 +- 18/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.18/Dockerfile index fb8836dc45..b1df6b643b 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ENV NODE_VERSION 18.20.2 +ENV NODE_VERSION 18.20.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="4405809e05e097f85f1ccb877456ed1e4b1c16e1e9e430286c2c33aeda8433bb" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="3cfeaa3805cc424d1be0e281f0161416a99d206dcb589a9ab3647d7a6ab7d5c9" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index 22a2c85bd2..c69c0a936d 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 18.20.2 +ENV NODE_VERSION 18.20.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="4405809e05e097f85f1ccb877456ed1e4b1c16e1e9e430286c2c33aeda8433bb" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="3cfeaa3805cc424d1be0e281f0161416a99d206dcb589a9ab3647d7a6ab7d5c9" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 83f954bebb..efb819e065 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.2 +ENV NODE_VERSION 18.20.3 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index cd31775e31..5811b02ad0 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.2 +ENV NODE_VERSION 18.20.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index aa58ba9c27..b07c29c336 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.2 +ENV NODE_VERSION 18.20.3 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index a6e6dfcb96..892ce3ee62 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.2 +ENV NODE_VERSION 18.20.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile index 48b0f117f9..dda51f55d7 100644 --- a/18/buster-slim/Dockerfile +++ b/18/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 18.20.2 +ENV NODE_VERSION 18.20.3 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile index 51590c3da4..4baf7d157b 100644 --- a/18/buster/Dockerfile +++ b/18/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 18.20.2 +ENV NODE_VERSION 18.20.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1810f76d762c8b080ab6aec585d66fb0f7f1d4a9 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 22 May 2024 14:38:44 +0200 Subject: [PATCH 736/818] Add Alpine 3.20 and drop 3.18 --- 18/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 20/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 21/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 22/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 architectures | 14 +++++------ versions.json | 24 +++++++++---------- 10 files changed, 23 insertions(+), 23 deletions(-) rename 18/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 18/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) rename 20/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 20/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) rename 21/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 21/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) rename 22/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 22/{alpine3.18 => alpine3.20}/docker-entrypoint.sh (100%) diff --git a/18/alpine3.18/Dockerfile b/18/alpine3.20/Dockerfile similarity index 99% rename from 18/alpine3.18/Dockerfile rename to 18/alpine3.20/Dockerfile index b1df6b643b..261fbb3976 100644 --- a/18/alpine3.18/Dockerfile +++ b/18/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.20 ENV NODE_VERSION 18.20.3 diff --git a/18/alpine3.18/docker-entrypoint.sh b/18/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 18/alpine3.18/docker-entrypoint.sh rename to 18/alpine3.20/docker-entrypoint.sh diff --git a/20/alpine3.18/Dockerfile b/20/alpine3.20/Dockerfile similarity index 99% rename from 20/alpine3.18/Dockerfile rename to 20/alpine3.20/Dockerfile index 851a417b49..9f1f597386 100644 --- a/20/alpine3.18/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.20 ENV NODE_VERSION 20.13.1 diff --git a/20/alpine3.18/docker-entrypoint.sh b/20/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 20/alpine3.18/docker-entrypoint.sh rename to 20/alpine3.20/docker-entrypoint.sh diff --git a/21/alpine3.18/Dockerfile b/21/alpine3.20/Dockerfile similarity index 99% rename from 21/alpine3.18/Dockerfile rename to 21/alpine3.20/Dockerfile index 4150fb13e8..493d96794b 100644 --- a/21/alpine3.18/Dockerfile +++ b/21/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.20 ENV NODE_VERSION 21.7.3 diff --git a/21/alpine3.18/docker-entrypoint.sh b/21/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 21/alpine3.18/docker-entrypoint.sh rename to 21/alpine3.20/docker-entrypoint.sh diff --git a/22/alpine3.18/Dockerfile b/22/alpine3.20/Dockerfile similarity index 99% rename from 22/alpine3.18/Dockerfile rename to 22/alpine3.20/Dockerfile index bbe342a3b9..8022e3924c 100644 --- a/22/alpine3.18/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.20 ENV NODE_VERSION 22.2.0 diff --git a/22/alpine3.18/docker-entrypoint.sh b/22/alpine3.20/docker-entrypoint.sh similarity index 100% rename from 22/alpine3.18/docker-entrypoint.sh rename to 22/alpine3.20/docker-entrypoint.sh diff --git a/architectures b/architectures index 1ef81e6bb2..ad062c3cd2 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -arm32v6 alpine3.18,alpine3.19 -arm32v7 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -arm64v8 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -i386 alpine3.18,alpine3.19 -ppc64le alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm32v6 alpine3.19,alpine3.20 +arm32v7 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm64v8 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +i386 alpine3.19,alpine3.20 +ppc64le alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim diff --git a/versions.json b/versions.json index d87d833bb8..3656694997 100644 --- a/versions.json +++ b/versions.json @@ -5,10 +5,10 @@ "maintenance": "2025-10-21", "end": "2027-04-30", "codename": "", - "alpine-default": "alpine3.19", + "alpine-default": "alpine3.20", "debian-default": "bookworm", "variants": { - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -16,7 +16,7 @@ "ppc64le", "s390x" ], - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", @@ -60,10 +60,10 @@ "maintenance": "2024-04-01", "end": "2024-06-01", "codename": "", - "alpine-default": "alpine3.19", + "alpine-default": "alpine3.20", "debian-default": "bookworm", "variants": { - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -71,7 +71,7 @@ "ppc64le", "s390x" ], - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", @@ -115,10 +115,10 @@ "maintenance": "2024-10-22", "end": "2026-04-30", "codename": "iron", - "alpine-default": "alpine3.19", + "alpine-default": "alpine3.20", "debian-default": "bookworm", "variants": { - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -126,7 +126,7 @@ "ppc64le", "s390x" ], - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", @@ -178,10 +178,10 @@ "maintenance": "2023-10-18", "end": "2025-04-30", "codename": "hydrogen", - "alpine-default": "alpine3.19", + "alpine-default": "alpine3.20", "debian-default": "bookworm", "variants": { - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -189,7 +189,7 @@ "ppc64le", "s390x" ], - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", From daea62837e99456d7556b585edbc2b32fb57369e Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 28 May 2024 18:47:58 +0000 Subject: [PATCH 737/818] feat: Node.js 20.14.0 --- 20/alpine3.19/Dockerfile | 6 +++--- 20/alpine3.20/Dockerfile | 6 +++--- 20/bookworm-slim/Dockerfile | 4 ++-- 20/bookworm/Dockerfile | 4 ++-- 20/bullseye-slim/Dockerfile | 4 ++-- 20/bullseye/Dockerfile | 4 ++-- 20/buster-slim/Dockerfile | 4 ++-- 20/buster/Dockerfile | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index 67abdd6eb8..5b92d805f5 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.13.1 +ENV NODE_VERSION 20.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a723c5566edc88aa2d53704f40a8be5984a6bb1eeac2d952577c8a13b6aacb7b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f0afca5a7f4857d06d960490b2af36f72b5dd08732776454e33514796d07bff1" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -80,7 +80,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 9f1f597386..3e6ee484a8 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.13.1 +ENV NODE_VERSION 20.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a723c5566edc88aa2d53704f40a8be5984a6bb1eeac2d952577c8a13b6aacb7b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f0afca5a7f4857d06d960490b2af36f72b5dd08732776454e33514796d07bff1" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -80,7 +80,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index dc88e0a44e..912194328e 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.13.1 +ENV NODE_VERSION 20.14.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -63,7 +63,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index a96fc884b7..2b7dca2906 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.13.1 +ENV NODE_VERSION 20.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -49,7 +49,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 34b7c37eb7..a7eef7036b 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.13.1 +ENV NODE_VERSION 20.14.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -63,7 +63,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 7863972597..0e0ccd7f23 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.13.1 +ENV NODE_VERSION 20.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -49,7 +49,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index eb6b0172bb..2f636c69a6 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.13.1 +ENV NODE_VERSION 20.14.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -63,7 +63,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index df1241b66e..a521ac7eb2 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.13.1 +ENV NODE_VERSION 20.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -49,7 +49,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 From 416397c67bb40e186b621d7dc12deb6b0a1ce34e Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 4 Jun 2024 09:57:45 -0400 Subject: [PATCH 738/818] Fix version 18 on arm64v8 arch Fixes #2096 --- 18/alpine3.19/Dockerfile | 1 + 18/alpine3.20/Dockerfile | 1 + 20/alpine3.19/Dockerfile | 1 + 20/alpine3.20/Dockerfile | 1 + 21/alpine3.19/Dockerfile | 1 + 21/alpine3.20/Dockerfile | 1 + 22/alpine3.19/Dockerfile | 1 + 22/alpine3.20/Dockerfile | 1 + Dockerfile-alpine.template | 1 + 9 files changed, 9 insertions(+) diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index c69c0a936d..77d19b53cb 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/18/alpine3.20/Dockerfile b/18/alpine3.20/Dockerfile index 261fbb3976..9df4ff6b2a 100644 --- a/18/alpine3.20/Dockerfile +++ b/18/alpine3.20/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index 5b92d805f5..315cd58e8f 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 3e6ee484a8..61c529da5f 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile index 87cdabe5d8..236fb21c9d 100644 --- a/21/alpine3.19/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/21/alpine3.20/Dockerfile b/21/alpine3.20/Dockerfile index 493d96794b..22bc8946c9 100644 --- a/21/alpine3.20/Dockerfile +++ b/21/alpine3.20/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 4a152e0f45..1f965199a3 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 8022e3924c..09c98fb9f2 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6860c7aaa2..79e973d43a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -36,6 +36,7 @@ RUN addgroup -g 1000 node \ linux-headers \ make \ python3 \ + py-setuptools \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys From 8db5955e24a250b42ed11c56a46bfd12eefddd17 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Tue, 4 Jun 2024 15:13:57 -0400 Subject: [PATCH 739/818] Update the node-gyp alpine docs section to account for Node 18 in Alpine 3.20 python issue --- docs/BestPractices.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 6141a9a1d6..2f1a416854 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -187,7 +187,7 @@ Here is an example of how you would install dependencies for packages that requi ```Dockerfile FROM node:alpine -RUN apk add --no-cache --virtual .gyp python3 make g++ \ +RUN apk add --no-cache --virtual .gyp python3 py-setuptools make g++ \ && npm install [ your npm dependencies here ] \ && apk del .gyp ``` From 9c01893a863dbade8974a2a23eccf9b9afa7458a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 5 Jun 2024 12:21:39 -0400 Subject: [PATCH 740/818] feat: Drop EOL Node.js 21 --- 21/alpine3.19/Dockerfile | 113 -------------------------- 21/alpine3.19/docker-entrypoint.sh | 11 --- 21/alpine3.20/Dockerfile | 113 -------------------------- 21/alpine3.20/docker-entrypoint.sh | 11 --- 21/bookworm-slim/Dockerfile | 107 ------------------------ 21/bookworm-slim/docker-entrypoint.sh | 11 --- 21/bookworm/Dockerfile | 80 ------------------ 21/bookworm/docker-entrypoint.sh | 11 --- 21/bullseye-slim/Dockerfile | 107 ------------------------ 21/bullseye-slim/docker-entrypoint.sh | 11 --- 21/bullseye/Dockerfile | 80 ------------------ 21/bullseye/docker-entrypoint.sh | 11 --- versions.json | 55 ------------- 13 files changed, 721 deletions(-) delete mode 100644 21/alpine3.19/Dockerfile delete mode 100755 21/alpine3.19/docker-entrypoint.sh delete mode 100644 21/alpine3.20/Dockerfile delete mode 100755 21/alpine3.20/docker-entrypoint.sh delete mode 100644 21/bookworm-slim/Dockerfile delete mode 100755 21/bookworm-slim/docker-entrypoint.sh delete mode 100644 21/bookworm/Dockerfile delete mode 100755 21/bookworm/docker-entrypoint.sh delete mode 100644 21/bullseye-slim/Dockerfile delete mode 100755 21/bullseye-slim/docker-entrypoint.sh delete mode 100644 21/bullseye/Dockerfile delete mode 100755 21/bullseye/docker-entrypoint.sh diff --git a/21/alpine3.19/Dockerfile b/21/alpine3.19/Dockerfile deleted file mode 100644 index 236fb21c9d..0000000000 --- a/21/alpine3.19/Dockerfile +++ /dev/null @@ -1,113 +0,0 @@ -FROM alpine:3.19 - -ENV NODE_VERSION 21.7.3 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e57846ee4e87b7e9ae912faa3c58985187d38ad13a6e7861cb1bc157f8a3b68d" OPENSSL_ARCH=linux-x86_64;; \ - x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ - arm*) OPENSSL_ARCH=linux-armv4;; \ - ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ - s390x) OPENSSL_ARCH=linux-s390x;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - py-setuptools \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 - && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/alpine3.19/docker-entrypoint.sh b/21/alpine3.19/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/alpine3.19/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/21/alpine3.20/Dockerfile b/21/alpine3.20/Dockerfile deleted file mode 100644 index 22bc8946c9..0000000000 --- a/21/alpine3.20/Dockerfile +++ /dev/null @@ -1,113 +0,0 @@ -FROM alpine:3.20 - -ENV NODE_VERSION 21.7.3 - -RUN addgroup -g 1000 node \ - && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ - libstdc++ \ - && apk add --no-cache --virtual .build-deps \ - curl \ - && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ - && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e57846ee4e87b7e9ae912faa3c58985187d38ad13a6e7861cb1bc157f8a3b68d" OPENSSL_ARCH=linux-x86_64;; \ - x86) OPENSSL_ARCH=linux-elf;; \ - aarch64) OPENSSL_ARCH=linux-aarch64;; \ - arm*) OPENSSL_ARCH=linux-armv4;; \ - ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ - s390x) OPENSSL_ARCH=linux-s390x;; \ - *) ;; \ - esac \ - && if [ -n "${CHECKSUM}" ]; then \ - set -eu; \ - curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ - echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ - else \ - echo "Building from source" \ - # backup build - && apk add --no-cache --virtual .build-deps-full \ - binutils-gold \ - g++ \ - gcc \ - gnupg \ - libgcc \ - linux-headers \ - make \ - python3 \ - py-setuptools \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xf "node-v$NODE_VERSION.tar.xz" \ - && cd "node-v$NODE_VERSION" \ - && ./configure \ - && make -j$(getconf _NPROCESSORS_ONLN) V= \ - && make install \ - && apk del .build-deps-full \ - && cd .. \ - && rm -Rf "node-v$NODE_VERSION" \ - && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ - fi \ - && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ - # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 - && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ - && apk del .build-deps \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apk del .build-deps-yarn \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/alpine3.20/docker-entrypoint.sh b/21/alpine3.20/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/alpine3.20/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/21/bookworm-slim/Dockerfile b/21/bookworm-slim/Dockerfile deleted file mode 100644 index 6e502c69f0..0000000000 --- a/21/bookworm-slim/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM debian:bookworm-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 21.7.3 - -RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ - ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ - s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ - arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ - armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 - && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/bookworm-slim/docker-entrypoint.sh b/21/bookworm-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/bookworm-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/21/bookworm/Dockerfile b/21/bookworm/Dockerfile deleted file mode 100644 index 51a91cd484..0000000000 --- a/21/bookworm/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -FROM buildpack-deps:bookworm - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 21.7.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/bookworm/docker-entrypoint.sh b/21/bookworm/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/bookworm/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/21/bullseye-slim/Dockerfile b/21/bullseye-slim/Dockerfile deleted file mode 100644 index fac738b3ca..0000000000 --- a/21/bullseye-slim/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM debian:bullseye-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 21.7.3 - -RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ - ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ - s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ - arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ - armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 - && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/bullseye-slim/docker-entrypoint.sh b/21/bullseye-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/bullseye-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/21/bullseye/Dockerfile b/21/bullseye/Dockerfile deleted file mode 100644 index e0842c01fc..0000000000 --- a/21/bullseye/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -FROM buildpack-deps:bullseye - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 21.7.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/21/bullseye/docker-entrypoint.sh b/21/bullseye/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/21/bullseye/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/versions.json b/versions.json index 3656694997..008103e3b8 100644 --- a/versions.json +++ b/versions.json @@ -54,61 +54,6 @@ ] } }, - "21": { - "start": "2023-10-17", - "lts": "", - "maintenance": "2024-04-01", - "end": "2024-06-01", - "codename": "", - "alpine-default": "alpine3.20", - "debian-default": "bookworm", - "variants": { - "alpine3.19": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "alpine3.20": [ - "amd64", - "arm32v6", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bookworm": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bookworm-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ], - "bullseye-slim": [ - "amd64", - "arm32v7", - "arm64v8", - "ppc64le", - "s390x" - ] - } - }, "20": { "start": "2023-04-18", "lts": "2023-10-24", From 17e222f5ca0d572b991cada44394e0eb09ba2b30 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 11 Jun 2024 20:48:04 +0000 Subject: [PATCH 741/818] feat: Node.js 22.3.0 --- 22/alpine3.19/Dockerfile | 6 +++--- 22/alpine3.20/Dockerfile | 6 +++--- 22/bookworm-slim/Dockerfile | 4 ++-- 22/bookworm/Dockerfile | 4 ++-- 22/bullseye-slim/Dockerfile | 4 ++-- 22/bullseye/Dockerfile | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 1f965199a3..40cfa6ca2d 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.2.0 +ENV NODE_VERSION 22.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="34c57b553f6e7c32927d295acd9d90b21d60a2d41618bab3e495cf0444e276d8" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ddb1548ce74c8fd54c47ebda0fa66903208547faf4cfbf874b086d6dc3d2244d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -81,7 +81,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 09c98fb9f2..89a4313b9f 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.2.0 +ENV NODE_VERSION 22.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="34c57b553f6e7c32927d295acd9d90b21d60a2d41618bab3e495cf0444e276d8" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ddb1548ce74c8fd54c47ebda0fa66903208547faf4cfbf874b086d6dc3d2244d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -81,7 +81,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 697b2c40e9..5181eeff53 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.2.0 +ENV NODE_VERSION 22.3.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -63,7 +63,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 3bc29e364c..dfd9ca0b7a 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.2.0 +ENV NODE_VERSION 22.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -49,7 +49,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 426e3f6349..96c1f92103 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.2.0 +ENV NODE_VERSION 22.3.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -63,7 +63,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 5a25c602b9..3401a0d985 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.2.0 +ENV NODE_VERSION 22.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -49,7 +49,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 From 15d2bbbdf9a075e6a118043387b81ce2094e6218 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 07:02:55 +0000 Subject: [PATCH 742/818] chore(deps): bump docker/build-push-action from 5 to 6 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 4b1c51ed1a..bd42d4a453 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@v4 - name: Build image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: push: false load: true From 73d1fd5cb366c132572dea5cb5a1ad39e1b00d2b Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Mon, 24 Jun 2024 14:33:35 +0000 Subject: [PATCH 743/818] feat: Node.js 20.15.0 --- 20/alpine3.19/Dockerfile | 4 ++-- 20/alpine3.20/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 20/buster-slim/Dockerfile | 2 +- 20/buster/Dockerfile | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index 315cd58e8f..ca632e4431 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.14.0 +ENV NODE_VERSION 20.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f0afca5a7f4857d06d960490b2af36f72b5dd08732776454e33514796d07bff1" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="24a21bc2fd2caf300ea36d716fbfa29ababa8a41bb844e67b6cf8b3d5091792c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 61c529da5f..b40f1b9245 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.14.0 +ENV NODE_VERSION 20.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f0afca5a7f4857d06d960490b2af36f72b5dd08732776454e33514796d07bff1" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="24a21bc2fd2caf300ea36d716fbfa29ababa8a41bb844e67b6cf8b3d5091792c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 912194328e..c1e693fc6f 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.14.0 +ENV NODE_VERSION 20.15.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 2b7dca2906..6b920e1198 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.14.0 +ENV NODE_VERSION 20.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index a7eef7036b..005e616d62 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.14.0 +ENV NODE_VERSION 20.15.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 0e0ccd7f23..1323b7350e 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.14.0 +ENV NODE_VERSION 20.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile index 2f636c69a6..ee133f4af1 100644 --- a/20/buster-slim/Dockerfile +++ b/20/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 20.14.0 +ENV NODE_VERSION 20.15.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile index a521ac7eb2..beb199d233 100644 --- a/20/buster/Dockerfile +++ b/20/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 20.14.0 +ENV NODE_VERSION 20.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 58d00e1735812b2a237b80785ee0924f061cf728 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 2 Jul 2024 10:48:00 +0000 Subject: [PATCH 744/818] feat: Node.js 22.4.0 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 40cfa6ca2d..abc96ba687 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.3.0 +ENV NODE_VERSION 22.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ddb1548ce74c8fd54c47ebda0fa66903208547faf4cfbf874b086d6dc3d2244d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="4c2b29952cb6ca1d69a2adea3001b1b20317147f4016e8ac6094147e07171734" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 89a4313b9f..6d0c125561 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.3.0 +ENV NODE_VERSION 22.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ddb1548ce74c8fd54c47ebda0fa66903208547faf4cfbf874b086d6dc3d2244d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="4c2b29952cb6ca1d69a2adea3001b1b20317147f4016e8ac6094147e07171734" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 5181eeff53..730190225f 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.3.0 +ENV NODE_VERSION 22.4.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index dfd9ca0b7a..08aba0e303 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.3.0 +ENV NODE_VERSION 22.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 96c1f92103..7a3e3ded9c 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.3.0 +ENV NODE_VERSION 22.4.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 3401a0d985..28d27e7417 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.3.0 +ENV NODE_VERSION 22.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From efc560b6676c2ff477b27b4045443f3fb12f1632 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 2 Jul 2024 19:36:19 -0400 Subject: [PATCH 745/818] feat: Drop EOL Debian Buster Node.js variants --- 18/buster-slim/Dockerfile | 107 ---------------------------- 18/buster-slim/docker-entrypoint.sh | 11 --- 18/buster/Dockerfile | 80 --------------------- 18/buster/docker-entrypoint.sh | 11 --- 20/buster-slim/Dockerfile | 107 ---------------------------- 20/buster-slim/docker-entrypoint.sh | 11 --- 20/buster/Dockerfile | 80 --------------------- 20/buster/docker-entrypoint.sh | 11 --- README.md | 7 -- SECURITY.md | 2 +- architectures | 10 +-- config | 2 +- update.sh | 2 +- versions.json | 18 ----- 14 files changed, 8 insertions(+), 451 deletions(-) delete mode 100644 18/buster-slim/Dockerfile delete mode 100755 18/buster-slim/docker-entrypoint.sh delete mode 100644 18/buster/Dockerfile delete mode 100755 18/buster/docker-entrypoint.sh delete mode 100644 20/buster-slim/Dockerfile delete mode 100755 20/buster-slim/docker-entrypoint.sh delete mode 100644 20/buster/Dockerfile delete mode 100755 20/buster/docker-entrypoint.sh diff --git a/18/buster-slim/Dockerfile b/18/buster-slim/Dockerfile deleted file mode 100644 index dda51f55d7..0000000000 --- a/18/buster-slim/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 18.20.3 - -RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ - ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ - s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ - arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ - armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 - && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/18/buster-slim/docker-entrypoint.sh b/18/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/18/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/18/buster/Dockerfile b/18/buster/Dockerfile deleted file mode 100644 index 4baf7d157b..0000000000 --- a/18/buster/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 18.20.3 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.19 - -RUN set -ex \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/18/buster/docker-entrypoint.sh b/18/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/18/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/20/buster-slim/Dockerfile b/20/buster-slim/Dockerfile deleted file mode 100644 index ee133f4af1..0000000000 --- a/20/buster-slim/Dockerfile +++ /dev/null @@ -1,107 +0,0 @@ -FROM debian:buster-slim - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 20.15.0 - -RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ - ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ - s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ - arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ - armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ - i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - && set -ex \ - # libatomic1 for arm - && 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/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 - && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ - && apt-mark auto '.*' > /dev/null \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.22 - -RUN set -ex \ - && savedAptMark="$(apt-mark showmanual)" \ - && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && apt-mark auto '.*' > /dev/null \ - && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ - && find /usr/local -type f -executable -exec ldd '{}' ';' \ - | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/20/buster-slim/docker-entrypoint.sh b/20/buster-slim/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/20/buster-slim/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/20/buster/Dockerfile b/20/buster/Dockerfile deleted file mode 100644 index beb199d233..0000000000 --- a/20/buster/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -FROM buildpack-deps:buster - -RUN groupadd --gid 1000 node \ - && useradd --uid 1000 --gid node --shell /bin/bash --create-home node - -ENV NODE_VERSION 20.15.0 - -RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ - && case "${dpkgArch##*-}" in \ - amd64) ARCH='x64';; \ - ppc64el) ARCH='ppc64le';; \ - s390x) ARCH='s390x';; \ - arm64) ARCH='arm64';; \ - armhf) ARCH='armv7l';; \ - i386) ARCH='x86';; \ - *) echo "unsupported architecture"; exit 1 ;; \ - esac \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - # gpg keys listed at https://github.com/nodejs/node#release-keys - && set -ex \ - && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ - DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ - C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ - 108F52B48DB57BB0CC439B2997B01419BD92F80A \ - A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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 \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ - && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ - # smoke tests - && node --version \ - && npm --version - -ENV YARN_VERSION 1.22.22 - -RUN set -ex \ - # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 - && export GNUPGHOME="$(mktemp -d)" \ - && for key in \ - 6A010C5166006599AA17F08146C2130DFD2497F5 \ - ; do \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ - gpg --batch --keyserver keyserver.ubuntu.com --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" \ - && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - && gpgconf --kill all \ - && rm -rf "$GNUPGHOME" \ - && mkdir -p /opt \ - && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ - && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ - && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ - # smoke test - && yarn --version \ - && rm -rf /tmp/* - -COPY docker-entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD [ "node" ] diff --git a/20/buster/docker-entrypoint.sh b/20/buster/docker-entrypoint.sh deleted file mode 100755 index 1b3116e53b..0000000000 --- a/20/buster/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -# Run command with node if the first argument contains a "-" or is not a system command. The last -# part inside the "{}" is a workaround for the following bug in ash/dash: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 -if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then - set -- node "$@" -fi - -exec "$@" diff --git a/README.md b/README.md index d85e3a10e8..fc778a31e5 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ The official Node.js docker image, made with love by the node community. - [Image Variants](#image-variants) - [`node:`](#nodeversion) - [`node:alpine`](#nodealpine) - - [`node:buster`](#nodebuster) - [`node:bullseye`](#nodebullseye) - [`node:bookworm`](#nodebookworm) - [`node:slim`](#nodeslim) @@ -205,12 +204,6 @@ examples of how to install packages if you are unfamiliar). To make the image size even smaller, you can [bundle without npm/yarn](./docs/BestPractices.md#smaller-images-without-npmyarn). -### `node:buster` - -This image is based on version 10 of -[Debian](http://debian.org), available in -[the `debian` official image](https://hub.docker.com/_/debian). - ### `node:bullseye` This image is based on version 11 of diff --git a/SECURITY.md b/SECURITY.md index 7224eff51d..a820a3f551 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,6 +7,6 @@ Security issues relating to Node.js project should follow the process documented CVEs for the base image packages should be reported to those repositories. Nothing to address those CVEs is in the hands of this repos. - [Alpine](https://github.com/alpinelinux/docker-alpine) -- [Debian (buster, bullseye, bookworm)](https://github.com/debuerreotype/docker-debian-artifacts) +- [Debian (bullseye, bookworm)](https://github.com/debuerreotype/docker-debian-artifacts) When base images are patched, the images are rebuilt and rolled out to the Docker hub without intervention by this repo. This process is explained in . diff --git a/architectures b/architectures index ad062c3cd2..1cb4bf3525 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim arm32v6 alpine3.19,alpine3.20 -arm32v7 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -arm64v8 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm32v7 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim +arm64v8 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim i386 alpine3.19,alpine3.20 -ppc64le alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +ppc64le alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim +s390x alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim diff --git a/config b/config index 7c216ecdee..bb8d85f919 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant bookworm alpine_version 3.19 -debian_versions bookworm bullseye buster +debian_versions bookworm bullseye diff --git a/update.sh b/update.sh index cbdaa9a0d7..0b6aaf69d6 100755 --- a/update.sh +++ b/update.sh @@ -15,7 +15,7 @@ function usage() { - update.sh -s # Update all images, skip updating Alpine and Yarn - update.sh 8,10 # Update all variants of version 8 and 10 - update.sh -s 8 # Update version 8 and variants, skip updating Alpine and Yarn - - update.sh 8 buster-slim,buster # Update only buster's slim and buster variants for version 8 + - update.sh 8 alpine # Update only alpine's variants for version 8 - update.sh -s 8 bullseye # Update only bullseye variant for version 8, skip updating Alpine and Yarn - update.sh . alpine # Update the alpine variant for all versions diff --git a/versions.json b/versions.json index 008103e3b8..deaeb87953 100644 --- a/versions.json +++ b/versions.json @@ -106,14 +106,6 @@ "arm64v8", "ppc64le", "s390x" - ], - "buster": [ - "amd64", - "arm64v8" - ], - "buster-slim": [ - "amd64", - "arm64v8" ] } }, @@ -169,16 +161,6 @@ "arm64v8", "ppc64le", "s390x" - ], - "buster": [ - "amd64", - "arm32v7", - "arm64v8" - ], - "buster-slim": [ - "amd64", - "arm32v7", - "arm64v8" ] } } From 619b871fb3d89dc6d6333914b46bf526e781eec5 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 9 Jul 2024 05:33:43 +0000 Subject: [PATCH 746/818] feat: Node.js 18.20.4, 20.15.1, 22.4.1 --- 18/alpine3.19/Dockerfile | 4 ++-- 18/alpine3.20/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 20/alpine3.19/Dockerfile | 4 ++-- 20/alpine3.20/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index 77d19b53cb..90f619f93d 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 18.20.3 +ENV NODE_VERSION 18.20.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="3cfeaa3805cc424d1be0e281f0161416a99d206dcb589a9ab3647d7a6ab7d5c9" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ac4fe3bef38d5e4ecf172b46c8af1f346904afd9788ce12919e3696f601e191e" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.20/Dockerfile b/18/alpine3.20/Dockerfile index 9df4ff6b2a..24a668e62e 100644 --- a/18/alpine3.20/Dockerfile +++ b/18/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 18.20.3 +ENV NODE_VERSION 18.20.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="3cfeaa3805cc424d1be0e281f0161416a99d206dcb589a9ab3647d7a6ab7d5c9" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ac4fe3bef38d5e4ecf172b46c8af1f346904afd9788ce12919e3696f601e191e" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index efb819e065..a3bb4aca15 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.3 +ENV NODE_VERSION 18.20.4 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 5811b02ad0..175b9ca67e 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.3 +ENV NODE_VERSION 18.20.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index b07c29c336..9571844bff 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.3 +ENV NODE_VERSION 18.20.4 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 892ce3ee62..225426d402 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.3 +ENV NODE_VERSION 18.20.4 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index ca632e4431..991ac8e505 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.15.0 +ENV NODE_VERSION 20.15.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="24a21bc2fd2caf300ea36d716fbfa29ababa8a41bb844e67b6cf8b3d5091792c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a5263215500d0f53e4b5194791bb8753df2380977d603bf408f5bf897eaf0708" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index b40f1b9245..317a61e1d5 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.15.0 +ENV NODE_VERSION 20.15.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="24a21bc2fd2caf300ea36d716fbfa29ababa8a41bb844e67b6cf8b3d5091792c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a5263215500d0f53e4b5194791bb8753df2380977d603bf408f5bf897eaf0708" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index c1e693fc6f..f856cc5d54 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.15.0 +ENV NODE_VERSION 20.15.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 6b920e1198..7e20ac039f 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.15.0 +ENV NODE_VERSION 20.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 005e616d62..c072ff70d4 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.15.0 +ENV NODE_VERSION 20.15.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 1323b7350e..a1a1cdc9a5 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.15.0 +ENV NODE_VERSION 20.15.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index abc96ba687..86f6fdd5e9 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.4.0 +ENV NODE_VERSION 22.4.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="4c2b29952cb6ca1d69a2adea3001b1b20317147f4016e8ac6094147e07171734" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d86c0ca0b79675ebe1df9691892b592e888bcba272107d29511f3ff1e527de8c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 6d0c125561..f0d0472798 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.4.0 +ENV NODE_VERSION 22.4.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="4c2b29952cb6ca1d69a2adea3001b1b20317147f4016e8ac6094147e07171734" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d86c0ca0b79675ebe1df9691892b592e888bcba272107d29511f3ff1e527de8c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 730190225f..1adbd1634f 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.4.0 +ENV NODE_VERSION 22.4.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 08aba0e303..36991bbc12 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.4.0 +ENV NODE_VERSION 22.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 7a3e3ded9c..77446e4353 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.4.0 +ENV NODE_VERSION 22.4.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 28d27e7417..a14a6b4550 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.4.0 +ENV NODE_VERSION 22.4.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1fb7b0001b7a08268ffa2c6dac3ae06e6528c8bd Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 18 Jul 2024 03:35:26 +0000 Subject: [PATCH 747/818] feat: Node.js 22.5.0 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 86f6fdd5e9..40ad758a11 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.4.1 +ENV NODE_VERSION 22.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="d86c0ca0b79675ebe1df9691892b592e888bcba272107d29511f3ff1e527de8c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="4fd29ffd7707d41e1d2e844825fce1c46f56994e996e96f98d5b0a7d922a34cd" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index f0d0472798..9fc48d6ef8 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.4.1 +ENV NODE_VERSION 22.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="d86c0ca0b79675ebe1df9691892b592e888bcba272107d29511f3ff1e527de8c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="4fd29ffd7707d41e1d2e844825fce1c46f56994e996e96f98d5b0a7d922a34cd" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 1adbd1634f..416a4986a7 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.4.1 +ENV NODE_VERSION 22.5.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 36991bbc12..a7b05c7399 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.4.1 +ENV NODE_VERSION 22.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 77446e4353..453642e685 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.4.1 +ENV NODE_VERSION 22.5.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index a14a6b4550..664f65cb3f 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.4.1 +ENV NODE_VERSION 22.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1f1f3a626ff1c6738c04e9917f01d1051eacaa74 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 19 Jul 2024 15:48:06 +0000 Subject: [PATCH 748/818] feat: Node.js 22.5.1 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 40ad758a11..5a6551af26 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.5.0 +ENV NODE_VERSION 22.5.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="4fd29ffd7707d41e1d2e844825fce1c46f56994e996e96f98d5b0a7d922a34cd" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ff98d55d319b570cc0d38070afb2ff6dee905c076993cfe3687fbd9244bc3686" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 9fc48d6ef8..9c96421c46 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.5.0 +ENV NODE_VERSION 22.5.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="4fd29ffd7707d41e1d2e844825fce1c46f56994e996e96f98d5b0a7d922a34cd" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ff98d55d319b570cc0d38070afb2ff6dee905c076993cfe3687fbd9244bc3686" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 416a4986a7..09a6c8d627 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.5.0 +ENV NODE_VERSION 22.5.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index a7b05c7399..6664d9ce26 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.5.0 +ENV NODE_VERSION 22.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 453642e685..281f49e491 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.5.0 +ENV NODE_VERSION 22.5.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 664f65cb3f..7f540f0c8b 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.5.0 +ENV NODE_VERSION 22.5.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 766b2dec6f59b6c98bf190e818edb1b0c7e532c5 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 24 Jul 2024 14:04:57 +0000 Subject: [PATCH 749/818] feat: Node.js 20.16.0 --- 20/alpine3.19/Dockerfile | 4 ++-- 20/alpine3.20/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index 991ac8e505..78eab86d8b 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.15.1 +ENV NODE_VERSION 20.16.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a5263215500d0f53e4b5194791bb8753df2380977d603bf408f5bf897eaf0708" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="40efcec63e42ca58a39cc89c99d8852bd31ea09e046966b321fd337be999651d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 317a61e1d5..ee64ea5d0e 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.15.1 +ENV NODE_VERSION 20.16.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a5263215500d0f53e4b5194791bb8753df2380977d603bf408f5bf897eaf0708" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="40efcec63e42ca58a39cc89c99d8852bd31ea09e046966b321fd337be999651d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index f856cc5d54..6aeeae9a21 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.15.1 +ENV NODE_VERSION 20.16.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 7e20ac039f..c67c6f272e 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.15.1 +ENV NODE_VERSION 20.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index c072ff70d4..f4fa1fc5f6 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.15.1 +ENV NODE_VERSION 20.16.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index a1a1cdc9a5..fd3bb9adfe 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.15.1 +ENV NODE_VERSION 20.16.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From df91b7fbec894e0e8913cf558a7c8b4091fd6ee7 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 26 Jul 2024 16:16:03 +0000 Subject: [PATCH 750/818] chore: fix `update-keys.sh` for current `README.md` The `update-keys.sh` script needed updating to account for: * Node.js HEAD branch is now `main` * Comments added to each line in the key list --- update-keys.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-keys.sh b/update-keys.sh index b933d8e368..b6fec15418 100755 --- a/update-keys.sh +++ b/update-keys.sh @@ -1,3 +1,3 @@ #!/bin/sh -ex -curl -fsSLo- --compressed https://github.com/nodejs/node/raw/master/README.md | awk '/^gpg --keyserver hkps:\/\/keys\.openpgp\.org --recv-keys/ {print $NF}' > keys/node.keys +curl -fsSLo- --compressed https://github.com/nodejs/node/raw/main/README.md | awk '/--recv-keys.*#/{ gsub(/^.*--recv-keys\s+/,"");gsub(/\s+#.*$/,""); print }' > keys/node.keys From cd424d0e880ec52db940c1a5cdb3675417c8f3a2 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 26 Jul 2024 16:19:20 +0000 Subject: [PATCH 751/818] keys: sync Node.js keys with current releaser keys Regenerate `keys/nodejs.keys` by re-running `update-keys.sh`. --- keys/node.keys | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keys/node.keys b/keys/node.keys index b87f08dc12..a7361d2f3e 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -2,11 +2,10 @@ 141F07595B7B3FFE74309A937405533BE57C7D57 74F12602B6F1C4E913FAA37AD3A89613643B6201 DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 -61FC681DFB92A079F1685E77973F295594EC4689 +CC68F5A3106FF448322E48ED27F5E38D5B0A215F 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C 108F52B48DB57BB0CC439B2997B01419BD92F80A A363A499291CBBC940DD62E41F10027AF002F8B0 -CC68F5A3106FF448322E48ED27F5E38D5B0A215F From b2cfafd93e46ec6e0c0e1c9a2512a3e16d1e4163 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 26 Jul 2024 16:21:14 +0000 Subject: [PATCH 752/818] keys: remove key for emeritus releaser Refs: https://github.com/nodejs/Release/pull/1024 Refs: https://github.com/nodejs/node/pull/54059 --- keys/node.keys | 1 - 1 file changed, 1 deletion(-) diff --git a/keys/node.keys b/keys/node.keys index a7361d2f3e..5ea0031e5c 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -4,7 +4,6 @@ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 CC68F5A3106FF448322E48ED27F5E38D5B0A215F 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 -C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C 108F52B48DB57BB0CC439B2997B01419BD92F80A From c0cfa23e26d75f1f679fd6626a29a27ec5274db3 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 6 Aug 2024 19:04:04 +0000 Subject: [PATCH 753/818] feat: Node.js 22.6.0 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 5a6551af26..43379f1bc6 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.5.1 +ENV NODE_VERSION 22.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ff98d55d319b570cc0d38070afb2ff6dee905c076993cfe3687fbd9244bc3686" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f5be81dece7dc98c84d5778fc4571fb0ecbc1699fd542c6e3c8969f33b58627c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 9c96421c46..c8321080a1 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.5.1 +ENV NODE_VERSION 22.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ff98d55d319b570cc0d38070afb2ff6dee905c076993cfe3687fbd9244bc3686" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f5be81dece7dc98c84d5778fc4571fb0ecbc1699fd542c6e3c8969f33b58627c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 09a6c8d627..5026ec4b5a 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.5.1 +ENV NODE_VERSION 22.6.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 6664d9ce26..91b202481a 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.5.1 +ENV NODE_VERSION 22.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 281f49e491..dffa129acc 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.5.1 +ENV NODE_VERSION 22.6.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 7f540f0c8b..4c495bffa2 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.5.1 +ENV NODE_VERSION 22.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 07b487b8c79fad9f1b61a68cb9128b7660cb3da1 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 19 Aug 2024 15:01:30 -0400 Subject: [PATCH 754/818] fix: Drop ppc64le from Node 22 Alpine builds Has not worked since 22 was released. Closes #2107 --- versions.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/versions.json b/versions.json index deaeb87953..9ba99925a9 100644 --- a/versions.json +++ b/versions.json @@ -13,7 +13,6 @@ "arm32v6", "arm32v7", "arm64v8", - "ppc64le", "s390x" ], "alpine3.20": [ @@ -21,7 +20,6 @@ "arm32v6", "arm32v7", "arm64v8", - "ppc64le", "s390x" ], "bookworm": [ From 410410f6955bf8d052ef3ec7988cd41a54eab879 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 21 Aug 2024 19:04:33 +0000 Subject: [PATCH 755/818] feat: Node.js 20.17.0 --- 20/alpine3.19/Dockerfile | 4 ++-- 20/alpine3.20/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index 78eab86d8b..a1d74a1f67 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.16.0 +ENV NODE_VERSION 20.17.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="40efcec63e42ca58a39cc89c99d8852bd31ea09e046966b321fd337be999651d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="913547514c21152f09d46b8b140d30dd5ea40d2e3ac4ddc6ff3e12a666bec482" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index ee64ea5d0e..bce7e7cadc 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.16.0 +ENV NODE_VERSION 20.17.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="40efcec63e42ca58a39cc89c99d8852bd31ea09e046966b321fd337be999651d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="913547514c21152f09d46b8b140d30dd5ea40d2e3ac4ddc6ff3e12a666bec482" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 6aeeae9a21..bee8e817ca 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.16.0 +ENV NODE_VERSION 20.17.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index c67c6f272e..51fdd11db9 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.16.0 +ENV NODE_VERSION 20.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index f4fa1fc5f6..5d57b1cecf 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.16.0 +ENV NODE_VERSION 20.17.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index fd3bb9adfe..515a27fb10 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.16.0 +ENV NODE_VERSION 20.17.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f60cccb5dcc65aba5fd20ecf9607f1c53722155d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 07:39:13 +0000 Subject: [PATCH 756/818] chore(deps): bump tj-actions/changed-files from 44 to 45 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 44 to 45. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v44...v45) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index bd42d4a453..3bee8120a7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v44 + uses: tj-actions/changed-files@v45 with: json: true escape_json: false From 5313e6aa0b794521a732c9913151a13384d40c9c Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 22 Aug 2024 16:24:07 +0000 Subject: [PATCH 757/818] feat: Node.js 22.7.0 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 43379f1bc6..004111bc2d 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.6.0 +ENV NODE_VERSION 22.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f5be81dece7dc98c84d5778fc4571fb0ecbc1699fd542c6e3c8969f33b58627c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="164a9b11ce4ea8cfe87e0db9f29f4becb6fbb59c2ed4f76a64eb1d0e877c3ed4" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index c8321080a1..cfdf1d4384 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.6.0 +ENV NODE_VERSION 22.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f5be81dece7dc98c84d5778fc4571fb0ecbc1699fd542c6e3c8969f33b58627c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="164a9b11ce4ea8cfe87e0db9f29f4becb6fbb59c2ed4f76a64eb1d0e877c3ed4" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 5026ec4b5a..5845e916dd 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.6.0 +ENV NODE_VERSION 22.7.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 91b202481a..54eb1857ec 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.6.0 +ENV NODE_VERSION 22.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index dffa129acc..365f952906 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.6.0 +ENV NODE_VERSION 22.7.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 4c495bffa2..f3185881da 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.6.0 +ENV NODE_VERSION 22.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 0c0069246367ac5ac0fc6bca141fb04faaca2f4b Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 3 Sep 2024 15:33:51 +0000 Subject: [PATCH 758/818] feat: Node.js 22.8.0 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 004111bc2d..7c3b2e8fdb 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.7.0 +ENV NODE_VERSION 22.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="164a9b11ce4ea8cfe87e0db9f29f4becb6fbb59c2ed4f76a64eb1d0e877c3ed4" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="03684363352ac907758b53f3bc094bcf128fa8570de9a4657531c1c54f9a335c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index cfdf1d4384..d23ba1bd98 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.7.0 +ENV NODE_VERSION 22.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="164a9b11ce4ea8cfe87e0db9f29f4becb6fbb59c2ed4f76a64eb1d0e877c3ed4" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="03684363352ac907758b53f3bc094bcf128fa8570de9a4657531c1c54f9a335c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 5845e916dd..978c577ac8 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.7.0 +ENV NODE_VERSION 22.8.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 54eb1857ec..cc2d16a8bc 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.7.0 +ENV NODE_VERSION 22.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 365f952906..1786bed6a6 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.7.0 +ENV NODE_VERSION 22.8.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index f3185881da..8abcaa86dc 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.7.0 +ENV NODE_VERSION 22.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 53aa147933392dba2aa5f579440b885dc69c5c96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 07:28:51 +0000 Subject: [PATCH 759/818] chore(deps): bump peter-evans/create-pull-request from 6 to 7 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/official-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 80cc3226c9..e9c0c4ad21 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -23,7 +23,7 @@ jobs: - name: Create update PR id: cpr - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GH_API_TOKEN }} author: "Node.js GitHub Bot " diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 3a577e2eb3..097a3ac27c 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -38,7 +38,7 @@ jobs: - name: Create PR in official-images id: create-pr - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.GH_API_TOKEN }} push-to-fork: nodejs/official-images From 58c3b39e5948f82c594395857193cd97d01c690e Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 17 Sep 2024 22:47:56 +0000 Subject: [PATCH 760/818] feat: Node.js 22.9.0 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 7c3b2e8fdb..2d3c596008 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.8.0 +ENV NODE_VERSION 22.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="03684363352ac907758b53f3bc094bcf128fa8570de9a4657531c1c54f9a335c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="6966b7e2e62a6c2f9d096697af980d02b83d92e23a68463f28f8fec9b408d093" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index d23ba1bd98..0245d5ba3d 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.8.0 +ENV NODE_VERSION 22.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="03684363352ac907758b53f3bc094bcf128fa8570de9a4657531c1c54f9a335c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="6966b7e2e62a6c2f9d096697af980d02b83d92e23a68463f28f8fec9b408d093" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 978c577ac8..db88c15f2e 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.8.0 +ENV NODE_VERSION 22.9.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index cc2d16a8bc..ed4afd9db4 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.8.0 +ENV NODE_VERSION 22.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 1786bed6a6..8c574f5518 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.8.0 +ENV NODE_VERSION 22.9.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 8abcaa86dc..02df788846 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.8.0 +ENV NODE_VERSION 22.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 57a7fa3bd00ad1fe73d1a489e552c37d61d7fdae Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Thu, 3 Oct 2024 23:28:23 -0400 Subject: [PATCH 761/818] ci: Add PR Write permission for official PR --- .github/workflows/automatic-updates.yml | 2 ++ .github/workflows/official-pr.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 80cc3226c9..e157822d0e 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -8,6 +8,8 @@ jobs: build: runs-on: ubuntu-latest if: github.repository_owner == 'nodejs' + permissions: + pull-requests: write steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 3a577e2eb3..032a2569ad 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -16,6 +16,8 @@ jobs: pr: runs-on: ubuntu-latest if: github.repository_owner == 'nodejs' && github.event.pull_request.merged_by != '' + permissions: + pull-requests: write steps: - name: Checkout the docker-node repo From 8483b3edd9cc2a38360d88d360e3093d657ac3fe Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 4 Oct 2024 11:27:57 -0400 Subject: [PATCH 762/818] feat: Node.js 20.18.0 --- 20/alpine3.19/Dockerfile | 8 +++----- 20/alpine3.20/Dockerfile | 8 +++----- 20/bookworm-slim/Dockerfile | 6 ++---- 20/bookworm/Dockerfile | 6 ++---- 20/bullseye-slim/Dockerfile | 6 ++---- 20/bullseye/Dockerfile | 6 ++---- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index a1d74a1f67..fe29479ac7 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.17.0 +ENV NODE_VERSION 20.18.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="913547514c21152f09d46b8b140d30dd5ea40d2e3ac4ddc6ff3e12a666bec482" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="757bba0adff8eaadfa7f9be2c87a35d5010ac3f71b5527e57385218c806a4fa4" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -45,14 +45,12 @@ RUN addgroup -g 1000 node \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index bce7e7cadc..47aea13b2b 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.17.0 +ENV NODE_VERSION 20.18.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="913547514c21152f09d46b8b140d30dd5ea40d2e3ac4ddc6ff3e12a666bec482" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="757bba0adff8eaadfa7f9be2c87a35d5010ac3f71b5527e57385218c806a4fa4" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -45,14 +45,12 @@ RUN addgroup -g 1000 node \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index bee8e817ca..d738839890 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.17.0 +ENV NODE_VERSION 20.18.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -27,14 +27,12 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 51fdd11db9..4423a13c7e 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.17.0 +ENV NODE_VERSION 20.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,14 +24,12 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 5d57b1cecf..9c773eabfa 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.17.0 +ENV NODE_VERSION 20.18.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -27,14 +27,12 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 515a27fb10..74b9d74f6e 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.17.0 +ENV NODE_VERSION 20.18.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,14 +24,12 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From 65c87ea4b14d4d8167b40d4b966f1014783a018f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 4 Oct 2024 13:15:46 -0400 Subject: [PATCH 763/818] fix: Drop ppc64le and x390x from Bullseye --- architectures | 4 ++-- versions.json | 24 ++++++------------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/architectures b/architectures index 1cb4bf3525..c47ac40b43 100644 --- a/architectures +++ b/architectures @@ -4,5 +4,5 @@ arm32v6 alpine3.19,alpine3.20 arm32v7 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim arm64v8 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim i386 alpine3.19,alpine3.20 -ppc64le alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim -s390x alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim +ppc64le alpine3.19,alpine3.20,bookworm,bookworm-slim +s390x alpine3.19,alpine3.20,bookworm,bookworm-slim diff --git a/versions.json b/versions.json index 9ba99925a9..912cdb85e9 100644 --- a/versions.json +++ b/versions.json @@ -39,16 +39,12 @@ "bullseye": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ], "bullseye-slim": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ] } }, @@ -94,16 +90,12 @@ "bullseye": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ], "bullseye-slim": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ] } }, @@ -149,16 +141,12 @@ "bullseye": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ], "bullseye-slim": [ "amd64", "arm32v7", - "arm64v8", - "ppc64le", - "s390x" + "arm64v8" ] } } From db969a8d0fd399fe36b113c88f992400787b6fd0 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 10 Oct 2024 12:26:15 +0200 Subject: [PATCH 764/818] Add aduh95 release key --- keys/node.keys | 1 + 1 file changed, 1 insertion(+) diff --git a/keys/node.keys b/keys/node.keys index 5ea0031e5c..36403ccde2 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,3 +1,4 @@ +C0D6248439F1D5604AAFFB4021D900FFDB233756 4ED778F539E3634C779C87C6D7062848A1AB005C 141F07595B7B3FFE74309A937405533BE57C7D57 74F12602B6F1C4E913FAA37AD3A89613643B6201 From 1ef28c2d9777d354513929cf85bca4d6fdac0dc3 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 16 Oct 2024 20:35:51 +0200 Subject: [PATCH 765/818] feat: Node.js 23.0.0 --- 23/alpine3.19/Dockerfile | 112 ++++++++++++++++++++++++++ 23/alpine3.19/docker-entrypoint.sh | 11 +++ 23/alpine3.20/Dockerfile | 112 ++++++++++++++++++++++++++ 23/alpine3.20/docker-entrypoint.sh | 11 +++ 23/bookworm-slim/Dockerfile | 106 ++++++++++++++++++++++++ 23/bookworm-slim/docker-entrypoint.sh | 11 +++ 23/bookworm/Dockerfile | 79 ++++++++++++++++++ 23/bookworm/docker-entrypoint.sh | 11 +++ 23/bullseye-slim/Dockerfile | 106 ++++++++++++++++++++++++ 23/bullseye-slim/docker-entrypoint.sh | 11 +++ 23/bullseye/Dockerfile | 79 ++++++++++++++++++ 23/bullseye/docker-entrypoint.sh | 11 +++ versions.json | 49 +++++++++++ 13 files changed, 709 insertions(+) create mode 100644 23/alpine3.19/Dockerfile create mode 100755 23/alpine3.19/docker-entrypoint.sh create mode 100644 23/alpine3.20/Dockerfile create mode 100755 23/alpine3.20/docker-entrypoint.sh create mode 100644 23/bookworm-slim/Dockerfile create mode 100755 23/bookworm-slim/docker-entrypoint.sh create mode 100644 23/bookworm/Dockerfile create mode 100755 23/bookworm/docker-entrypoint.sh create mode 100644 23/bullseye-slim/Dockerfile create mode 100755 23/bullseye-slim/docker-entrypoint.sh create mode 100644 23/bullseye/Dockerfile create mode 100755 23/bullseye/docker-entrypoint.sh diff --git a/23/alpine3.19/Dockerfile b/23/alpine3.19/Dockerfile new file mode 100644 index 0000000000..b02e9f06c9 --- /dev/null +++ b/23/alpine3.19/Dockerfile @@ -0,0 +1,112 @@ +FROM alpine:3.19 + +ENV NODE_VERSION 23.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64' CHECKSUM="738b28f80f9aedaae3a7e91db8294cb96e2f87078fe7ff8826d612405ee2d8cb" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + py-setuptools \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.22 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/23/alpine3.19/docker-entrypoint.sh b/23/alpine3.19/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/23/alpine3.19/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile new file mode 100644 index 0000000000..07da4a6448 --- /dev/null +++ b/23/alpine3.20/Dockerfile @@ -0,0 +1,112 @@ +FROM alpine:3.20 + +ENV NODE_VERSION 23.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64' CHECKSUM="738b28f80f9aedaae3a7e91db8294cb96e2f87078fe7ff8826d612405ee2d8cb" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + py-setuptools \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.22 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/23/alpine3.20/docker-entrypoint.sh b/23/alpine3.20/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/23/alpine3.20/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile new file mode 100644 index 0000000000..ce865c6517 --- /dev/null +++ b/23/bookworm-slim/Dockerfile @@ -0,0 +1,106 @@ +FROM debian:bookworm-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 23.0.0 + +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/23/bookworm-slim/docker-entrypoint.sh b/23/bookworm-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/23/bookworm-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile new file mode 100644 index 0000000000..14669f0d68 --- /dev/null +++ b/23/bookworm/Dockerfile @@ -0,0 +1,79 @@ +FROM buildpack-deps:bookworm + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 23.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/23/bookworm/docker-entrypoint.sh b/23/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/23/bookworm/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..be4d818485 --- /dev/null +++ b/23/bullseye-slim/Dockerfile @@ -0,0 +1,106 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 23.0.0 + +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/23/bullseye-slim/docker-entrypoint.sh b/23/bullseye-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/23/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile new file mode 100644 index 0000000000..d0adeea64c --- /dev/null +++ b/23/bullseye/Dockerfile @@ -0,0 +1,79 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 23.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/23/bullseye/docker-entrypoint.sh b/23/bullseye/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/23/bullseye/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index 912cdb85e9..c284cdea10 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,53 @@ { + "23": { + "start": "2024-10-15", + "lts": "", + "maintenance": "2025-04-01", + "end": "2025-06-01", + "codename": "", + "alpine-default": "alpine3.20", + "debian-default": "bookworm", + "variants": { + "alpine3.19": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "s390x" + ], + "alpine3.20": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "s390x" + ], + "bookworm": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm32v7", + "arm64v8" + ], + "bullseye-slim": [ + "amd64", + "arm32v7", + "arm64v8" + ] + } + }, "22": { "start": "2024-04-23", "lts": "2024-10-29", From 996a32420666439b409fd8d450ee99ef905ef66c Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 16 Oct 2024 22:51:22 -0400 Subject: [PATCH 766/818] feat: Node.js 22.10.0 --- 22/alpine3.19/Dockerfile | 9 ++++----- 22/alpine3.20/Dockerfile | 9 ++++----- 22/bookworm-slim/Dockerfile | 7 +++---- 22/bookworm/Dockerfile | 7 +++---- 22/bullseye-slim/Dockerfile | 7 +++---- 22/bullseye/Dockerfile | 7 +++---- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 2d3c596008..8238282c39 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.9.0 +ENV NODE_VERSION 22.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="6966b7e2e62a6c2f9d096697af980d02b83d92e23a68463f28f8fec9b408d093" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a964af3cbb33c2704739f792e2825659a93a2787253483350051bd48f6f3e8d9" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -41,18 +41,17 @@ RUN addgroup -g 1000 node \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 0245d5ba3d..cb66c15d8a 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.9.0 +ENV NODE_VERSION 22.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="6966b7e2e62a6c2f9d096697af980d02b83d92e23a68463f28f8fec9b408d093" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a964af3cbb33c2704739f792e2825659a93a2787253483350051bd48f6f3e8d9" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -41,18 +41,17 @@ RUN addgroup -g 1000 node \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index db88c15f2e..c532c54703 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.9.0 +ENV NODE_VERSION 22.10.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,18 +23,17 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index ed4afd9db4..4a8afb3513 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.9.0 +ENV NODE_VERSION 22.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,17 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 8c574f5518..b4e3a0e144 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.9.0 +ENV NODE_VERSION 22.10.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,18 +23,17 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 02df788846..bd00f63b62 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.9.0 +ENV NODE_VERSION 22.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,17 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ 4ED778F539E3634C779C87C6D7062848A1AB005C \ 141F07595B7B3FFE74309A937405533BE57C7D57 \ 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ From 2dbd665ffb68317d1719aa52f5dbf287e920e560 Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Thu, 17 Oct 2024 18:22:59 -0300 Subject: [PATCH 767/818] keys: remove Bryan English key --- keys/node.keys | 1 - 1 file changed, 1 deletion(-) diff --git a/keys/node.keys b/keys/node.keys index 36403ccde2..5ccbd3c615 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,6 +1,5 @@ C0D6248439F1D5604AAFFB4021D900FFDB233756 4ED778F539E3634C779C87C6D7062848A1AB005C -141F07595B7B3FFE74309A937405533BE57C7D57 74F12602B6F1C4E913FAA37AD3A89613643B6201 DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 CC68F5A3106FF448322E48ED27F5E38D5B0A215F From 92c06beedf36b9771edde3d3882ae77d1e29992d Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Thu, 17 Oct 2024 18:23:35 -0300 Subject: [PATCH 768/818] keys: remove Danielle Adams key --- keys/node.keys | 1 - 1 file changed, 1 deletion(-) diff --git a/keys/node.keys b/keys/node.keys index 5ccbd3c615..58fa731788 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,6 +1,5 @@ C0D6248439F1D5604AAFFB4021D900FFDB233756 4ED778F539E3634C779C87C6D7062848A1AB005C -74F12602B6F1C4E913FAA37AD3A89613643B6201 DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 CC68F5A3106FF448322E48ED27F5E38D5B0A215F 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 From 79cc3ad7995f1fb84be02329b6c57f93f65c6b4e Mon Sep 17 00:00:00 2001 From: RafaelGSS Date: Thu, 17 Oct 2024 18:24:13 -0300 Subject: [PATCH 769/818] keys: remove Beth Griggs key --- keys/node.keys | 1 - 1 file changed, 1 deletion(-) diff --git a/keys/node.keys b/keys/node.keys index 58fa731788..58e2843f0e 100644 --- a/keys/node.keys +++ b/keys/node.keys @@ -1,5 +1,4 @@ C0D6248439F1D5604AAFFB4021D900FFDB233756 -4ED778F539E3634C779C87C6D7062848A1AB005C DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 CC68F5A3106FF448322E48ED27F5E38D5B0A215F 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 From 2d3b74e18250620d799952f46935c780ef7249e3 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 22 Oct 2024 09:18:08 +0200 Subject: [PATCH 770/818] fix: correct update script to support version argument again --- functions.sh | 8 ++++++-- update.sh | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/functions.sh b/functions.sh index bee3dafe05..f16aeabdb5 100755 --- a/functions.sh +++ b/functions.sh @@ -137,12 +137,16 @@ function get_config() { # # The result is a list of valid versions. function get_versions() { + shift + local versions=() - local dirs=() + local dirs=("$@") local default_variant default_variant=$(get_config "./" "default_variant") - IFS=' ' read -ra dirs <<< "$(echo "./"*/)" + if [ ${#dirs[@]} -eq 0 ]; then + IFS=' ' read -ra dirs <<< "$(echo "./"*/)" + fi for dir in "${dirs[@]}"; do if [ -a "${dir}/Dockerfile" ] || [ -a "${dir}/${default_variant}/Dockerfile" ]; then diff --git a/update.sh b/update.sh index 0b6aaf69d6..cd73b6e22a 100755 --- a/update.sh +++ b/update.sh @@ -189,6 +189,8 @@ function update_node_version() { ) } +pids=() + for version in "${versions[@]}"; do parentpath=$(dirname "${version}") versionnum=$(basename "${version}") @@ -201,8 +203,6 @@ for version in "${versions[@]}"; do # See details in function.sh IFS=' ' read -ra variants <<< "$(get_variants "${parentpath}")" - pids=() - if [ -f "${version}/Dockerfile" ]; then if [ "${update_version}" -eq 0 ]; then update_node_version "${baseuri}" "${versionnum}" "${parentpath}/Dockerfile.template" "${version}/Dockerfile" & From 1b2a07635994e5a2cfd4dcaf92811c19a05c70f1 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 22 Oct 2024 09:29:48 +0200 Subject: [PATCH 771/818] chore: simplify update script slightly --- build-automation.mjs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-automation.mjs b/build-automation.mjs index 9a085826bd..ba296d1ed4 100644 --- a/build-automation.mjs +++ b/build-automation.mjs @@ -87,13 +87,13 @@ export default async function(github) { } else { const newVersions = await checkForMuslVersionsAndSecurityReleases(github, versions); let updatedVersions = []; - for (let version of Object.keys(newVersions)) { - if (newVersions[version].muslBuildExists) { - const { stdout } = await exec(`./update.sh ${newVersions[version].isSecurityRelease ? "-s " : ""}${version}`); + for (const [version, newVersion] of Object.entries(newVersions)) { + if (newVersion.muslBuildExists) { + const { stdout } = await exec(`./update.sh ${newVersion.isSecurityRelease ? "-s " : ""}${version}`); console.log(stdout); - updatedVersions.push(newVersions[version].fullVersion); + updatedVersions.push(newVersion.fullVersion); } else { - console.log(`There's no musl build for version ${newVersions[version].fullVersion} yet.`); + console.log(`There's no musl build for version ${newVersion.fullVersion} yet.`); process.exit(0); } } From 9d04fec54bd5f51abe840d7af0c70787b6b32de6 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 25 Oct 2024 02:01:46 -0400 Subject: [PATCH 772/818] feat: Node.js 23.1.0 --- 23/alpine3.19/Dockerfile | 7 ++----- 23/alpine3.20/Dockerfile | 7 ++----- 23/bookworm-slim/Dockerfile | 5 +---- 23/bookworm/Dockerfile | 5 +---- 23/bullseye-slim/Dockerfile | 5 +---- 23/bullseye/Dockerfile | 5 +---- 6 files changed, 8 insertions(+), 26 deletions(-) diff --git a/23/alpine3.19/Dockerfile b/23/alpine3.19/Dockerfile index b02e9f06c9..d8967dc252 100644 --- a/23/alpine3.19/Dockerfile +++ b/23/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 23.0.0 +ENV NODE_VERSION 23.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="738b28f80f9aedaae3a7e91db8294cb96e2f87078fe7ff8826d612405ee2d8cb" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="32328ab3c3c91e737d165352dab0c7ee67b89a1d00b5226d711c8bf9d15f3bfd" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -42,9 +42,6 @@ RUN addgroup -g 1000 node \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 07da4a6448..c98443d0ef 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.0.0 +ENV NODE_VERSION 23.1.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="738b28f80f9aedaae3a7e91db8294cb96e2f87078fe7ff8826d612405ee2d8cb" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="32328ab3c3c91e737d165352dab0c7ee67b89a1d00b5226d711c8bf9d15f3bfd" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -42,9 +42,6 @@ RUN addgroup -g 1000 node \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index ce865c6517..ff89093649 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.0.0 +ENV NODE_VERSION 23.1.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,9 +24,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 14669f0d68..1ad01edf7b 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.0.0 +ENV NODE_VERSION 23.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,9 +21,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index be4d818485..ade57f3a4e 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.0.0 +ENV NODE_VERSION 23.1.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,9 +24,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index d0adeea64c..9fe6627a22 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.0.0 +ENV NODE_VERSION 23.1.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,9 +21,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ From df448135e673997cc2f2fbfd9ccc4a5fed3682e9 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 25 Oct 2024 08:56:32 +0200 Subject: [PATCH 773/818] disable shellcheck rule --- functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions.sh b/functions.sh index f16aeabdb5..7c927cc081 100755 --- a/functions.sh +++ b/functions.sh @@ -136,6 +136,7 @@ function get_config() { # Get available versions for a given path # # The result is a list of valid versions. +# shellcheck disable=SC2120 function get_versions() { shift From b0de582b8d4627cc9d65a89bf3af1bfcf67d2bef Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 29 Oct 2024 16:39:22 -0400 Subject: [PATCH 774/818] feat: Node.js 22.11.0 Jod --- 22/alpine3.19/Dockerfile | 7 ++----- 22/alpine3.20/Dockerfile | 7 ++----- 22/bookworm-slim/Dockerfile | 5 +---- 22/bookworm/Dockerfile | 5 +---- 22/bullseye-slim/Dockerfile | 5 +---- 22/bullseye/Dockerfile | 5 +---- versions.json | 2 +- 7 files changed, 9 insertions(+), 27 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 8238282c39..95c263535f 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.10.0 +ENV NODE_VERSION 22.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a964af3cbb33c2704739f792e2825659a93a2787253483350051bd48f6f3e8d9" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="95e9a410b7ce732705493cd44496c8e77ccb11516c75c2ef794f19a9943d178c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -42,9 +42,6 @@ RUN addgroup -g 1000 node \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index cb66c15d8a..4104204359 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.10.0 +ENV NODE_VERSION 22.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a964af3cbb33c2704739f792e2825659a93a2787253483350051bd48f6f3e8d9" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="95e9a410b7ce732705493cd44496c8e77ccb11516c75c2ef794f19a9943d178c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -42,9 +42,6 @@ RUN addgroup -g 1000 node \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index c532c54703..2f835aa7d5 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.10.0 +ENV NODE_VERSION 22.11.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,9 +24,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 4a8afb3513..5aaa3a11d2 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.10.0 +ENV NODE_VERSION 22.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,9 +21,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index b4e3a0e144..2d1b8ce58e 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.10.0 +ENV NODE_VERSION 22.11.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -24,9 +24,6 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index bd00f63b62..0a3d0243cb 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.10.0 +ENV NODE_VERSION 22.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -21,9 +21,6 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && set -ex \ && for key in \ C0D6248439F1D5604AAFFB4021D900FFDB233756 \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/versions.json b/versions.json index c284cdea10..7a51430a21 100644 --- a/versions.json +++ b/versions.json @@ -53,7 +53,7 @@ "lts": "2024-10-29", "maintenance": "2025-10-21", "end": "2027-04-30", - "codename": "", + "codename": "jod", "alpine-default": "alpine3.20", "debian-default": "bookworm", "variants": { From e3a1285ed07039b9f6552ccec49a469a052fd0c6 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 15 Nov 2024 18:05:18 -0500 Subject: [PATCH 775/818] feat: Node.js 18.20.5 --- 18/alpine3.19/Dockerfile | 14 +++++--------- 18/alpine3.20/Dockerfile | 14 +++++--------- 18/bookworm-slim/Dockerfile | 12 ++++-------- 18/bookworm/Dockerfile | 12 ++++-------- 18/bullseye-slim/Dockerfile | 12 ++++-------- 18/bullseye/Dockerfile | 12 ++++-------- 6 files changed, 26 insertions(+), 50 deletions(-) diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.19/Dockerfile index 90f619f93d..b80c7d785c 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 18.20.4 +ENV NODE_VERSION 18.20.5 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ac4fe3bef38d5e4ecf172b46c8af1f346904afd9788ce12919e3696f601e191e" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="deaf95aceeb446d8861419884fc1d07c54e4a958e4d9b82d8fb9c8f1f7001535" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -41,18 +41,14 @@ RUN addgroup -g 1000 node \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ @@ -81,7 +77,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/18/alpine3.20/Dockerfile b/18/alpine3.20/Dockerfile index 24a668e62e..d451c14c40 100644 --- a/18/alpine3.20/Dockerfile +++ b/18/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 18.20.4 +ENV NODE_VERSION 18.20.5 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="ac4fe3bef38d5e4ecf172b46c8af1f346904afd9788ce12919e3696f601e191e" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="deaf95aceeb446d8861419884fc1d07c54e4a958e4d9b82d8fb9c8f1f7001535" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -41,18 +41,14 @@ RUN addgroup -g 1000 node \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ @@ -81,7 +77,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index a3bb4aca15..fb48a4a4e4 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.4 +ENV NODE_VERSION 18.20.5 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,18 +23,14 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ @@ -63,7 +59,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 175b9ca67e..46882f0076 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.4 +ENV NODE_VERSION 18.20.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,14 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ @@ -49,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 9571844bff..d624ab5451 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.4 +ENV NODE_VERSION 18.20.5 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,18 +23,14 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ @@ -63,7 +59,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ && savedAptMark="$(apt-mark showmanual)" \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 225426d402..7c560b5a3b 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.4 +ENV NODE_VERSION 18.20.5 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,18 +20,14 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - 61FC681DFB92A079F1685E77973F295594EC4689 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ @@ -49,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.19 +ENV YARN_VERSION 1.22.22 RUN set -ex \ # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 From bd5c1ad707a39db0f333a502d9bc47e1a5e0358d Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 15 Nov 2024 18:05:55 -0500 Subject: [PATCH 776/818] feat: Node.js 23.2.0 --- 23/alpine3.19/Dockerfile | 4 ++-- 23/alpine3.20/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.19/Dockerfile b/23/alpine3.19/Dockerfile index d8967dc252..91250d9395 100644 --- a/23/alpine3.19/Dockerfile +++ b/23/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 23.1.0 +ENV NODE_VERSION 23.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="32328ab3c3c91e737d165352dab0c7ee67b89a1d00b5226d711c8bf9d15f3bfd" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f18743f83257afaae7cfadea5657b1b283b15ff0a865fa6235d80505d1db4e22" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index c98443d0ef..920723b4db 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.1.0 +ENV NODE_VERSION 23.2.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="32328ab3c3c91e737d165352dab0c7ee67b89a1d00b5226d711c8bf9d15f3bfd" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f18743f83257afaae7cfadea5657b1b283b15ff0a865fa6235d80505d1db4e22" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index ff89093649..4059cb761a 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.1.0 +ENV NODE_VERSION 23.2.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 1ad01edf7b..41ea6d888d 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.1.0 +ENV NODE_VERSION 23.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index ade57f3a4e..8c14e59a9f 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.1.0 +ENV NODE_VERSION 23.2.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index 9fe6627a22..d0edf64e52 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.1.0 +ENV NODE_VERSION 23.2.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 4b3806368e98354d59c4787b46ec72603be13162 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 20 Nov 2024 16:05:40 +0000 Subject: [PATCH 777/818] feat: Node.js 20.18.1 --- 20/alpine3.19/Dockerfile | 8 +++----- 20/alpine3.20/Dockerfile | 8 +++----- 20/bookworm-slim/Dockerfile | 6 ++---- 20/bookworm/Dockerfile | 6 ++---- 20/bullseye-slim/Dockerfile | 6 ++---- 20/bullseye/Dockerfile | 6 ++---- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.19/Dockerfile index fe29479ac7..43d76df971 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 20.18.0 +ENV NODE_VERSION 20.18.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="757bba0adff8eaadfa7f9be2c87a35d5010ac3f71b5527e57385218c806a4fa4" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5ebbebaf673652c1868a05b442e82ed5b3f536aa03231f285e739d35b912dc5d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -41,9 +41,7 @@ RUN addgroup -g 1000 node \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 47aea13b2b..85291cee1f 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.18.0 +ENV NODE_VERSION 20.18.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="757bba0adff8eaadfa7f9be2c87a35d5010ac3f71b5527e57385218c806a4fa4" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5ebbebaf673652c1868a05b442e82ed5b3f536aa03231f285e739d35b912dc5d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -41,9 +41,7 @@ RUN addgroup -g 1000 node \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index d738839890..7b61b0ebec 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.0 +ENV NODE_VERSION 20.18.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,9 +23,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 4423a13c7e..e34f10fb53 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.0 +ENV NODE_VERSION 20.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,9 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 9c773eabfa..93f78545d4 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.18.0 +ENV NODE_VERSION 20.18.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -23,9 +23,7 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 74b9d74f6e..5853b65aff 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.18.0 +ENV NODE_VERSION 20.18.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -20,9 +20,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && set -ex \ && for key in \ - 4ED778F539E3634C779C87C6D7062848A1AB005C \ - 141F07595B7B3FFE74309A937405533BE57C7D57 \ - 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ From afd30081595671f7bee68d6e95d7751126666409 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 21 Nov 2024 00:48:36 +0000 Subject: [PATCH 778/818] feat: Node.js 23.3.0 --- 23/alpine3.19/Dockerfile | 4 ++-- 23/alpine3.20/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.19/Dockerfile b/23/alpine3.19/Dockerfile index 91250d9395..083ecc2625 100644 --- a/23/alpine3.19/Dockerfile +++ b/23/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 23.2.0 +ENV NODE_VERSION 23.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f18743f83257afaae7cfadea5657b1b283b15ff0a865fa6235d80505d1db4e22" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="c64c0a9286fad95e9dda33f4af728fad68cd7a08eeb09651bd70c39356bbb518" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 920723b4db..efe0846329 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.2.0 +ENV NODE_VERSION 23.3.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f18743f83257afaae7cfadea5657b1b283b15ff0a865fa6235d80505d1db4e22" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="c64c0a9286fad95e9dda33f4af728fad68cd7a08eeb09651bd70c39356bbb518" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index 4059cb761a..c8d7364be1 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.2.0 +ENV NODE_VERSION 23.3.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 41ea6d888d..0dbf8ade93 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.2.0 +ENV NODE_VERSION 23.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 8c14e59a9f..71c6e5d2a0 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.2.0 +ENV NODE_VERSION 23.3.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index d0edf64e52..cbfff39c14 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.2.0 +ENV NODE_VERSION 23.3.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 65db94be7f70f68f510a9e065c256b954d8f271c Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 3 Dec 2024 22:23:01 +0000 Subject: [PATCH 779/818] feat: Node.js 22.12.0 --- 22/alpine3.19/Dockerfile | 4 ++-- 22/alpine3.20/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.19/Dockerfile index 95c263535f..16bbd79d93 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.19/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.19 -ENV NODE_VERSION 22.11.0 +ENV NODE_VERSION 22.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="95e9a410b7ce732705493cd44496c8e77ccb11516c75c2ef794f19a9943d178c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="43532120bad06cdea17c2ffba81ebfcff4611532a3569ef996faa39aadcbc759" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 4104204359..f4539b8aa6 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.11.0 +ENV NODE_VERSION 22.12.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="95e9a410b7ce732705493cd44496c8e77ccb11516c75c2ef794f19a9943d178c" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="43532120bad06cdea17c2ffba81ebfcff4611532a3569ef996faa39aadcbc759" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 2f835aa7d5..1af3036cbd 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.11.0 +ENV NODE_VERSION 22.12.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 5aaa3a11d2..2c949cc02b 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.11.0 +ENV NODE_VERSION 22.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 2d1b8ce58e..533227682d 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.11.0 +ENV NODE_VERSION 22.12.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 0a3d0243cb..7bc572dfc5 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.11.0 +ENV NODE_VERSION 22.12.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 12a54cd19fc05ecaf5a9aecc9e5280a37057835f Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 5 Dec 2024 14:16:16 +0100 Subject: [PATCH 780/818] Add Alpine 3.21 and drop 3.19 --- 18/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 20/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 22/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 23/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- .../docker-entrypoint.sh | 0 architectures | 14 +++++------ versions.json | 24 +++++++++---------- 10 files changed, 23 insertions(+), 23 deletions(-) rename 18/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 18/{alpine3.19 => alpine3.21}/docker-entrypoint.sh (100%) rename 20/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 20/{alpine3.19 => alpine3.21}/docker-entrypoint.sh (100%) rename 22/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 22/{alpine3.19 => alpine3.21}/docker-entrypoint.sh (100%) rename 23/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 23/{alpine3.19 => alpine3.21}/docker-entrypoint.sh (100%) diff --git a/18/alpine3.19/Dockerfile b/18/alpine3.21/Dockerfile similarity index 99% rename from 18/alpine3.19/Dockerfile rename to 18/alpine3.21/Dockerfile index b80c7d785c..4e8a135dd4 100644 --- a/18/alpine3.19/Dockerfile +++ b/18/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.21 ENV NODE_VERSION 18.20.5 diff --git a/18/alpine3.19/docker-entrypoint.sh b/18/alpine3.21/docker-entrypoint.sh similarity index 100% rename from 18/alpine3.19/docker-entrypoint.sh rename to 18/alpine3.21/docker-entrypoint.sh diff --git a/20/alpine3.19/Dockerfile b/20/alpine3.21/Dockerfile similarity index 99% rename from 20/alpine3.19/Dockerfile rename to 20/alpine3.21/Dockerfile index 43d76df971..25e642906f 100644 --- a/20/alpine3.19/Dockerfile +++ b/20/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.21 ENV NODE_VERSION 20.18.1 diff --git a/20/alpine3.19/docker-entrypoint.sh b/20/alpine3.21/docker-entrypoint.sh similarity index 100% rename from 20/alpine3.19/docker-entrypoint.sh rename to 20/alpine3.21/docker-entrypoint.sh diff --git a/22/alpine3.19/Dockerfile b/22/alpine3.21/Dockerfile similarity index 99% rename from 22/alpine3.19/Dockerfile rename to 22/alpine3.21/Dockerfile index 16bbd79d93..6453497a99 100644 --- a/22/alpine3.19/Dockerfile +++ b/22/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.21 ENV NODE_VERSION 22.12.0 diff --git a/22/alpine3.19/docker-entrypoint.sh b/22/alpine3.21/docker-entrypoint.sh similarity index 100% rename from 22/alpine3.19/docker-entrypoint.sh rename to 22/alpine3.21/docker-entrypoint.sh diff --git a/23/alpine3.19/Dockerfile b/23/alpine3.21/Dockerfile similarity index 99% rename from 23/alpine3.19/Dockerfile rename to 23/alpine3.21/Dockerfile index 083ecc2625..0646fd5cd7 100644 --- a/23/alpine3.19/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19 +FROM alpine:3.21 ENV NODE_VERSION 23.3.0 diff --git a/23/alpine3.19/docker-entrypoint.sh b/23/alpine3.21/docker-entrypoint.sh similarity index 100% rename from 23/alpine3.19/docker-entrypoint.sh rename to 23/alpine3.21/docker-entrypoint.sh diff --git a/architectures b/architectures index c47ac40b43..7de7376da5 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim -arm32v6 alpine3.19,alpine3.20 -arm32v7 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim -arm64v8 alpine3.19,alpine3.20,bookworm,bookworm-slim,bullseye,bullseye-slim -i386 alpine3.19,alpine3.20 -ppc64le alpine3.19,alpine3.20,bookworm,bookworm-slim -s390x alpine3.19,alpine3.20,bookworm,bookworm-slim +amd64 alpine3.20,alpine3.21,bookworm,bookworm-slim,bullseye,bullseye-slim +arm32v6 alpine3.20,alpine3.21 +arm32v7 alpine3.20,alpine3.21,bookworm,bookworm-slim,bullseye,bullseye-slim +arm64v8 alpine3.20,alpine3.21,bookworm,bookworm-slim,bullseye,bullseye-slim +i386 alpine3.20,alpine3.21 +ppc64le alpine3.20,alpine3.21,bookworm,bookworm-slim +s390x alpine3.20,alpine3.21,bookworm,bookworm-slim diff --git a/versions.json b/versions.json index 7a51430a21..d12fe3ad9f 100644 --- a/versions.json +++ b/versions.json @@ -5,17 +5,17 @@ "maintenance": "2025-04-01", "end": "2025-06-01", "codename": "", - "alpine-default": "alpine3.20", + "alpine-default": "alpine3.21", "debian-default": "bookworm", "variants": { - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", "arm64v8", "s390x" ], - "alpine3.20": [ + "alpine3.21": [ "amd64", "arm32v6", "arm32v7", @@ -54,17 +54,17 @@ "maintenance": "2025-10-21", "end": "2027-04-30", "codename": "jod", - "alpine-default": "alpine3.20", + "alpine-default": "alpine3.21", "debian-default": "bookworm", "variants": { - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", "arm64v8", "s390x" ], - "alpine3.20": [ + "alpine3.21": [ "amd64", "arm32v6", "arm32v7", @@ -103,10 +103,10 @@ "maintenance": "2024-10-22", "end": "2026-04-30", "codename": "iron", - "alpine-default": "alpine3.20", + "alpine-default": "alpine3.21", "debian-default": "bookworm", "variants": { - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", @@ -114,7 +114,7 @@ "ppc64le", "s390x" ], - "alpine3.20": [ + "alpine3.21": [ "amd64", "arm32v6", "arm32v7", @@ -154,10 +154,10 @@ "maintenance": "2023-10-18", "end": "2025-04-30", "codename": "hydrogen", - "alpine-default": "alpine3.20", + "alpine-default": "alpine3.21", "debian-default": "bookworm", "variants": { - "alpine3.19": [ + "alpine3.20": [ "amd64", "arm32v6", "arm32v7", @@ -165,7 +165,7 @@ "ppc64le", "s390x" ], - "alpine3.20": [ + "alpine3.21": [ "amd64", "arm32v6", "arm32v7", From 69835363827e3336ee652c63a413d1849bd2f401 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 10 Dec 2024 17:35:50 +0000 Subject: [PATCH 781/818] feat: Node.js 23.4.0 --- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index efe0846329..243e522fdc 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.3.0 +ENV NODE_VERSION 23.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="c64c0a9286fad95e9dda33f4af728fad68cd7a08eeb09651bd70c39356bbb518" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e1c590d8b6e8fcaa91bc42ad7a892e232eb1cfbfa139d64672da10e1b23ee95b" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index 0646fd5cd7..74052f48be 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.3.0 +ENV NODE_VERSION 23.4.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="c64c0a9286fad95e9dda33f4af728fad68cd7a08eeb09651bd70c39356bbb518" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e1c590d8b6e8fcaa91bc42ad7a892e232eb1cfbfa139d64672da10e1b23ee95b" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index c8d7364be1..3fd7740a8a 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.3.0 +ENV NODE_VERSION 23.4.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 0dbf8ade93..99759a52fd 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.3.0 +ENV NODE_VERSION 23.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 71c6e5d2a0..b313dff1ee 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.3.0 +ENV NODE_VERSION 23.4.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index cbfff39c14..76b48fd190 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.3.0 +ENV NODE_VERSION 23.4.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 74a1f79f7ad352d42d76e4bca800c900bf96a434 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 19 Dec 2024 20:48:00 +0000 Subject: [PATCH 782/818] feat: Node.js 23.5.0 --- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 243e522fdc..b19f3a9f21 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.4.0 +ENV NODE_VERSION 23.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e1c590d8b6e8fcaa91bc42ad7a892e232eb1cfbfa139d64672da10e1b23ee95b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a5631cbec5b8b3c3d45ad44d9195101799938d7ebde0d364b15de6a7f8d2e87a" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index 74052f48be..e83cee7c8d 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.4.0 +ENV NODE_VERSION 23.5.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e1c590d8b6e8fcaa91bc42ad7a892e232eb1cfbfa139d64672da10e1b23ee95b" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="a5631cbec5b8b3c3d45ad44d9195101799938d7ebde0d364b15de6a7f8d2e87a" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index 3fd7740a8a..9e00302d25 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.4.0 +ENV NODE_VERSION 23.5.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 99759a52fd..c2afac9785 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.4.0 +ENV NODE_VERSION 23.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index b313dff1ee..f139aba16c 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.4.0 +ENV NODE_VERSION 23.5.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index 76b48fd190..0d4922c272 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.4.0 +ENV NODE_VERSION 23.5.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 056ab875500526e5088b49131c258575bf7c35c0 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 7 Jan 2025 23:47:58 +0000 Subject: [PATCH 783/818] feat: Node.js 22.13.0, 23.6.0 --- 22/alpine3.20/Dockerfile | 4 ++-- 22/alpine3.21/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index f4539b8aa6..1e4e365311 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.12.0 +ENV NODE_VERSION 22.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="43532120bad06cdea17c2ffba81ebfcff4611532a3569ef996faa39aadcbc759" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="b141da31e46584e92b88b46f578ef0465fab93a7d39a25d0477f9b5a45a79922" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.21/Dockerfile b/22/alpine3.21/Dockerfile index 6453497a99..8d32145c97 100644 --- a/22/alpine3.21/Dockerfile +++ b/22/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 22.12.0 +ENV NODE_VERSION 22.13.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="43532120bad06cdea17c2ffba81ebfcff4611532a3569ef996faa39aadcbc759" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="b141da31e46584e92b88b46f578ef0465fab93a7d39a25d0477f9b5a45a79922" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 1af3036cbd..31a64e9229 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.12.0 +ENV NODE_VERSION 22.13.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 2c949cc02b..69ccfffd59 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.12.0 +ENV NODE_VERSION 22.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 533227682d..bb8be674ff 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.12.0 +ENV NODE_VERSION 22.13.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 7bc572dfc5..f852a93117 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.12.0 +ENV NODE_VERSION 22.13.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index b19f3a9f21..381fa43357 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.5.0 +ENV NODE_VERSION 23.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a5631cbec5b8b3c3d45ad44d9195101799938d7ebde0d364b15de6a7f8d2e87a" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="0544730912d9f47b754d469177cba54d586dda2928e7eff16d82b7b02e330fc5" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index e83cee7c8d..7ab25a3928 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.5.0 +ENV NODE_VERSION 23.6.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="a5631cbec5b8b3c3d45ad44d9195101799938d7ebde0d364b15de6a7f8d2e87a" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="0544730912d9f47b754d469177cba54d586dda2928e7eff16d82b7b02e330fc5" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index 9e00302d25..f314579128 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.5.0 +ENV NODE_VERSION 23.6.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index c2afac9785..74649124cb 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.5.0 +ENV NODE_VERSION 23.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index f139aba16c..85d319a38d 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.5.0 +ENV NODE_VERSION 23.6.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index 0d4922c272..3f015b844b 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.5.0 +ENV NODE_VERSION 23.6.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 655ca3407c7fdc5544a385242a7c0805115cd280 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Thu, 16 Jan 2025 12:23:37 -0500 Subject: [PATCH 784/818] docs: Use numeric uid instead of username in Dockerfile Systems configured to disallow running images as root aren't able to run images that use user name string values for the `USER` because they can't validate that a named user isn't root. To allow images to run on such systems, use the uid of the user as the value for `USER` instead of the username. See: https://github.com/kubernetes/kubernetes/pull/56503 --- docs/BestPractices.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/BestPractices.md b/docs/BestPractices.md index 2f1a416854..ad6dcc4e92 100644 --- a/docs/BestPractices.md +++ b/docs/BestPractices.md @@ -98,7 +98,7 @@ You can also include Tini [directly in your Dockerfile](https://github.com/krall ## Non-root User -By default, Docker runs commands inside the container as root which violates the [Principle of Least Privilege (PoLP)](https://en.wikipedia.org/wiki/Principle_of_least_privilege) when superuser permissions are not strictly required. You want to run the container as an unprivileged user whenever possible. The node images provide the `node` user for such purpose. The Docker Image can then be run with the `node` user in the following way: +By default, Docker runs commands inside the container as root which violates the [Principle of Least Privilege (PoLP)](https://en.wikipedia.org/wiki/Principle_of_least_privilege) when superuser permissions are not strictly required. You want to run the container as an unprivileged user whenever possible. The node images provide the `node` user with uid 1000 for such purpose. The Docker Image can then be run with the `node` user in the following way: ``` -u "node" @@ -110,7 +110,7 @@ Alternatively, the user can be activated in the `Dockerfile`: FROM node:6.10.3 ... # At the end, set the user to use when running this image -USER node +USER 1000 # node ``` Note that the `node` user is neither a build-time nor a run-time dependency and it can be removed or altered, as long as the functionality of the application you want to add to the container does not depend on it. From a35f40787c5c4744ad52af7ba0f55034a7fa3481 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 22 Jan 2025 10:33:09 +0800 Subject: [PATCH 785/818] Node.js January 2025 security release for v18, v20, v22, and v23 Reference: - https://nodejs.org/en/blog/vulnerability/january-2025-security-releases - https://nodejs.org/en/blog/release/v18.20.6 - https://nodejs.org/en/blog/release/v20.18.2 - https://nodejs.org/en/blog/release/v22.13.1 - https://nodejs.org/en/blog/release/v23.6.1 --- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 20/alpine3.20/Dockerfile | 4 ++-- 20/alpine3.21/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 22/alpine3.20/Dockerfile | 4 ++-- 22/alpine3.21/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index fb48a4a4e4..54ebced9eb 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.5 +ENV NODE_VERSION 18.20.6 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 46882f0076..fb388d80e5 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.5 +ENV NODE_VERSION 18.20.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index d624ab5451..5bf18e37f0 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.5 +ENV NODE_VERSION 18.20.6 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 7c560b5a3b..52d4ffbd1e 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.5 +ENV NODE_VERSION 18.20.6 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 85291cee1f..999ef9ef88 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.18.1 +ENV NODE_VERSION 20.18.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5ebbebaf673652c1868a05b442e82ed5b3f536aa03231f285e739d35b912dc5d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="b7e78c523c18168074cda97790eac4fc9f00dbfc09052ad5ccc91c36df527265" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.21/Dockerfile b/20/alpine3.21/Dockerfile index 25e642906f..9907d4baea 100644 --- a/20/alpine3.21/Dockerfile +++ b/20/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 20.18.1 +ENV NODE_VERSION 20.18.2 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5ebbebaf673652c1868a05b442e82ed5b3f536aa03231f285e739d35b912dc5d" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="b7e78c523c18168074cda97790eac4fc9f00dbfc09052ad5ccc91c36df527265" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index 7b61b0ebec..f97c49c678 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.1 +ENV NODE_VERSION 20.18.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index e34f10fb53..0169dee231 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.1 +ENV NODE_VERSION 20.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 93f78545d4..f3968b67fe 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.18.1 +ENV NODE_VERSION 20.18.2 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 5853b65aff..7d7be85cd0 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.18.1 +ENV NODE_VERSION 20.18.2 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 1e4e365311..e28ae424dd 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.13.0 +ENV NODE_VERSION 22.13.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b141da31e46584e92b88b46f578ef0465fab93a7d39a25d0477f9b5a45a79922" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2458e9ca2f2acaeb4e5348d94541e2dcdd589edc2dbe63c07ccca09dff0d9d28" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.21/Dockerfile b/22/alpine3.21/Dockerfile index 8d32145c97..659edfbed1 100644 --- a/22/alpine3.21/Dockerfile +++ b/22/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 22.13.0 +ENV NODE_VERSION 22.13.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b141da31e46584e92b88b46f578ef0465fab93a7d39a25d0477f9b5a45a79922" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2458e9ca2f2acaeb4e5348d94541e2dcdd589edc2dbe63c07ccca09dff0d9d28" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 31a64e9229..9caaa33961 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.13.0 +ENV NODE_VERSION 22.13.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 69ccfffd59..295b8efb01 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.13.0 +ENV NODE_VERSION 22.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index bb8be674ff..51ffab89df 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.13.0 +ENV NODE_VERSION 22.13.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index f852a93117..da456c1dfe 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.13.0 +ENV NODE_VERSION 22.13.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 381fa43357..29ff96b469 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.6.0 +ENV NODE_VERSION 23.6.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="0544730912d9f47b754d469177cba54d586dda2928e7eff16d82b7b02e330fc5" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="07ca7bd1b315fd185bd125a72b005b6367c91ba96973fcc4ee161c472a70dfda" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index 7ab25a3928..85f0240b4a 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.6.0 +ENV NODE_VERSION 23.6.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="0544730912d9f47b754d469177cba54d586dda2928e7eff16d82b7b02e330fc5" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="07ca7bd1b315fd185bd125a72b005b6367c91ba96973fcc4ee161c472a70dfda" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index f314579128..68ea408464 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.6.0 +ENV NODE_VERSION 23.6.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 74649124cb..7afc3f41aa 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.6.0 +ENV NODE_VERSION 23.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 85d319a38d..67430b3c17 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.6.0 +ENV NODE_VERSION 23.6.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index 3f015b844b..098f4347bb 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.6.0 +ENV NODE_VERSION 23.6.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From a2d83853f45a2de0ec832474b45e552f8cfeb6c4 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 22 Jan 2025 06:48:46 +0000 Subject: [PATCH 786/818] feat: Node.js 18.20.6 --- 18/alpine3.20/Dockerfile | 4 ++-- 18/alpine3.21/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/18/alpine3.20/Dockerfile b/18/alpine3.20/Dockerfile index d451c14c40..b6ee453955 100644 --- a/18/alpine3.20/Dockerfile +++ b/18/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 18.20.5 +ENV NODE_VERSION 18.20.6 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="deaf95aceeb446d8861419884fc1d07c54e4a958e4d9b82d8fb9c8f1f7001535" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="9919b24d4b9973cdd99c5b630ba3d5adc1b71c8f5471fd7a394539451f7e370e" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.21/Dockerfile b/18/alpine3.21/Dockerfile index 4e8a135dd4..e1c0357c8c 100644 --- a/18/alpine3.21/Dockerfile +++ b/18/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 18.20.5 +ENV NODE_VERSION 18.20.6 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="deaf95aceeb446d8861419884fc1d07c54e4a958e4d9b82d8fb9c8f1f7001535" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="9919b24d4b9973cdd99c5b630ba3d5adc1b71c8f5471fd7a394539451f7e370e" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ From a3e68b35ee4441d2c11761e0cdd76d313be88caa Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 31 Jan 2025 17:21:26 +0000 Subject: [PATCH 787/818] feat: Node.js 23.7.0 --- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 29ff96b469..b4085aca4b 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.6.1 +ENV NODE_VERSION 23.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="07ca7bd1b315fd185bd125a72b005b6367c91ba96973fcc4ee161c472a70dfda" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="35fa7bfe4a254968ede91cb97dafac426bfa50860a5039fecaff72dca2d08e89" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index 85f0240b4a..d8bea66310 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.6.1 +ENV NODE_VERSION 23.7.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="07ca7bd1b315fd185bd125a72b005b6367c91ba96973fcc4ee161c472a70dfda" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="35fa7bfe4a254968ede91cb97dafac426bfa50860a5039fecaff72dca2d08e89" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index 68ea408464..341c53b341 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.6.1 +ENV NODE_VERSION 23.7.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 7afc3f41aa..4d21f037d4 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.6.1 +ENV NODE_VERSION 23.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 67430b3c17..2a230cb830 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.6.1 +ENV NODE_VERSION 23.7.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index 098f4347bb..d441fbad20 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.6.1 +ENV NODE_VERSION 23.7.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 6e130ce34626be3646f566d40cd78357b1a0a73f Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Mon, 10 Feb 2025 15:34:31 +0000 Subject: [PATCH 788/818] feat: Node.js 20.18.3 --- 20/alpine3.20/Dockerfile | 4 ++-- 20/alpine3.21/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 999ef9ef88..480e8b1155 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.18.2 +ENV NODE_VERSION 20.18.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b7e78c523c18168074cda97790eac4fc9f00dbfc09052ad5ccc91c36df527265" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e559c7e9fbaca994cdf25f116257bd5e48851f82eeddbc1a56857a1f9a58d882" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.21/Dockerfile b/20/alpine3.21/Dockerfile index 9907d4baea..45990d5f5e 100644 --- a/20/alpine3.21/Dockerfile +++ b/20/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 20.18.2 +ENV NODE_VERSION 20.18.3 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b7e78c523c18168074cda97790eac4fc9f00dbfc09052ad5ccc91c36df527265" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="e559c7e9fbaca994cdf25f116257bd5e48851f82eeddbc1a56857a1f9a58d882" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index f97c49c678..b14355e7a7 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.2 +ENV NODE_VERSION 20.18.3 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 0169dee231..d35772314d 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.2 +ENV NODE_VERSION 20.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index f3968b67fe..0140d1ff0f 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.18.2 +ENV NODE_VERSION 20.18.3 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 7d7be85cd0..d2bd3ace81 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.18.2 +ENV NODE_VERSION 20.18.3 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 258c1a40754047657c4d8cdb6df5042785584821 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 13 Feb 2025 05:05:05 +0000 Subject: [PATCH 789/818] feat: Node.js 22.14.0 --- 22/alpine3.20/Dockerfile | 4 ++-- 22/alpine3.21/Dockerfile | 4 ++-- 22/bookworm-slim/Dockerfile | 2 +- 22/bookworm/Dockerfile | 2 +- 22/bullseye-slim/Dockerfile | 2 +- 22/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index e28ae424dd..780123b86b 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.13.1 +ENV NODE_VERSION 22.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="2458e9ca2f2acaeb4e5348d94541e2dcdd589edc2dbe63c07ccca09dff0d9d28" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="87f163387ac85df69df6eeb863a6b6a1aa789b49cda1c495871c0fe360634db3" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/alpine3.21/Dockerfile b/22/alpine3.21/Dockerfile index 659edfbed1..6e48b32706 100644 --- a/22/alpine3.21/Dockerfile +++ b/22/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 22.13.1 +ENV NODE_VERSION 22.14.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="2458e9ca2f2acaeb4e5348d94541e2dcdd589edc2dbe63c07ccca09dff0d9d28" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="87f163387ac85df69df6eeb863a6b6a1aa789b49cda1c495871c0fe360634db3" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 9caaa33961..9f80da69e7 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.13.1 +ENV NODE_VERSION 22.14.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index 295b8efb01..ad19cb7495 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.13.1 +ENV NODE_VERSION 22.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index 51ffab89df..ecfaad60fe 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.13.1 +ENV NODE_VERSION 22.14.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index da456c1dfe..281c738982 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.13.1 +ENV NODE_VERSION 22.14.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From a3bf3e770e23c5c9e0d314f39be62d9148d9d7d3 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 13 Feb 2025 19:20:00 +0000 Subject: [PATCH 790/818] feat: Node.js 23.8.0 --- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index b4085aca4b..4646e87b0d 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.7.0 +ENV NODE_VERSION 23.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="35fa7bfe4a254968ede91cb97dafac426bfa50860a5039fecaff72dca2d08e89" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="7338f14b026076458fc038bac5b2f6917d0d4d980aa6b802a3bf0d8d4f13a15e" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index d8bea66310..1f47802b15 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.7.0 +ENV NODE_VERSION 23.8.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="35fa7bfe4a254968ede91cb97dafac426bfa50860a5039fecaff72dca2d08e89" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="7338f14b026076458fc038bac5b2f6917d0d4d980aa6b802a3bf0d8d4f13a15e" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index 341c53b341..4809bcfaec 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.7.0 +ENV NODE_VERSION 23.8.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 4d21f037d4..b09f5b3ed4 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.7.0 +ENV NODE_VERSION 23.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 2a230cb830..688d6cecc1 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.7.0 +ENV NODE_VERSION 23.8.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index d441fbad20..25524e6455 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.7.0 +ENV NODE_VERSION 23.8.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8a3f5368104b97735752f4f00c9599b7758a924d Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 20 Feb 2025 11:20:37 +0000 Subject: [PATCH 791/818] feat: Node.js 18.20.7 --- 18/alpine3.20/Dockerfile | 4 ++-- 18/alpine3.21/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.20/Dockerfile b/18/alpine3.20/Dockerfile index b6ee453955..30a5e0b303 100644 --- a/18/alpine3.20/Dockerfile +++ b/18/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 18.20.6 +ENV NODE_VERSION 18.20.7 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="9919b24d4b9973cdd99c5b630ba3d5adc1b71c8f5471fd7a394539451f7e370e" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f582108b1fdbceb4c428c34ddc9ad6d61e1b8d8d2c53843138b571aa35b88039" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.21/Dockerfile b/18/alpine3.21/Dockerfile index e1c0357c8c..7a1e44cef0 100644 --- a/18/alpine3.21/Dockerfile +++ b/18/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 18.20.6 +ENV NODE_VERSION 18.20.7 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="9919b24d4b9973cdd99c5b630ba3d5adc1b71c8f5471fd7a394539451f7e370e" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="f582108b1fdbceb4c428c34ddc9ad6d61e1b8d8d2c53843138b571aa35b88039" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 54ebced9eb..5ca9bd9f6b 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.6 +ENV NODE_VERSION 18.20.7 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index fb388d80e5..537a93cb20 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.6 +ENV NODE_VERSION 18.20.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index 5bf18e37f0..a2e12df937 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.6 +ENV NODE_VERSION 18.20.7 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index 52d4ffbd1e..de1e1223f8 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.6 +ENV NODE_VERSION 18.20.7 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From f35bdf80efb8a272a9ee75fb48e2c22652e28689 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 26 Feb 2025 18:24:17 +0000 Subject: [PATCH 792/818] feat: Node.js 23.9.0 --- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 4646e87b0d..3787a72889 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.8.0 +ENV NODE_VERSION 23.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="7338f14b026076458fc038bac5b2f6917d0d4d980aa6b802a3bf0d8d4f13a15e" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="db3370adbc022f112ed6da738fec0a04399147c01e0474503880bc1dfc82e207" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index 1f47802b15..3e9ec0ec9f 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.8.0 +ENV NODE_VERSION 23.9.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="7338f14b026076458fc038bac5b2f6917d0d4d980aa6b802a3bf0d8d4f13a15e" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="db3370adbc022f112ed6da738fec0a04399147c01e0474503880bc1dfc82e207" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index 4809bcfaec..9b31f5d423 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.8.0 +ENV NODE_VERSION 23.9.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index b09f5b3ed4..d3c765aa51 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.8.0 +ENV NODE_VERSION 23.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 688d6cecc1..323dae3165 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.8.0 +ENV NODE_VERSION 23.9.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index 25524e6455..f3aa856625 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.8.0 +ENV NODE_VERSION 23.9.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From e028becede0527249b105c22a3881412641b6d45 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 13 Mar 2025 14:48:02 +0000 Subject: [PATCH 793/818] feat: Node.js 20.19.0 --- 20/alpine3.20/Dockerfile | 4 ++-- 20/alpine3.21/Dockerfile | 4 ++-- 20/bookworm-slim/Dockerfile | 2 +- 20/bookworm/Dockerfile | 2 +- 20/bullseye-slim/Dockerfile | 2 +- 20/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index 480e8b1155..eefb5033f2 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.18.3 +ENV NODE_VERSION 20.19.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e559c7e9fbaca994cdf25f116257bd5e48851f82eeddbc1a56857a1f9a58d882" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="b2a58593a9de31ca444fe095cb2db0674bdccab426ee6803110ca17867bdac26" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/alpine3.21/Dockerfile b/20/alpine3.21/Dockerfile index 45990d5f5e..e709440cd6 100644 --- a/20/alpine3.21/Dockerfile +++ b/20/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 20.18.3 +ENV NODE_VERSION 20.19.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="e559c7e9fbaca994cdf25f116257bd5e48851f82eeddbc1a56857a1f9a58d882" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="b2a58593a9de31ca444fe095cb2db0674bdccab426ee6803110ca17867bdac26" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index b14355e7a7..bf0a026488 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.3 +ENV NODE_VERSION 20.19.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index d35772314d..907c1da13f 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.18.3 +ENV NODE_VERSION 20.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 0140d1ff0f..99f4d6949d 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.18.3 +ENV NODE_VERSION 20.19.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index d2bd3ace81..9fbef30b15 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.18.3 +ENV NODE_VERSION 20.19.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From b788efbf945fcfdfbaa961ad1f081b89adb0c56f Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Fri, 14 Mar 2025 00:48:35 +0000 Subject: [PATCH 794/818] feat: Node.js 23.10.0 --- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 3787a72889..5dc4dfaeed 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.9.0 +ENV NODE_VERSION 23.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="db3370adbc022f112ed6da738fec0a04399147c01e0474503880bc1dfc82e207" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="0fb1f4ad7cc03e6211fb5d4876b61f6d96e4166e62ba9ee4bcf1db6fe9d32181" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index 3e9ec0ec9f..fdcfb3048f 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.9.0 +ENV NODE_VERSION 23.10.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="db3370adbc022f112ed6da738fec0a04399147c01e0474503880bc1dfc82e207" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="0fb1f4ad7cc03e6211fb5d4876b61f6d96e4166e62ba9ee4bcf1db6fe9d32181" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index 9b31f5d423..e6292f6ca2 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.9.0 +ENV NODE_VERSION 23.10.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index d3c765aa51..183c6a67a0 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.9.0 +ENV NODE_VERSION 23.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 323dae3165..9e33f5fadb 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.9.0 +ENV NODE_VERSION 23.10.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index f3aa856625..8eec64af8d 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.9.0 +ENV NODE_VERSION 23.10.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 1150bf9d532338e2378caaab0f0938bb47b40f38 Mon Sep 17 00:00:00 2001 From: KobayashiAzusa Date: Fri, 14 Mar 2025 16:55:53 +0800 Subject: [PATCH 795/818] Clean cache after smoke test --- Dockerfile-alpine.template | 3 ++- Dockerfile-debian.template | 3 ++- Dockerfile-slim.template | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 79e973d43a..27494df704 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -68,7 +68,8 @@ RUN addgroup -g 1000 node \ && apk del .build-deps \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 0.0.0 diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index aa3f3c5ecb..8afc3dd643 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -36,7 +36,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 0.0.0 diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 876201d3fd..49da9219a6 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -50,7 +50,8 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 0.0.0 From 9d71cf817809ad3fde7c59ca27a84c888a2d7047 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:03:00 -0400 Subject: [PATCH 796/818] ci: pin actions/checkout 4.2.2 SHA --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/build-test.yml | 4 ++-- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- .github/workflows/missing-checksum.yml | 2 +- .github/workflows/official-pr.yml | 4 ++-- .github/workflows/shfmt.yml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 63fea81093..703245c940 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -12,7 +12,7 @@ jobs: pull-requests: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Run automation script uses: actions/github-script@v7 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 3bee8120a7..7caa618fb4 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Calculate file differences id: diff @@ -66,7 +66,7 @@ jobs: script: return "${{ matrix.version }}".split('.')[0] - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Build image uses: docker/build-push-action@v6 diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index 07789f625a..f6be9b763b 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -14,7 +14,7 @@ jobs: name: Doc TOC Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-node@v4 with: node-version: 'lts/*' diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index a7690eb12f..e8699a130c 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -9,7 +9,7 @@ jobs: eclint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-node@v4 with: node-version: 'lts/*' diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 3793d6358d..a755cadc4b 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -13,7 +13,7 @@ jobs: markdown-link-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-node@v4 with: node-version: 'lts/*' diff --git a/.github/workflows/missing-checksum.yml b/.github/workflows/missing-checksum.yml index 70637004f1..6c4a293c55 100644 --- a/.github/workflows/missing-checksum.yml +++ b/.github/workflows/missing-checksum.yml @@ -13,7 +13,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Count number of Alpine Dockersfiles without CHECKSUM run: | diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 30d467b3b1..540fbed1ce 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -21,14 +21,14 @@ jobs: steps: - name: Checkout the docker-node repo - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: docker-node ref: ${{ github.base_ref }} fetch-depth: 50 - name: Checkout the official-images repo - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: official-images repository: docker-library/official-images diff --git a/.github/workflows/shfmt.yml b/.github/workflows/shfmt.yml index 6fc68a571c..380d165260 100644 --- a/.github/workflows/shfmt.yml +++ b/.github/workflows/shfmt.yml @@ -12,12 +12,12 @@ jobs: shfmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - run: docker run -v "$(pwd)":/sh -w /sh peterdavehello/shfmt:2.6.3 shfmt -sr -i 2 -l -w -ci . - run: git diff --color --exit-code shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - run: shellcheck *.sh From 133475e1a789e012e1977b1e259f8f9a26e991ad Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:04:49 -0400 Subject: [PATCH 797/818] ci: pin actions/github-script v7.0.1 SHA --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/build-test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 703245c940..6423cbb9fb 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Run automation script - uses: actions/github-script@v7 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 id: updt with: result-encoding: string diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 7caa618fb4..794bdd7efc 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -32,7 +32,7 @@ jobs: escape_json: false - name: Generate testing matrix - uses: actions/github-script@v7 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 id: generator with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -59,7 +59,7 @@ jobs: steps: - name: Get short node version - uses: actions/github-script@v7 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 id: short-version with: result-encoding: string From 202c1306978f98eb76a3a2d90f3279fd4bf8db39 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:06:12 -0400 Subject: [PATCH 798/818] ci: pin peter-evans/create-pull-request v7.0.8 SHA --- .github/workflows/automatic-updates.yml | 2 +- .github/workflows/official-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automatic-updates.yml b/.github/workflows/automatic-updates.yml index 6423cbb9fb..ab5408659a 100644 --- a/.github/workflows/automatic-updates.yml +++ b/.github/workflows/automatic-updates.yml @@ -25,7 +25,7 @@ jobs: - name: Create update PR id: cpr - uses: peter-evans/create-pull-request@v7 + uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8 with: token: ${{ secrets.GH_API_TOKEN }} author: "Node.js GitHub Bot " diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 540fbed1ce..95ed21e550 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -40,7 +40,7 @@ jobs: - name: Create PR in official-images id: create-pr - uses: peter-evans/create-pull-request@v7 + uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8 with: token: ${{ secrets.GH_API_TOKEN }} push-to-fork: nodejs/official-images From 73ce7900678b65fa6a7f3cd2fd293772466ee6b5 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:08:26 -0400 Subject: [PATCH 799/818] ci: pin tj-actions/changed-files v46.0.1 SHA --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 794bdd7efc..af5ebbae02 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@v45 + uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1 with: json: true escape_json: false From 890d32f240035f62e86ba0972c707a72bfc30d35 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:20:24 -0400 Subject: [PATCH 800/818] ci: add OSSF scanning --- .github/workflows/scorecard.yml | 73 +++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/scorecard.yml diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml new file mode 100644 index 0000000000..5ba5c652d6 --- /dev/null +++ b/.github/workflows/scorecard.yml @@ -0,0 +1,73 @@ +# This workflow uses actions that are not certified by GitHub. They are provided +# by a third-party and are governed by separate terms of service, privacy +# policy, and support documentation. + +name: Scorecard supply-chain security +on: + # For Branch-Protection check. Only the default branch is supported. See + # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection + branch_protection_rule: + # To guarantee Maintained check is occasionally updated. See + # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained + schedule: + - cron: '30 12 * * 6' + push: + branches: [ "main" ] + +# Declare default permissions as read only. +permissions: read-all + +jobs: + analysis: + name: Scorecard analysis + runs-on: ubuntu-latest + permissions: + # Needed to upload the results to code-scanning dashboard. + security-events: write + # Needed to publish results and get a badge (see publish_results below). + id-token: write + # Uncomment the permissions below if installing in a private repository. + # contents: read + # actions: read + + steps: + - name: "Checkout code" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + persist-credentials: false + + - name: "Run analysis" + uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + with: + results_file: results.sarif + results_format: sarif + # (Optional) "write" PAT token. Uncomment the `repo_token` line below if: + # - you want to enable the Branch-Protection check on a *public* repository, or + # - you are installing Scorecard on a *private* repository + # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional. + # repo_token: ${{ secrets.SCORECARD_TOKEN }} + + # Public repositories: + # - Publish results to OpenSSF REST API for easy access by consumers + # - Allows the repository to include the Scorecard badge. + # - See https://github.com/ossf/scorecard-action#publishing-results. + # For private repositories: + # - `publish_results` will always be set to `false`, regardless + # of the value entered here. + publish_results: true + + # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF + # format to the repository Actions tab. + - name: "Upload artifact" + uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20 + with: + name: SARIF file + path: results.sarif + retention-days: 5 + + # Upload the results to GitHub's code scanning dashboard (optional). + # Commenting out will disable upload of results to your repo's Code Scanning dashboard + - name: "Upload to code-scanning" + uses: github/codeql-action/upload-sarif@v3 + with: + sarif_file: results.sarif From 9ac75cf0b97933d61cdfea97954fe84afe15d119 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:10:52 -0400 Subject: [PATCH 801/818] ci: pin actions/setup-node v4.3.0 SHA --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index f6be9b763b..a8b691342d 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: node-version: 'lts/*' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index e8699a130c..058ceeb000 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: node-version: 'lts/*' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index a755cadc4b..6f066eb33a 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: node-version: 'lts/*' - name: Install markdown-link-check From 8790701396f460825f0337c7905b56bc4ce23e33 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:11:55 -0400 Subject: [PATCH 802/818] ci: pin docker/build-push-action v6.15.0 SHA --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index af5ebbae02..450e4e2736 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -69,7 +69,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Build image - uses: docker/build-push-action@v6 + uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0 with: push: false load: true From c3460916f977bd13d9a1f1e991c6d5b5f5b8cadb Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:14:05 -0400 Subject: [PATCH 803/818] ci: pin peter-evans/create-or-update-comment v4.0.0 SHA --- .github/workflows/official-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index 95ed21e550..fb0c4f5ddf 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -58,7 +58,7 @@ jobs: echo "Pull Request URL - ${{ steps.create-pr.outputs.pull-request-url }}" - name: Create PR comment - uses: peter-evans/create-or-update-comment@v4 + uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 if: ${{ steps.create-pr.outputs.pull-request-url != '' }} with: issue-number: ${{ github.event.pull_request.number }} From e500e20cbb5fa12fe4211fb634c3c1b6b8947b4a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 17 Mar 2025 01:14:47 -0400 Subject: [PATCH 804/818] ci: remove crazy-max/ghaction-dump-context --- .github/workflows/official-pr.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/official-pr.yml b/.github/workflows/official-pr.yml index fb0c4f5ddf..f1dd7855d4 100644 --- a/.github/workflows/official-pr.yml +++ b/.github/workflows/official-pr.yml @@ -64,7 +64,3 @@ jobs: issue-number: ${{ github.event.pull_request.number }} body: | Created PR on the official-images repo (${{ steps.create-pr.outputs.pull-request-url }}). See https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what if you are wondering when it will be available on the Docker Hub. - - - name: Dump context - if: always() - uses: crazy-max/ghaction-dump-context@v2 From a824d6e460d8d0c103ef482961127eb94e946ceb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 07:07:45 +0000 Subject: [PATCH 805/818] chore(deps): bump tj-actions/changed-files from 46.0.1 to 46.0.3 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 46.0.1 to 46.0.3. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/2f7c5bfce28377bc069a65ba478de0a74aa0ca32...823fcebdb31bb35fdf2229d9f769b400309430d0) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 450e4e2736..98edf4fca1 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1 + uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3 with: json: true escape_json: false From ba2b3e61e6aaf4643108fb5f1cda9ee5238efde5 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 27 Mar 2025 14:23:08 +0000 Subject: [PATCH 806/818] feat: Node.js 18.20.8 --- 18/alpine3.20/Dockerfile | 4 ++-- 18/alpine3.21/Dockerfile | 4 ++-- 18/bookworm-slim/Dockerfile | 2 +- 18/bookworm/Dockerfile | 2 +- 18/bullseye-slim/Dockerfile | 2 +- 18/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/18/alpine3.20/Dockerfile b/18/alpine3.20/Dockerfile index 30a5e0b303..6c1eef4880 100644 --- a/18/alpine3.20/Dockerfile +++ b/18/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 18.20.7 +ENV NODE_VERSION 18.20.8 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f582108b1fdbceb4c428c34ddc9ad6d61e1b8d8d2c53843138b571aa35b88039" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2c75d5d562d3ffc049ca1bbea65b68ae6bd0ec50ed04b1f606e065eaf35e8599" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/alpine3.21/Dockerfile b/18/alpine3.21/Dockerfile index 7a1e44cef0..1648f84bd3 100644 --- a/18/alpine3.21/Dockerfile +++ b/18/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 18.20.7 +ENV NODE_VERSION 18.20.8 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="f582108b1fdbceb4c428c34ddc9ad6d61e1b8d8d2c53843138b571aa35b88039" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="2c75d5d562d3ffc049ca1bbea65b68ae6bd0ec50ed04b1f606e065eaf35e8599" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/18/bookworm-slim/Dockerfile b/18/bookworm-slim/Dockerfile index 5ca9bd9f6b..f92eb4edbc 100644 --- a/18/bookworm-slim/Dockerfile +++ b/18/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.7 +ENV NODE_VERSION 18.20.8 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bookworm/Dockerfile b/18/bookworm/Dockerfile index 537a93cb20..14adf248b1 100644 --- a/18/bookworm/Dockerfile +++ b/18/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 18.20.7 +ENV NODE_VERSION 18.20.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye-slim/Dockerfile b/18/bullseye-slim/Dockerfile index a2e12df937..a43666f45c 100644 --- a/18/bullseye-slim/Dockerfile +++ b/18/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 18.20.7 +ENV NODE_VERSION 18.20.8 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/18/bullseye/Dockerfile b/18/bullseye/Dockerfile index de1e1223f8..3171534258 100644 --- a/18/bullseye/Dockerfile +++ b/18/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 18.20.7 +ENV NODE_VERSION 18.20.8 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 62a4ab3572ee8d0c626dc6e47983466b1bb1da69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 30 Mar 2025 19:21:04 +0000 Subject: [PATCH 807/818] chore(deps): bump ossf/scorecard-action from 2.3.1 to 2.4.1 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.4.1. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/0864cf19026789058feabb7e87baa5f140aac736...f49aabe0b5af0936a0987cfb85d86b75731b0186) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 5ba5c652d6..3a94e54a0f 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -37,7 +37,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1 with: results_file: results.sarif results_format: sarif From 219691a76dc826ec4b06e666fba509b8d00fba85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 30 Mar 2025 19:21:14 +0000 Subject: [PATCH 808/818] chore(deps): bump actions/checkout from 4.1.1 to 4.2.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.1...11bd71901bbe5b1630ceea73d27597364c9af683) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 5ba5c652d6..205fb73552 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -32,7 +32,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false From c1140a9ebeb073bc944e9e58a89c9926512ac138 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sun, 30 Mar 2025 15:25:26 -0400 Subject: [PATCH 809/818] ci: use actions/upload-artifact v4.6.2 --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 5ba5c652d6..3fe779beac 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20 + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 with: name: SARIF file path: results.sarif From be3c2cda51ce72ee949680b555b1ef3bad85589e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 31 Mar 2025 15:28:47 -0700 Subject: [PATCH 810/818] Remove arm32v7 from bullseye variants of Node 23 + node --version node: /usr/lib/arm-linux-gnueabihf/libstdc++.so.6: version `GLIBCXX_3.4.30' not found (required by node) node: /usr/lib/arm-linux-gnueabihf/libstdc++.so.6: version `GLIBCXX_3.4.29' not found (required by node) I *believe* this is the correct change, but I'm not 100% sure -- I don't see anything in this repository that writes to `versions.json`, so it appears to be hand-maintained and thus this is the correct change for `stackbrew.js` to generate the appropriate contents. --- versions.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/versions.json b/versions.json index d12fe3ad9f..c971f4d432 100644 --- a/versions.json +++ b/versions.json @@ -38,12 +38,10 @@ ], "bullseye": [ "amd64", - "arm32v7", "arm64v8" ], "bullseye-slim": [ "amd64", - "arm32v7", "arm64v8" ] } From f6908ff3eb35a5d0c8fc60086fd29ae16e3abdba Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 1 Apr 2025 16:05:11 +0000 Subject: [PATCH 811/818] feat: Node.js 23.11.0 --- 23/alpine3.20/Dockerfile | 4 ++-- 23/alpine3.21/Dockerfile | 4 ++-- 23/bookworm-slim/Dockerfile | 2 +- 23/bookworm/Dockerfile | 2 +- 23/bullseye-slim/Dockerfile | 2 +- 23/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/23/alpine3.20/Dockerfile b/23/alpine3.20/Dockerfile index 5dc4dfaeed..653236e4b4 100644 --- a/23/alpine3.20/Dockerfile +++ b/23/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 23.10.0 +ENV NODE_VERSION 23.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="0fb1f4ad7cc03e6211fb5d4876b61f6d96e4166e62ba9ee4bcf1db6fe9d32181" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d267e68a33036c2f3803adaf79b7191bcf45219cc12246f61c48b891bb70e943" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/alpine3.21/Dockerfile b/23/alpine3.21/Dockerfile index fdcfb3048f..e055decc9e 100644 --- a/23/alpine3.21/Dockerfile +++ b/23/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 23.10.0 +ENV NODE_VERSION 23.11.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="0fb1f4ad7cc03e6211fb5d4876b61f6d96e4166e62ba9ee4bcf1db6fe9d32181" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="d267e68a33036c2f3803adaf79b7191bcf45219cc12246f61c48b891bb70e943" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/23/bookworm-slim/Dockerfile b/23/bookworm-slim/Dockerfile index e6292f6ca2..51d822531e 100644 --- a/23/bookworm-slim/Dockerfile +++ b/23/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.10.0 +ENV NODE_VERSION 23.11.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bookworm/Dockerfile b/23/bookworm/Dockerfile index 183c6a67a0..2591496de5 100644 --- a/23/bookworm/Dockerfile +++ b/23/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 23.10.0 +ENV NODE_VERSION 23.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye-slim/Dockerfile b/23/bullseye-slim/Dockerfile index 9e33f5fadb..4fb125ad12 100644 --- a/23/bullseye-slim/Dockerfile +++ b/23/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 23.10.0 +ENV NODE_VERSION 23.11.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/23/bullseye/Dockerfile b/23/bullseye/Dockerfile index 8eec64af8d..4f00af072a 100644 --- a/23/bullseye/Dockerfile +++ b/23/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 23.10.0 +ENV NODE_VERSION 23.11.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ From 8ba4fe6ca6148c3ba34412f319f842b988271f9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 08:02:02 +0000 Subject: [PATCH 812/818] chore(deps): bump tj-actions/changed-files from 46.0.3 to 46.0.4 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 46.0.3 to 46.0.4. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/823fcebdb31bb35fdf2229d9f769b400309430d0...6cb76d07bee4c9772c6882c06c37837bf82a04d3) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-version: 46.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 98edf4fca1..2d949c2537 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@823fcebdb31bb35fdf2229d9f769b400309430d0 # v46.0.3 + uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3 # v46.0.4 with: json: true escape_json: false From 54ffe2c1f0aa805a800201c130c4c285e599a45f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 07:34:54 +0000 Subject: [PATCH 813/818] chore(deps): bump tj-actions/changed-files from 46.0.4 to 46.0.5 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 46.0.4 to 46.0.5. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/6cb76d07bee4c9772c6882c06c37837bf82a04d3...ed68ef82c095e0d48ec87eccea555d944a631a4c) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-version: 46.0.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 2d949c2537..00249ec68f 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,7 @@ jobs: - name: Calculate file differences id: diff - uses: tj-actions/changed-files@6cb76d07bee4c9772c6882c06c37837bf82a04d3 # v46.0.4 + uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5 with: json: true escape_json: false From 9e608957853b10af7bb75cf88894352b59104737 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 07:47:57 +0000 Subject: [PATCH 814/818] chore(deps): bump actions/setup-node from 4.3.0 to 4.4.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/cdca7365b2dadb8aad0a33bc7601856ffabcc48e...49933ea5288caeca8642d1e84afbd3f7d6820020) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: 4.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/doctoc.yml | 2 +- .github/workflows/eclint.yml | 2 +- .github/workflows/markdown-link-check.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doctoc.yml b/.github/workflows/doctoc.yml index a8b691342d..a26616b4ce 100644 --- a/.github/workflows/doctoc.yml +++ b/.github/workflows/doctoc.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: node-version: 'lts/*' - name: Install doctoc diff --git a/.github/workflows/eclint.yml b/.github/workflows/eclint.yml index 058ceeb000..4d1f26e7bb 100644 --- a/.github/workflows/eclint.yml +++ b/.github/workflows/eclint.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: node-version: 'lts/*' - run: npm i -g eclint diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml index 6f066eb33a..396bd800f4 100644 --- a/.github/workflows/markdown-link-check.yml +++ b/.github/workflows/markdown-link-check.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 + - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 with: node-version: 'lts/*' - name: Install markdown-link-check From 59723c6c97abbac39c8fbc4fa09ab52ba33d42db Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Tue, 22 Apr 2025 12:08:47 +0000 Subject: [PATCH 815/818] feat: Node.js 20.19.1 --- 20/alpine3.20/Dockerfile | 7 ++++--- 20/alpine3.21/Dockerfile | 7 ++++--- 20/bookworm-slim/Dockerfile | 5 +++-- 20/bookworm/Dockerfile | 5 +++-- 20/bullseye-slim/Dockerfile | 5 +++-- 20/bullseye/Dockerfile | 5 +++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/20/alpine3.20/Dockerfile b/20/alpine3.20/Dockerfile index eefb5033f2..dc4bdd7d0f 100644 --- a/20/alpine3.20/Dockerfile +++ b/20/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 20.19.0 +ENV NODE_VERSION 20.19.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b2a58593a9de31ca444fe095cb2db0674bdccab426ee6803110ca17867bdac26" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="43197bd85a51c4901a8de6d825ef540aa90e32845bcbe493a761411d3289d366" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -75,7 +75,8 @@ RUN addgroup -g 1000 node \ && apk del .build-deps \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/20/alpine3.21/Dockerfile b/20/alpine3.21/Dockerfile index e709440cd6..e1cb481148 100644 --- a/20/alpine3.21/Dockerfile +++ b/20/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 20.19.0 +ENV NODE_VERSION 20.19.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="b2a58593a9de31ca444fe095cb2db0674bdccab426ee6803110ca17867bdac26" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="43197bd85a51c4901a8de6d825ef540aa90e32845bcbe493a761411d3289d366" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -75,7 +75,8 @@ RUN addgroup -g 1000 node \ && apk del .build-deps \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/20/bookworm-slim/Dockerfile b/20/bookworm-slim/Dockerfile index bf0a026488..108796d758 100644 --- a/20/bookworm-slim/Dockerfile +++ b/20/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.19.0 +ENV NODE_VERSION 20.19.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -57,7 +57,8 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/20/bookworm/Dockerfile b/20/bookworm/Dockerfile index 907c1da13f..1799a18d98 100644 --- a/20/bookworm/Dockerfile +++ b/20/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 20.19.0 +ENV NODE_VERSION 20.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -43,7 +43,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/20/bullseye-slim/Dockerfile b/20/bullseye-slim/Dockerfile index 99f4d6949d..dd09688e05 100644 --- a/20/bullseye-slim/Dockerfile +++ b/20/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 20.19.0 +ENV NODE_VERSION 20.19.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -57,7 +57,8 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/20/bullseye/Dockerfile b/20/bullseye/Dockerfile index 9fbef30b15..44571b5844 100644 --- a/20/bullseye/Dockerfile +++ b/20/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 20.19.0 +ENV NODE_VERSION 20.19.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -43,7 +43,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 From 9bb97e784231f01e61df4d22aaa95a110432a1c7 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Wed, 23 Apr 2025 08:50:54 +0000 Subject: [PATCH 816/818] feat: Node.js 22.15.0 --- 22/alpine3.20/Dockerfile | 7 ++++--- 22/alpine3.21/Dockerfile | 7 ++++--- 22/bookworm-slim/Dockerfile | 5 +++-- 22/bookworm/Dockerfile | 5 +++-- 22/bullseye-slim/Dockerfile | 5 +++-- 22/bullseye/Dockerfile | 5 +++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/22/alpine3.20/Dockerfile b/22/alpine3.20/Dockerfile index 780123b86b..821f1c7d8b 100644 --- a/22/alpine3.20/Dockerfile +++ b/22/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 22.14.0 +ENV NODE_VERSION 22.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="87f163387ac85df69df6eeb863a6b6a1aa789b49cda1c495871c0fe360634db3" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="60198941802e88659bb3b30b9a45b694b1c695cf33c1ef58863f854996d11d5d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -75,7 +75,8 @@ RUN addgroup -g 1000 node \ && apk del .build-deps \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/22/alpine3.21/Dockerfile b/22/alpine3.21/Dockerfile index 6e48b32706..ddc2d004ca 100644 --- a/22/alpine3.21/Dockerfile +++ b/22/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 22.14.0 +ENV NODE_VERSION 22.15.0 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="87f163387ac85df69df6eeb863a6b6a1aa789b49cda1c495871c0fe360634db3" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="60198941802e88659bb3b30b9a45b694b1c695cf33c1ef58863f854996d11d5d" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -75,7 +75,8 @@ RUN addgroup -g 1000 node \ && apk del .build-deps \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/22/bookworm-slim/Dockerfile b/22/bookworm-slim/Dockerfile index 9f80da69e7..b2fd0fbbf2 100644 --- a/22/bookworm-slim/Dockerfile +++ b/22/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.14.0 +ENV NODE_VERSION 22.15.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -57,7 +57,8 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/22/bookworm/Dockerfile b/22/bookworm/Dockerfile index ad19cb7495..5ba8731ccc 100644 --- a/22/bookworm/Dockerfile +++ b/22/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 22.14.0 +ENV NODE_VERSION 22.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -43,7 +43,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/22/bullseye-slim/Dockerfile b/22/bullseye-slim/Dockerfile index ecfaad60fe..6e2ec00b9d 100644 --- a/22/bullseye-slim/Dockerfile +++ b/22/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 22.14.0 +ENV NODE_VERSION 22.15.0 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -57,7 +57,8 @@ RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 diff --git a/22/bullseye/Dockerfile b/22/bullseye/Dockerfile index 281c738982..b3d0fd278d 100644 --- a/22/bullseye/Dockerfile +++ b/22/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 22.14.0 +ENV NODE_VERSION 22.15.0 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ @@ -43,7 +43,8 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ # smoke tests && node --version \ - && npm --version + && npm --version \ + && rm -rf /tmp/* ENV YARN_VERSION 1.22.22 From b3ae4060c7bb20d34896ab3e1f5f3d2ee7dcdd10 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Tue, 6 May 2025 22:15:24 +0200 Subject: [PATCH 817/818] feat: Node.js 24.0.0 --- 24/alpine3.20/Dockerfile | 110 ++++++++++++++++++++++++++ 24/alpine3.20/docker-entrypoint.sh | 11 +++ 24/alpine3.21/Dockerfile | 110 ++++++++++++++++++++++++++ 24/alpine3.21/docker-entrypoint.sh | 11 +++ 24/bookworm-slim/Dockerfile | 104 ++++++++++++++++++++++++ 24/bookworm-slim/docker-entrypoint.sh | 11 +++ 24/bookworm/Dockerfile | 77 ++++++++++++++++++ 24/bookworm/docker-entrypoint.sh | 11 +++ 24/bullseye-slim/Dockerfile | 104 ++++++++++++++++++++++++ 24/bullseye-slim/docker-entrypoint.sh | 11 +++ 24/bullseye/Dockerfile | 77 ++++++++++++++++++ 24/bullseye/docker-entrypoint.sh | 11 +++ versions.json | 47 +++++++++++ 13 files changed, 695 insertions(+) create mode 100644 24/alpine3.20/Dockerfile create mode 100755 24/alpine3.20/docker-entrypoint.sh create mode 100644 24/alpine3.21/Dockerfile create mode 100755 24/alpine3.21/docker-entrypoint.sh create mode 100644 24/bookworm-slim/Dockerfile create mode 100755 24/bookworm-slim/docker-entrypoint.sh create mode 100644 24/bookworm/Dockerfile create mode 100755 24/bookworm/docker-entrypoint.sh create mode 100644 24/bullseye-slim/Dockerfile create mode 100755 24/bullseye-slim/docker-entrypoint.sh create mode 100644 24/bullseye/Dockerfile create mode 100755 24/bullseye/docker-entrypoint.sh diff --git a/24/alpine3.20/Dockerfile b/24/alpine3.20/Dockerfile new file mode 100644 index 0000000000..bc01a9c7d5 --- /dev/null +++ b/24/alpine3.20/Dockerfile @@ -0,0 +1,110 @@ +FROM alpine:3.20 + +ENV NODE_VERSION 24.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64' CHECKSUM="5c96f5245c8788665cc67f4962d6e94a8f50fb771563b206e135c14c9d8e5768" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + py-setuptools \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version \ + && rm -rf /tmp/* + +ENV YARN_VERSION 1.22.22 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/24/alpine3.20/docker-entrypoint.sh b/24/alpine3.20/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/24/alpine3.20/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/24/alpine3.21/Dockerfile b/24/alpine3.21/Dockerfile new file mode 100644 index 0000000000..2b7385e615 --- /dev/null +++ b/24/alpine3.21/Dockerfile @@ -0,0 +1,110 @@ +FROM alpine:3.21 + +ENV NODE_VERSION 24.0.0 + +RUN addgroup -g 1000 node \ + && adduser -u 1000 -G node -s /bin/sh -D node \ + && apk add --no-cache \ + libstdc++ \ + && apk add --no-cache --virtual .build-deps \ + curl \ + && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ + && case "${alpineArch##*-}" in \ + x86_64) ARCH='x64' CHECKSUM="5c96f5245c8788665cc67f4962d6e94a8f50fb771563b206e135c14c9d8e5768" OPENSSL_ARCH=linux-x86_64;; \ + x86) OPENSSL_ARCH=linux-elf;; \ + aarch64) OPENSSL_ARCH=linux-aarch64;; \ + arm*) OPENSSL_ARCH=linux-armv4;; \ + ppc64le) OPENSSL_ARCH=linux-ppc64le;; \ + s390x) OPENSSL_ARCH=linux-s390x;; \ + *) ;; \ + esac \ + && if [ -n "${CHECKSUM}" ]; then \ + set -eu; \ + curl -fsSLO --compressed "https://unofficial-builds.nodejs.org/download/release/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz"; \ + echo "$CHECKSUM node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs; \ + else \ + echo "Building from source" \ + # backup build + && apk add --no-cache --virtual .build-deps-full \ + binutils-gold \ + g++ \ + gcc \ + gnupg \ + libgcc \ + linux-headers \ + make \ + python3 \ + py-setuptools \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xf "node-v$NODE_VERSION.tar.xz" \ + && cd "node-v$NODE_VERSION" \ + && ./configure \ + && make -j$(getconf _NPROCESSORS_ONLN) V= \ + && make install \ + && apk del .build-deps-full \ + && cd .. \ + && rm -Rf "node-v$NODE_VERSION" \ + && rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt; \ + fi \ + && rm -f "node-v$NODE_VERSION-linux-$ARCH-musl.tar.xz" \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apk del .build-deps \ + # smoke tests + && node --version \ + && npm --version \ + && rm -rf /tmp/* + +ENV YARN_VERSION 1.22.22 + +RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apk del .build-deps-yarn \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/24/alpine3.21/docker-entrypoint.sh b/24/alpine3.21/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/24/alpine3.21/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/24/bookworm-slim/Dockerfile b/24/bookworm-slim/Dockerfile new file mode 100644 index 0000000000..57deca2da4 --- /dev/null +++ b/24/bookworm-slim/Dockerfile @@ -0,0 +1,104 @@ +FROM debian:bookworm-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 24.0.0 + +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version \ + && rm -rf /tmp/* + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/24/bookworm-slim/docker-entrypoint.sh b/24/bookworm-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/24/bookworm-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/24/bookworm/Dockerfile b/24/bookworm/Dockerfile new file mode 100644 index 0000000000..11e73f9ee9 --- /dev/null +++ b/24/bookworm/Dockerfile @@ -0,0 +1,77 @@ +FROM buildpack-deps:bookworm + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 24.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version \ + && rm -rf /tmp/* + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/24/bookworm/docker-entrypoint.sh b/24/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/24/bookworm/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/24/bullseye-slim/Dockerfile b/24/bullseye-slim/Dockerfile new file mode 100644 index 0000000000..5809c1bd10 --- /dev/null +++ b/24/bullseye-slim/Dockerfile @@ -0,0 +1,104 @@ +FROM debian:bullseye-slim + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 24.0.0 + +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && 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/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ + && apt-mark auto '.*' > /dev/null \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version \ + && rm -rf /tmp/* + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && apt-mark auto '.*' > /dev/null \ + && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ + && find /usr/local -type f -executable -exec ldd '{}' ';' \ + | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ + | sort -u \ + | xargs -r dpkg-query --search \ + | cut -d: -f1 \ + | sort -u \ + | xargs -r apt-mark manual \ + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/24/bullseye-slim/docker-entrypoint.sh b/24/bullseye-slim/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/24/bullseye-slim/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/24/bullseye/Dockerfile b/24/bullseye/Dockerfile new file mode 100644 index 0000000000..47b28a27df --- /dev/null +++ b/24/bullseye/Dockerfile @@ -0,0 +1,77 @@ +FROM buildpack-deps:bullseye + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 24.0.0 + +RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && set -ex \ + && for key in \ + C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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 \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version \ + && rm -rf /tmp/* + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --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" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* + +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] + +CMD [ "node" ] diff --git a/24/bullseye/docker-entrypoint.sh b/24/bullseye/docker-entrypoint.sh new file mode 100755 index 0000000000..1b3116e53b --- /dev/null +++ b/24/bullseye/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +# Run command with node if the first argument contains a "-" or is not a system command. The last +# part inside the "{}" is a workaround for the following bug in ash/dash: +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874264 +if [ "${1#-}" != "${1}" ] || [ -z "$(command -v "${1}")" ] || { [ -f "${1}" ] && ! [ -x "${1}" ]; }; then + set -- node "$@" +fi + +exec "$@" diff --git a/versions.json b/versions.json index c971f4d432..60022e811a 100644 --- a/versions.json +++ b/versions.json @@ -1,4 +1,51 @@ { + "24": { + "start": "2025-05-06", + "lts": "2025-10-28", + "maintenance": "2026-10-20", + "end": "2028-04-30", + "codename": "", + "alpine-default": "alpine3.21", + "debian-default": "bookworm", + "variants": { + "alpine3.20": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "s390x" + ], + "alpine3.21": [ + "amd64", + "arm32v6", + "arm32v7", + "arm64v8", + "s390x" + ], + "bookworm": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bookworm-slim": [ + "amd64", + "arm32v7", + "arm64v8", + "ppc64le", + "s390x" + ], + "bullseye": [ + "amd64", + "arm64v8" + ], + "bullseye-slim": [ + "amd64", + "arm64v8" + ] + } + }, "23": { "start": "2024-10-15", "lts": "", From d9138b93aec8cd4b4febaae0b4e40b3272015ca6 Mon Sep 17 00:00:00 2001 From: "Node.js GitHub Bot" Date: Thu, 8 May 2025 21:34:11 +0000 Subject: [PATCH 818/818] feat: Node.js 24.0.1 --- 24/alpine3.20/Dockerfile | 4 ++-- 24/alpine3.21/Dockerfile | 4 ++-- 24/bookworm-slim/Dockerfile | 2 +- 24/bookworm/Dockerfile | 2 +- 24/bullseye-slim/Dockerfile | 2 +- 24/bullseye/Dockerfile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/24/alpine3.20/Dockerfile b/24/alpine3.20/Dockerfile index bc01a9c7d5..6d0cf15768 100644 --- a/24/alpine3.20/Dockerfile +++ b/24/alpine3.20/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.20 -ENV NODE_VERSION 24.0.0 +ENV NODE_VERSION 24.0.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5c96f5245c8788665cc67f4962d6e94a8f50fb771563b206e135c14c9d8e5768" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5efbd69efad82f4dcd950638fe32c50cf6ed7171f0ae0ed297bcfb7680c2042c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/24/alpine3.21/Dockerfile b/24/alpine3.21/Dockerfile index 2b7385e615..3f875b8560 100644 --- a/24/alpine3.21/Dockerfile +++ b/24/alpine3.21/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.21 -ENV NODE_VERSION 24.0.0 +ENV NODE_VERSION 24.0.1 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="5c96f5245c8788665cc67f4962d6e94a8f50fb771563b206e135c14c9d8e5768" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="5efbd69efad82f4dcd950638fe32c50cf6ed7171f0ae0ed297bcfb7680c2042c" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ diff --git a/24/bookworm-slim/Dockerfile b/24/bookworm-slim/Dockerfile index 57deca2da4..7e9047c248 100644 --- a/24/bookworm-slim/Dockerfile +++ b/24/bookworm-slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bookworm-slim RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 24.0.0 +ENV NODE_VERSION 24.0.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/24/bookworm/Dockerfile b/24/bookworm/Dockerfile index 11e73f9ee9..6781ec1ae3 100644 --- a/24/bookworm/Dockerfile +++ b/24/bookworm/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:bookworm RUN groupadd --gid 1000 node \ && useradd --uid 1000 --gid node --shell /bin/bash --create-home node -ENV NODE_VERSION 24.0.0 +ENV NODE_VERSION 24.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/24/bullseye-slim/Dockerfile b/24/bullseye-slim/Dockerfile index 5809c1bd10..3a9834365b 100644 --- a/24/bullseye-slim/Dockerfile +++ b/24/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 24.0.0 +ENV NODE_VERSION 24.0.1 RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ diff --git a/24/bullseye/Dockerfile b/24/bullseye/Dockerfile index 47b28a27df..47227c2918 100644 --- a/24/bullseye/Dockerfile +++ b/24/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 24.0.0 +ENV NODE_VERSION 24.0.1 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \