Merge pull request #29 from thecodingmachine/fix/node-install-deprecation

mistraloz · web-flow · commit ac4d3ef944c8 · 2023-09-15T10:44:19.000+02:00
Fix/node install deprecation
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
diff --git a/Dockerfile.14-apache-bullseye b/Dockerfile.14-apache-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.14-apache-bullseye-build b/Dockerfile.14-apache-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.14-bullseye b/Dockerfile.14-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.14-bullseye-build b/Dockerfile.14-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.16-apache-bullseye b/Dockerfile.16-apache-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.16-apache-bullseye-build b/Dockerfile.16-apache-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.16-bullseye b/Dockerfile.16-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.16-bullseye-build b/Dockerfile.16-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_16.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.18-apache-bullseye b/Dockerfile.18-apache-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.18-apache-bullseye-build b/Dockerfile.18-apache-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.18-bullseye b/Dockerfile.18-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.18-bullseye-build b/Dockerfile.18-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_18.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.20-apache-bullseye b/Dockerfile.20-apache-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.20-apache-bullseye-build b/Dockerfile.20-apache-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -119,7 +120,9 @@ RUN a2enmod rewrite
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.20-bullseye b/Dockerfile.20-bullseye
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Dockerfile.20-bullseye-build b/Dockerfile.20-bullseye-build
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)
 FROM debian:bullseye-slim
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
@@ -49,7 +50,9 @@ RUN SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_20.x | bash - &&\
+    mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
diff --git a/Makefile b/Makefile
@@ -0,0 +1,19 @@
+blueprint: ## Generate all blueprints file
+	@if ! type orbit >/dev/null 2>&1; then echo "Missing orbit dependency, please install from https://github.com/gulien/orbit/"; exit 1; fi
+	orbit run generate
+	@sed -i '1i\# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)' Dockerfile.*
+
+test-latest: test-20 ## Test the latest build only
+
+test-14: ## Test node 14 build only
+test-16: ## Test node 16 build only
+test-18: ## Test node 18 build only
+test-20: ## Test node 20 build only
+test-%: blueprint ## Test node X build
+	BRANCH=master VARIANT=$(*)-bullseye TAG=v2-$(*)-bullseye ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	BRANCH=master VARIANT=$(*)-bullseye-build TAG=v2-$(*)-bullseye-build ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	BRANCH=master VARIANT=$(*)-apache-bullseye TAG=v2-$(*)-apache-bullseye ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	BRANCH=master VARIANT=$(*)-apache-bullseye-build TAG=v2-$(*)-apache-bullseye-build ./build-and-test.sh || (notify-send -u critical "Tests failed" && exit 1)
+	notify-send -u critical "Tests passed with success for $*"
+
+clean: ## Clean dangles image after build
diff --git a/build-and-test.sh b/build-and-test.sh
@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
 
-set -xe
+set -eE -o functrace
+
+failure() {
+  local lineno=$1
+  local msg=$2
+  echo "Failed at $lineno: $msg"
+  sudo rm user1999 -rf
+}
+trap 'failure ${LINENO} "$BASH_COMMAND"' ERR
 
 docker buildx build --platform=linux/amd64 --load -t thecodingmachine/nodejs:${TAG} -f Dockerfile.${VARIANT} .
 
@@ -13,7 +21,7 @@ RESULT=`docker run --rm thecodingmachine/nodejs:${TAG} id -ur`
 # If mounted, default user has the id of the mount directory
 mkdir user1999 && sudo chown 1999:1999 user1999
 ls -al user1999
-RESULT=`docker run --rm -v $(pwd)/user1999:$CONTAINER_CWD thecodingmachine/nodejs:${TAG} id -ur`
+RESULT=`docker run --rm -v "$(pwd)/user1999:$CONTAINER_CWD" thecodingmachine/nodejs:${TAG} id -ur`
 [[ "$RESULT" = "1999" ]]
 sudo rm -rf user1999
 
diff --git a/orbit.yml b/orbit.yml
@@ -19,19 +19,19 @@ tasks:
   - use: generate
     short: Generates all Dockerfiles
     run:
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye -p "NodeVersion,14.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye -p "NodeVersion,16.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye -p "NodeVersion,18.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye -p "NodeVersion,20.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye -p "NodeVersion,14.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye -p "NodeVersion,16.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye -p "NodeVersion,18.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye -p "NodeVersion,20.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye-build -p "NodeVersion,14.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye-build -p "NodeVersion,16.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye-build -p "NodeVersion,18.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye-build -p "NodeVersion,20.x;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye-build -p "NodeVersion,14.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye-build -p "NodeVersion,16.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye-build -p "NodeVersion,18.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
-      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye-build -p "NodeVersion,20.x;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye -p "NodeVersion,14;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye -p "NodeVersion,16;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye -p "NodeVersion,18;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye -p "NodeVersion,20;Variant,standalone;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye -p "NodeVersion,14;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye -p "NodeVersion,16;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye -p "NodeVersion,18;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye -p "NodeVersion,20;Variant,apache;BaseImage,debian:bullseye-slim;Build,false"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-bullseye-build -p "NodeVersion,14;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-bullseye-build -p "NodeVersion,16;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-bullseye-build -p "NodeVersion,18;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-bullseye-build -p "NodeVersion,20;Variant,standalone;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.14-apache-bullseye-build -p "NodeVersion,14;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.16-apache-bullseye-build -p "NodeVersion,16;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.18-apache-bullseye-build -p "NodeVersion,18;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
+      - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.20-apache-bullseye-build -p "NodeVersion,20;Variant,apache;BaseImage,debian:bullseye-slim;Build,true"
diff --git a/utils/Dockerfile.blueprint b/utils/Dockerfile.blueprint
@@ -124,7 +124,9 @@ RUN a2enmod rewrite
 
 RUN apt-get update &&\
     apt-get install -y --no-install-recommends gnupg &&\
-    curl -sL https://deb.nodesource.com/setup_{{ $node_version }} | bash - &&\
+    {{ if lt $node_version "16" }}curl -sL https://deb.nodesource.com/setup_{{ $node_version }}.x | bash - &&\{{ else }}mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_{{ $node_version }}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\{{ end }}
     apt-get update &&\
     apt-get install -y --no-install-recommends nodejs
 
@@ -183,7 +185,7 @@ USER root
 # | Defines the entrypoint.
 # |
 
-ENV NODE_VERSION={{ $node_version }}
+ENV NODE_VERSION={{ $node_version }}.x
 
 {{ if eq $variant "standalone" }}
 RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +# IntelliJ project files
 +.idea
 +*.iml
 +out
 +gen
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.blueprint)`
`1`	`2`	`FROM debian:bullseye-slim`
`2`	`3`
`3`	`4`	`LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"`