Skip to content

Node: Add Alpine 3.18 variant #14779

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jun 2, 2023
Merged

Node: Add Alpine 3.18 variant #14779

merged 1 commit into from
Jun 2, 2023

Conversation

nodejs-github-bot
Copy link
Contributor

@github-actions github-actions bot mentioned this pull request Jun 2, 2023
Merged
12 tasks
@github-actions
Copy link

github-actions bot commented Jun 2, 2023

Diff for 9a007c3: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index cd9e0e2..65c82db 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -7,15 +7,15 @@ Architectures: amd64, arm32v7, arm64v8
 GitCommit: bd6c00f07c5a3b311ce0e346ab69df6b9ef8d08f
 Directory: 16/buster
 
-Tags: 16-alpine, 16-alpine3.17, 16.20-alpine, 16.20-alpine3.17, 16.20.0-alpine, 16.20.0-alpine3.17, gallium-alpine, gallium-alpine3.17
+Tags: 16-alpine, 16-alpine3.18, 16.20-alpine, 16.20-alpine3.18, 16.20.0-alpine, 16.20.0-alpine3.18, gallium-alpine, gallium-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: bd6c00f07c5a3b311ce0e346ab69df6b9ef8d08f
-Directory: 16/alpine3.17
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 16/alpine3.18
 
-Tags: 16-alpine3.16, 16.20-alpine3.16, 16.20.0-alpine3.16, gallium-alpine3.16
+Tags: 16-alpine3.17, 16.20-alpine3.17, 16.20.0-alpine3.17, gallium-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: bd6c00f07c5a3b311ce0e346ab69df6b9ef8d08f
-Directory: 16/alpine3.16
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 16/alpine3.17
 
 Tags: 16-bullseye, 16.20-bullseye, 16.20.0-bullseye, gallium-bullseye
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -37,15 +37,15 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 4c95f887f7863eccc17d66729cd24ecc230209a2
 Directory: 18/bullseye
 
-Tags: 18-alpine, 18-alpine3.17, 18.16-alpine, 18.16-alpine3.17, 18.16.0-alpine, 18.16.0-alpine3.17, hydrogen-alpine, hydrogen-alpine3.17, lts-alpine, lts-alpine3.17
+Tags: 18-alpine, 18-alpine3.18, 18.16-alpine, 18.16-alpine3.18, 18.16.0-alpine, 18.16.0-alpine3.18, hydrogen-alpine, hydrogen-alpine3.18, lts-alpine, lts-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4c95f887f7863eccc17d66729cd24ecc230209a2
-Directory: 18/alpine3.17
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 18/alpine3.18
 
-Tags: 18-alpine3.16, 18.16-alpine3.16, 18.16.0-alpine3.16, hydrogen-alpine3.16, lts-alpine3.16
+Tags: 18-alpine3.17, 18.16-alpine3.17, 18.16.0-alpine3.17, hydrogen-alpine3.17, lts-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4c95f887f7863eccc17d66729cd24ecc230209a2
-Directory: 18/alpine3.16
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 18/alpine3.17
 
 Tags: 18-bullseye-slim, 18-slim, 18.16-bullseye-slim, 18.16-slim, 18.16.0-bullseye-slim, 18.16.0-slim, hydrogen-bullseye-slim, hydrogen-slim, lts-bullseye-slim, lts-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -67,15 +67,15 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 7a8d51d0e6acd67d14059140231ea52c7be8f023
 Directory: 19/bullseye
 
-Tags: 19-alpine, 19-alpine3.17, 19.9-alpine, 19.9-alpine3.17, 19.9.0-alpine, 19.9.0-alpine3.17
+Tags: 19-alpine, 19-alpine3.18, 19.9-alpine, 19.9-alpine3.18, 19.9.0-alpine, 19.9.0-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7a8d51d0e6acd67d14059140231ea52c7be8f023
-Directory: 19/alpine3.17
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 19/alpine3.18
 
-Tags: 19-alpine3.16, 19.9-alpine3.16, 19.9.0-alpine3.16
+Tags: 19-alpine3.17, 19.9-alpine3.17, 19.9.0-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7a8d51d0e6acd67d14059140231ea52c7be8f023
-Directory: 19/alpine3.16
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 19/alpine3.17
 
 Tags: 19-bullseye-slim, 19-slim, 19.9-bullseye-slim, 19.9-slim, 19.9.0-bullseye-slim, 19.9.0-slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -97,15 +97,15 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 510d29310b47fbe7c6cfe9c0d0bc4f9e1ff59713
 Directory: 20/bullseye
 
-Tags: 20-alpine, 20-alpine3.17, 20.2-alpine, 20.2-alpine3.17, 20.2.0-alpine, 20.2.0-alpine3.17, alpine, alpine3.17, current-alpine, current-alpine3.17
+Tags: 20-alpine, 20-alpine3.18, 20.2-alpine, 20.2-alpine3.18, 20.2.0-alpine, 20.2.0-alpine3.18, alpine, alpine3.18, current-alpine, current-alpine3.18
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 510d29310b47fbe7c6cfe9c0d0bc4f9e1ff59713
-Directory: 20/alpine3.17
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 20/alpine3.18
 
-Tags: 20-alpine3.16, 20.2-alpine3.16, 20.2.0-alpine3.16, alpine3.16, current-alpine3.16
+Tags: 20-alpine3.17, 20.2-alpine3.17, 20.2.0-alpine3.17, alpine3.17, current-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 510d29310b47fbe7c6cfe9c0d0bc4f9e1ff59713
-Directory: 20/alpine3.16
+GitCommit: d951a7ff95eac09985446409589d6ea75ac42f96
+Directory: 20/alpine3.17
 
 Tags: 20-bullseye-slim, 20-slim, 20.2-bullseye-slim, 20.2-slim, 20.2.0-bullseye-slim, 20.2.0-slim, bullseye-slim, current-bullseye-slim, current-slim, slim
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 3308940..fb7fe2a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 node:16
 node:16-alpine
-node:16-alpine3.16
 node:16-alpine3.17
+node:16-alpine3.18
 node:16-bullseye
 node:16-bullseye-slim
 node:16-buster
@@ -9,8 +9,8 @@ node:16-buster-slim
 node:16-slim
 node:16.20
 node:16.20-alpine
-node:16.20-alpine3.16
 node:16.20-alpine3.17
+node:16.20-alpine3.18
 node:16.20-bullseye
 node:16.20-bullseye-slim
 node:16.20-buster
@@ -18,8 +18,8 @@ node:16.20-buster-slim
 node:16.20-slim
 node:16.20.0
 node:16.20.0-alpine
-node:16.20.0-alpine3.16
 node:16.20.0-alpine3.17
+node:16.20.0-alpine3.18
 node:16.20.0-bullseye
 node:16.20.0-bullseye-slim
 node:16.20.0-buster
@@ -27,8 +27,8 @@ node:16.20.0-buster-slim
 node:16.20.0-slim
 node:18
 node:18-alpine
-node:18-alpine3.16
 node:18-alpine3.17
+node:18-alpine3.18
 node:18-bullseye
 node:18-bullseye-slim
 node:18-buster
@@ -36,8 +36,8 @@ node:18-buster-slim
 node:18-slim
 node:18.16
 node:18.16-alpine
-node:18.16-alpine3.16
 node:18.16-alpine3.17
+node:18.16-alpine3.18
 node:18.16-bullseye
 node:18.16-bullseye-slim
 node:18.16-buster
@@ -45,8 +45,8 @@ node:18.16-buster-slim
 node:18.16-slim
 node:18.16.0
 node:18.16.0-alpine
-node:18.16.0-alpine3.16
 node:18.16.0-alpine3.17
+node:18.16.0-alpine3.18
 node:18.16.0-bullseye
 node:18.16.0-bullseye-slim
 node:18.16.0-buster
@@ -54,8 +54,8 @@ node:18.16.0-buster-slim
 node:18.16.0-slim
 node:19
 node:19-alpine
-node:19-alpine3.16
 node:19-alpine3.17
+node:19-alpine3.18
 node:19-bullseye
 node:19-bullseye-slim
 node:19-buster
@@ -63,8 +63,8 @@ node:19-buster-slim
 node:19-slim
 node:19.9
 node:19.9-alpine
-node:19.9-alpine3.16
 node:19.9-alpine3.17
+node:19.9-alpine3.18
 node:19.9-bullseye
 node:19.9-bullseye-slim
 node:19.9-buster
@@ -72,8 +72,8 @@ node:19.9-buster-slim
 node:19.9-slim
 node:19.9.0
 node:19.9.0-alpine
-node:19.9.0-alpine3.16
 node:19.9.0-alpine3.17
+node:19.9.0-alpine3.18
 node:19.9.0-bullseye
 node:19.9.0-bullseye-slim
 node:19.9.0-buster
@@ -81,8 +81,8 @@ node:19.9.0-buster-slim
 node:19.9.0-slim
 node:20
 node:20-alpine
-node:20-alpine3.16
 node:20-alpine3.17
+node:20-alpine3.18
 node:20-bullseye
 node:20-bullseye-slim
 node:20-buster
@@ -90,8 +90,8 @@ node:20-buster-slim
 node:20-slim
 node:20.2
 node:20.2-alpine
-node:20.2-alpine3.16
 node:20.2-alpine3.17
+node:20.2-alpine3.18
 node:20.2-bullseye
 node:20.2-bullseye-slim
 node:20.2-buster
@@ -99,24 +99,24 @@ node:20.2-buster-slim
 node:20.2-slim
 node:20.2.0
 node:20.2.0-alpine
-node:20.2.0-alpine3.16
 node:20.2.0-alpine3.17
+node:20.2.0-alpine3.18
 node:20.2.0-bullseye
 node:20.2.0-bullseye-slim
 node:20.2.0-buster
 node:20.2.0-buster-slim
 node:20.2.0-slim
 node:alpine
-node:alpine3.16
 node:alpine3.17
+node:alpine3.18
 node:bullseye
 node:bullseye-slim
 node:buster
 node:buster-slim
 node:current
 node:current-alpine
-node:current-alpine3.16
 node:current-alpine3.17
+node:current-alpine3.18
 node:current-bullseye
 node:current-bullseye-slim
 node:current-buster
@@ -124,8 +124,8 @@ node:current-buster-slim
 node:current-slim
 node:gallium
 node:gallium-alpine
-node:gallium-alpine3.16
 node:gallium-alpine3.17
+node:gallium-alpine3.18
 node:gallium-bullseye
 node:gallium-bullseye-slim
 node:gallium-buster
@@ -133,8 +133,8 @@ node:gallium-buster-slim
 node:gallium-slim
 node:hydrogen
 node:hydrogen-alpine
-node:hydrogen-alpine3.16
 node:hydrogen-alpine3.17
+node:hydrogen-alpine3.18
 node:hydrogen-bullseye
 node:hydrogen-bullseye-slim
 node:hydrogen-buster
@@ -143,8 +143,8 @@ node:hydrogen-slim
 node:latest
 node:lts
 node:lts-alpine
-node:lts-alpine3.16
 node:lts-alpine3.17
+node:lts-alpine3.18
 node:lts-bullseye
 node:lts-bullseye-slim
 node:lts-buster
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 5552460..80fabb9 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,24 +1,24 @@
 node:gallium-buster
+node:gallium-alpine3.18
 node:gallium-alpine3.17
-node:gallium-alpine3.16
 node:gallium-bullseye
 node:gallium-bullseye-slim
 node:gallium-slim
 node:lts-hydrogen
+node:lts-alpine3.18
 node:lts-alpine3.17
-node:lts-alpine3.16
 node:lts-slim
 node:lts-buster
 node:lts-buster-slim
 node:19.9.0-bullseye
+node:19.9.0-alpine3.18
 node:19.9.0-alpine3.17
-node:19.9.0-alpine3.16
 node:19.9.0-slim
 node:19.9.0-buster
 node:19.9.0-buster-slim
 node:latest
+node:current-alpine3.18
 node:current-alpine3.17
-node:current-alpine3.16
 node:slim
 node:current-buster
 node:current-buster-slim
diff --git a/node_19.9.0-alpine3.17/Dockerfile b/node_19.9.0-alpine3.17/Dockerfile
index e90dc92..85f68f6 100644
--- a/node_19.9.0-alpine3.17/Dockerfile
+++ b/node_19.9.0-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/node_19.9.0-alpine3.16/Dockerfile b/node_19.9.0-alpine3.18/Dockerfile
similarity index 89%
rename from node_19.9.0-alpine3.16/Dockerfile
rename to node_19.9.0-alpine3.18/Dockerfile
index c1bf444..a435691 100644
--- a/node_19.9.0-alpine3.16/Dockerfile
+++ b/node_19.9.0-alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 ENV NODE_VERSION 19.9.0
 
@@ -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/node_19.9.0-alpine3.16/docker-entrypoint.sh b/node_19.9.0-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from node_19.9.0-alpine3.16/docker-entrypoint.sh
rename to node_19.9.0-alpine3.18/docker-entrypoint.sh
diff --git a/node_current-alpine3.17/Dockerfile b/node_current-alpine3.17/Dockerfile
index 31d6323..8293b75 100644
--- a/node_current-alpine3.17/Dockerfile
+++ b/node_current-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/node_current-alpine3.16/Dockerfile b/node_current-alpine3.18/Dockerfile
similarity index 89%
rename from node_current-alpine3.16/Dockerfile
rename to node_current-alpine3.18/Dockerfile
index f4c95a2..1ee8625 100644
--- a/node_current-alpine3.16/Dockerfile
+++ b/node_current-alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 ENV NODE_VERSION 20.2.0
 
@@ -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/node_current-alpine3.16/docker-entrypoint.sh b/node_current-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from node_current-alpine3.16/docker-entrypoint.sh
rename to node_current-alpine3.18/docker-entrypoint.sh
diff --git a/node_gallium-alpine3.17/Dockerfile b/node_gallium-alpine3.17/Dockerfile
index d45280c..4b5e6bd 100644
--- a/node_gallium-alpine3.17/Dockerfile
+++ b/node_gallium-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/node_gallium-alpine3.16/Dockerfile b/node_gallium-alpine3.18/Dockerfile
similarity index 89%
rename from node_gallium-alpine3.16/Dockerfile
rename to node_gallium-alpine3.18/Dockerfile
index 020a472..a5f6838 100644
--- a/node_gallium-alpine3.16/Dockerfile
+++ b/node_gallium-alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 ENV NODE_VERSION 16.20.0
 
@@ -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/node_gallium-alpine3.16/docker-entrypoint.sh b/node_gallium-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from node_gallium-alpine3.16/docker-entrypoint.sh
rename to node_gallium-alpine3.18/docker-entrypoint.sh
diff --git a/node_lts-alpine3.17/Dockerfile b/node_lts-alpine3.17/Dockerfile
index 552a149..5c95e2e 100644
--- a/node_lts-alpine3.17/Dockerfile
+++ b/node_lts-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/node_lts-alpine3.16/Dockerfile b/node_lts-alpine3.18/Dockerfile
similarity index 89%
rename from node_lts-alpine3.16/Dockerfile
rename to node_lts-alpine3.18/Dockerfile
index 6faa357..c0870b3 100644
--- a/node_lts-alpine3.16/Dockerfile
+++ b/node_lts-alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 ENV NODE_VERSION 18.16.0
 
@@ -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/node_lts-alpine3.16/docker-entrypoint.sh b/node_lts-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from node_lts-alpine3.16/docker-entrypoint.sh
rename to node_lts-alpine3.18/docker-entrypoint.sh

Relevant Maintainers:

@yosifkit yosifkit merged commit 4388a8b into docker-library:master Jun 2, 2023
@uhthomas
Copy link

uhthomas commented Jun 4, 2023

@yosifkit It looks like some architectures, like amd64, are missing from the resulting image. Is this expected?

https://hub.docker.com/layers/library/node/18-alpine3.18/images/sha256-e742fd578c48e66cf1d30521d3773f8c7bbd88fa21f56dc68d13e8f127456a55?context=explore

image

@yosifkit
Copy link
Member

yosifkit commented Jun 5, 2023

The amd64 worker was backed up with a slow to fail job. The node images are up now.

@uhthomas
Copy link

uhthomas commented Jun 5, 2023

Awesome, thanks!

@tianon tianon mentioned this pull request Jun 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/node
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nodejs-github-bot @uhthomas @yosifkit @ttshivers