From 16c741733f81d2aefa5042c0ba999cd5d710621e Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Mon, 8 Jan 2024 14:38:41 +0100
Subject: [PATCH] node dependency fix in dockerfile

---
 .github/workflows/build-debian12-dev.yml | 6 +++---
 debian12/Dockerfile                      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml
index 59c1c2f..8f8765f 100644
--- a/.github/workflows/build-debian12-dev.yml
+++ b/.github/workflows/build-debian12-dev.yml
@@ -108,9 +108,9 @@ jobs:
           # Set values in Dockerfile
           sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.EXPERIMENTAL_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
           mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
-          # Remove separate npm install as fix for Node 20 
-          sed "/&& apt-get update && apt-get install -q -y --no-install-recommends npm/d" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
-          mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
+          # Remove separate npm install as fix for Node 20 (fixed in dockerfile??)
+          # sed "/&& apt-get update && apt-get install -q -y --no-install-recommends npm/d" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
+          # mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3.0.0
diff --git a/debian12/Dockerfile b/debian12/Dockerfile
index 8013eca..37ee4f8 100644
--- a/debian12/Dockerfile
+++ b/debian12/Dockerfile
@@ -45,8 +45,8 @@ RUN apt-get update && apt-get upgrade -y \
     && 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}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
     && apt-get update && apt-get install -q -y --no-install-recommends nodejs \
-    # Install npm (does no longer come with nodejs?)
-    && apt-get update && apt-get install -q -y --no-install-recommends npm \
+    # Check for and install npm if not installed (no longer comes with nodejs? Bug?)
+    && npm --version || apt-get update && apt-get install -q -y --no-install-recommends npm \
     # Install node-gyp
     && npm install --production -g node-gyp \
     # Generating locales