search

nodejs / docker-node

Official Docker Image for Node.js :whale: :turtle: :rocket:
https://hub.docker.com/_/node/
MIT License
8.13k stars 1.95k forks source link

chore: fix update script for mac silicon #2073

Closed SimenB closed 1 month ago

SimenB commented 2 months ago

Fixes #1848, but I'm not sure if it's the correct fix.

If I set arch as arm64, I get this diff:

diff --git i/18/alpine3.18/Dockerfile w/18/alpine3.18/Dockerfile
index fb8836d..065cb4a 100644
--- i/18/alpine3.18/Dockerfile
+++ w/18/alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM arm64/alpine:3.18

 ENV NODE_VERSION 18.20.2

diff --git i/18/alpine3.19/Dockerfile w/18/alpine3.19/Dockerfile
index 22a2c85..4652a8f 100644
--- i/18/alpine3.19/Dockerfile
+++ w/18/alpine3.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM arm64/alpine:3.19

 ENV NODE_VERSION 18.20.2

diff --git i/18/bookworm-slim/Dockerfile w/18/bookworm-slim/Dockerfile
index 83f954b..be12682 100644
--- i/18/bookworm-slim/Dockerfile
+++ w/18/bookworm-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM arm64/debian:bookworm-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/18/bookworm/Dockerfile w/18/bookworm/Dockerfile
index cd31775..9108880 100644
--- i/18/bookworm/Dockerfile
+++ w/18/bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:bookworm
+FROM arm64/buildpack-deps:bookworm

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/18/bullseye-slim/Dockerfile w/18/bullseye-slim/Dockerfile
index aa58ba9..ca21112 100644
--- i/18/bullseye-slim/Dockerfile
+++ w/18/bullseye-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM arm64/debian:bullseye-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/18/bullseye/Dockerfile w/18/bullseye/Dockerfile
index a6e6dfc..8fa4e6e 100644
--- i/18/bullseye/Dockerfile
+++ w/18/bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:bullseye
+FROM arm64/buildpack-deps:bullseye

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/18/buster-slim/Dockerfile w/18/buster-slim/Dockerfile
index 48b0f11..711f523 100644
--- i/18/buster-slim/Dockerfile
+++ w/18/buster-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM arm64/debian:buster-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/18/buster/Dockerfile w/18/buster/Dockerfile
index 51590c3..7bb1d5b 100644
--- i/18/buster/Dockerfile
+++ w/18/buster/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:buster
+FROM arm64/buildpack-deps:buster

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/20/alpine3.18/Dockerfile w/20/alpine3.18/Dockerfile
index faa5209..99d9034 100644
--- i/20/alpine3.18/Dockerfile
+++ w/20/alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM arm64/alpine:3.18

 ENV NODE_VERSION 20.12.2

diff --git i/20/alpine3.19/Dockerfile w/20/alpine3.19/Dockerfile
index c915d57..ef08e64 100644
--- i/20/alpine3.19/Dockerfile
+++ w/20/alpine3.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM arm64/alpine:3.19

 ENV NODE_VERSION 20.12.2

diff --git i/20/bookworm-slim/Dockerfile w/20/bookworm-slim/Dockerfile
index 9b357c6..66e4563 100644
--- i/20/bookworm-slim/Dockerfile
+++ w/20/bookworm-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM arm64/debian:bookworm-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/20/bookworm/Dockerfile w/20/bookworm/Dockerfile
index 21e6f06..4fa1e06 100644
--- i/20/bookworm/Dockerfile
+++ w/20/bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:bookworm
+FROM arm64/buildpack-deps:bookworm

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/20/bullseye-slim/Dockerfile w/20/bullseye-slim/Dockerfile
index 3cd6cef..cf5c35a 100644
--- i/20/bullseye-slim/Dockerfile
+++ w/20/bullseye-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM arm64/debian:bullseye-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/20/bullseye/Dockerfile w/20/bullseye/Dockerfile
index 6aae693..891cee1 100644
--- i/20/bullseye/Dockerfile
+++ w/20/bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:bullseye
+FROM arm64/buildpack-deps:bullseye

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/20/buster-slim/Dockerfile w/20/buster-slim/Dockerfile
index dcb2bc2..5b9a0fe 100644
--- i/20/buster-slim/Dockerfile
+++ w/20/buster-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM arm64/debian:buster-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/20/buster/Dockerfile w/20/buster/Dockerfile
index b1fae95..7f08c96 100644
--- i/20/buster/Dockerfile
+++ w/20/buster/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:buster
+FROM arm64/buildpack-deps:buster

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/21/alpine3.18/Dockerfile w/21/alpine3.18/Dockerfile
index 4150fb1..4235a64 100644
--- i/21/alpine3.18/Dockerfile
+++ w/21/alpine3.18/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM arm64/alpine:3.18

 ENV NODE_VERSION 21.7.3

diff --git i/21/alpine3.19/Dockerfile w/21/alpine3.19/Dockerfile
index 87cdabe..ecc2166 100644
--- i/21/alpine3.19/Dockerfile
+++ w/21/alpine3.19/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM arm64/alpine:3.19

 ENV NODE_VERSION 21.7.3

diff --git i/21/bookworm-slim/Dockerfile w/21/bookworm-slim/Dockerfile
index 6e502c6..a0687d4 100644
--- i/21/bookworm-slim/Dockerfile
+++ w/21/bookworm-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM arm64/debian:bookworm-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/21/bookworm/Dockerfile w/21/bookworm/Dockerfile
index 51a91cd..195e551 100644
--- i/21/bookworm/Dockerfile
+++ w/21/bookworm/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:bookworm
+FROM arm64/buildpack-deps:bookworm

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/21/bullseye-slim/Dockerfile w/21/bullseye-slim/Dockerfile
index fac738b..44ad73d 100644
--- i/21/bullseye-slim/Dockerfile
+++ w/21/bullseye-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM arm64/debian:bullseye-slim

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node
diff --git i/21/bullseye/Dockerfile w/21/bullseye/Dockerfile
index e0842c0..e0a7ec7 100644
--- i/21/bullseye/Dockerfile
+++ w/21/bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:bullseye
+FROM arm64/buildpack-deps:bullseye

 RUN groupadd --gid 1000 node \
   && useradd --uid 1000 --gid node --shell /bin/bash --create-home node

which seems wrong 😀

LaurentGoderre commented 1 month ago

I don't think this is right. It should explicitly define the arch

SimenB commented 1 month ago

Feel free to push to this branch 😀

LaurentGoderre commented 1 month ago

What is broken that this fixes?

SimenB commented 1 month ago

Running the update script on arm64 macs (see linked https://github.com/nodejs/docker-node/issues/1848)

LaurentGoderre commented 1 month ago

Ooooh, the diff you posted is what you get before the fix.

SimenB commented 1 month ago

No, the diff is if I do arch="arm64". Without the changes in this PR the script exits with 1 long before updating any files at all.

LaurentGoderre commented 1 month ago

@SimenB @PeterDaveHello fixed.