Change node to the new scriptless install for v16 and above

Author: dylanbr

utils/Dockerfile.node.blueprint

@@ -17,7 +17,13 @@ ENV BLACKFIRE_VERSION=${BLACKFIRE_VERSION}
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends gnupg && \
-    curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
+    if [[ "${NODE_VERSION}" -lt "16" ]]; then \
+        curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo bash -; \
+    else \
+        sudo mkdir -p /etc/apt/keyrings && \
+        curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo 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" | sudo tee /etc/apt/sources.list.d/nodesource.list; \
+    fi && \
     apt-get update && \
     apt-get install -y --no-install-recommends nodejs && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

utils/Dockerfile.slim.blueprint

@@ -417,7 +417,13 @@ ONBUILD ARG NODE_VERSION
 ONBUILD RUN if [ -n "$NODE_VERSION" ]; then \
     sudo apt-get update && \
     sudo apt-get install -y --no-install-recommends gnupg && \
-    curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo bash - && \
+    if [[ "${NODE_VERSION}" -lt "16" ]]; then \
+        curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo bash -; \
+    else \
+        sudo mkdir -p /etc/apt/keyrings && \
+        curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo 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" | sudo tee /etc/apt/sources.list.d/nodesource.list; \
+    fi && \
     sudo apt-get update && \
     sudo apt-get install -y --no-install-recommends nodejs && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \