From 18effab00c7bab3adf16dafcc84f2fcb2da0a6ba Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 11 Feb 2025 08:24:50 +0100
Subject: [PATCH] Node corepack fixes, debuid now depends from node

---
 debuild/Dockerfile | 18 +++---------------
 node/Dockerfile    |  5 +++--
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debuild/Dockerfile b/debuild/Dockerfile
index b323eaf..470c1f4 100644
--- a/debuild/Dockerfile
+++ b/debuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM registry.verdnatura.es/verdnatura/node:20.18.3-vn1
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -6,20 +6,8 @@ RUN apt-get update \
     && apt-get install -y \
         build-essential \
         debhelper \
-        devscripts
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-        ca-certificates \
-        gnupg2 \
-        libfontconfig \
-    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install -y --no-install-recommends \
-        nodejs \
-    && npm install -g npm
-
-RUN rm -rf /var/lib/apt/lists/*
+        devscripts \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN groupadd -g 1000 jenkins \
     && useradd -d /home/jenkins -u 1000 -g 1000 -m -s /bin/bash jenkins \
diff --git a/node/Dockerfile b/node/Dockerfile
index d520086..3af76b5 100644
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:12.6-slim
+FROM registry.verdnatura.es/debian:12.9-slim
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -9,5 +9,6 @@ RUN apt-get update \
         gnupg2 \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g npm \
+    && npm install -g corepack@0.31.0 \
+    && corepack enable pnpm \
     && rm -rf /var/lib/apt/lists/*