Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Node: Fix version 18 on arm64v8 arch #16908

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Node: Fix version 18 on arm64v8 arch #16908

merged 1 commit into from
Jun 4, 2024

Conversation

nodejs-github-bot
Copy link
Contributor

@nodejs-github-bot nodejs-github-bot requested review from LaurentGoderre and a team as code owners June 4, 2024 14:39
@github-actions github-actions bot mentioned this pull request Jun 4, 2024
Merged
12 tasks
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 4, 2024

Diff for fdb650c: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index ee4cad2..0e882a7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,12 +9,12 @@ Directory: 18/bookworm
 
 Tags: 18-alpine, 18-alpine3.20, 18.20-alpine, 18.20-alpine3.20, 18.20.3-alpine, 18.20.3-alpine3.20, hydrogen-alpine, hydrogen-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1810f76d762c8b080ab6aec585d66fb0f7f1d4a9
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 18/alpine3.20
 
 Tags: 18-alpine3.19, 18.20-alpine3.19, 18.20.3-alpine3.19, hydrogen-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d3965ef329265accff145164f06653216e416685
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 18/alpine3.19
 
 Tags: 18-bookworm-slim, 18-slim, 18.20-bookworm-slim, 18.20-slim, 18.20.3-bookworm-slim, 18.20.3-slim, hydrogen-bookworm-slim, hydrogen-slim
@@ -49,12 +49,12 @@ Directory: 20/bookworm
 
 Tags: 20-alpine, 20-alpine3.20, 20.14-alpine, 20.14-alpine3.20, 20.14.0-alpine, 20.14.0-alpine3.20, iron-alpine, iron-alpine3.20, lts-alpine, lts-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: daea62837e99456d7556b585edbc2b32fb57369e
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 20/alpine3.20
 
 Tags: 20-alpine3.19, 20.14-alpine3.19, 20.14.0-alpine3.19, iron-alpine3.19, lts-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: daea62837e99456d7556b585edbc2b32fb57369e
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 20/alpine3.19
 
 Tags: 20-bookworm-slim, 20-slim, 20.14-bookworm-slim, 20.14-slim, 20.14.0-bookworm-slim, 20.14.0-slim, iron-bookworm-slim, iron-slim, lts-bookworm-slim, lts-slim
@@ -89,12 +89,12 @@ Directory: 21/bookworm
 
 Tags: 21-alpine, 21-alpine3.20, 21.7-alpine, 21.7-alpine3.20, 21.7.3-alpine, 21.7.3-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1810f76d762c8b080ab6aec585d66fb0f7f1d4a9
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 21/alpine3.20
 
 Tags: 21-alpine3.19, 21.7-alpine3.19, 21.7.3-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 17bf0838eaf9d32ba6280599e51fac5269d0dfb4
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 21/alpine3.19
 
 Tags: 21-bookworm-slim, 21-slim, 21.7-bookworm-slim, 21.7-slim, 21.7.3-bookworm-slim, 21.7.3-slim
@@ -119,12 +119,12 @@ Directory: 22/bookworm
 
 Tags: 22-alpine, 22-alpine3.20, 22.2-alpine, 22.2-alpine3.20, 22.2.0-alpine, 22.2.0-alpine3.20, alpine, alpine3.20, current-alpine, current-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1810f76d762c8b080ab6aec585d66fb0f7f1d4a9
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 22/alpine3.20
 
 Tags: 22-alpine3.19, 22.2-alpine3.19, 22.2.0-alpine3.19, alpine3.19, current-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 14ae63a78d5e38557a56822bd2b1094d038e52a4
+GitCommit: 416397c67bb40e186b621d7dc12deb6b0a1ce34e
 Directory: 22/alpine3.19
 
 Tags: 22-bookworm-slim, 22-slim, 22.2-bookworm-slim, 22.2-slim, 22.2.0-bookworm-slim, 22.2.0-slim, bookworm-slim, current-bookworm-slim, current-slim, slim
diff --git a/node_21.7.3-alpine3.19/Dockerfile b/node_21.7.3-alpine3.19/Dockerfile
index 87cdabe..236fb21 100644
--- a/node_21.7.3-alpine3.19/Dockerfile
+++ b/node_21.7.3-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/node_21.7.3-alpine3.20/Dockerfile b/node_21.7.3-alpine3.20/Dockerfile
index 493d967..22bc894 100644
--- a/node_21.7.3-alpine3.20/Dockerfile
+++ b/node_21.7.3-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/node_current-alpine3.19/Dockerfile b/node_current-alpine3.19/Dockerfile
index 4a152e0..1f96519 100644
--- a/node_current-alpine3.19/Dockerfile
+++ b/node_current-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/node_current-alpine3.20/Dockerfile b/node_current-alpine3.20/Dockerfile
index 8022e39..09c98fb 100644
--- a/node_current-alpine3.20/Dockerfile
+++ b/node_current-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/node_hydrogen-alpine3.19/Dockerfile b/node_hydrogen-alpine3.19/Dockerfile
index c69c0a9..77d19b5 100644
--- a/node_hydrogen-alpine3.19/Dockerfile
+++ b/node_hydrogen-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/node_hydrogen-alpine3.20/Dockerfile b/node_hydrogen-alpine3.20/Dockerfile
index 261fbb3..9df4ff6 100644
--- a/node_hydrogen-alpine3.20/Dockerfile
+++ b/node_hydrogen-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/node_lts-alpine3.19/Dockerfile b/node_lts-alpine3.19/Dockerfile
index 5b92d80..315cd58 100644
--- a/node_lts-alpine3.19/Dockerfile
+++ b/node_lts-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/node_lts-alpine3.20/Dockerfile b/node_lts-alpine3.20/Dockerfile
index 3e6ee48..61c529d 100644
--- a/node_lts-alpine3.20/Dockerfile
+++ b/node_lts-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

Relevant Maintainers:

@LaurentGoderre LaurentGoderre merged commit 62d5a38 into docker-library:master Jun 4, 2024
33 checks passed
@LaurentGoderre LaurentGoderre deleted the node branch June 4, 2024 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

@LaurentGoderre LaurentGoderre LaurentGoderre approved these changes

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 @yosifkit @LaurentGoderre @PeterDaveHello