From f9167cfc13a64566df783358a816f7343af2dd31 Mon Sep 17 00:00:00 2001
From: robertsLando <daniel.sorridi@gmail.com>
Date: Wed, 18 Dec 2024 16:59:24 +0100
Subject: [PATCH 1/3] chore: move to alpine 3.21

Fixes #4064
---
 .github/workflows/ci.yml | 2 +-
 api/app.ts               | 1 +
 docker/Dockerfile        | 8 ++++----
 docker/Dockerfile.debian | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83bf08b1a85..862c812ec24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
 
     steps:
       - name: Checkout Z-Wave JS UI
diff --git a/api/app.ts b/api/app.ts
index c15ad28045e..d8b6e090a8e 100644
--- a/api/app.ts
+++ b/api/app.ts
@@ -343,6 +343,7 @@ async function loadCertKey(): Promise<{
 		try {
 			const result = await createCertificate([], {
 				days: 99999,
+				keySize: 2048,
 			})
 
 			key = result.private
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 98ba4cc815e..27e007cc917 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,13 +1,13 @@
 ARG image=zwave-js-ui
 
-FROM alpine:3.18.4 as base
+FROM alpine:3.21.0 AS base
 
 RUN apk add --no-cache \
     openssl \
     libusb \
     tzdata \
     eudev \
-    nodejs=18.20.1-r0
+    nodejs=22.11.0-r0
 
 # https://pkgs.alpinelinux.org/packages?name=nodejs&branch=edge&repo=&arch=&maintainer=
 
@@ -22,7 +22,7 @@ RUN \
         build-base \
         linux-headers \
         python3-dev \
-        npm=9.6.6-r0
+        npm
 
 COPY . .
 
@@ -68,7 +68,7 @@ FROM base AS runtime
 # Copy files from previous build stage
 COPY --from=build-zui /usr/src/app /usr/src/app
 
-ENV TAG_NAME=${image_name}
+ENV TAG_NAME=${image}
 
 ENV NODE_ENV=production
 
diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
index d4ec0bd06fd..677e7e6c987 100644
--- a/docker/Dockerfile.debian
+++ b/docker/Dockerfile.debian
@@ -60,7 +60,7 @@ RUN apt-get update && apt-get install -y \
 # Copy files from the previous build stage
 COPY --from=build-zui /usr/src/app /usr/src/app
 
-ENV TAG_NAME=${image_name}
+ENV TAG_NAME=${image}
 
 ENV NODE_ENV=production
 

From 6be7e68f7ab44c5100897d054581026369f42e30 Mon Sep 17 00:00:00 2001
From: robertsLando <daniel.sorridi@gmail.com>
Date: Wed, 18 Dec 2024 17:17:23 +0100
Subject: [PATCH 2/3] fix: add specific npm version

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 27e007cc917..59d2c375b8c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
         build-base \
         linux-headers \
         python3-dev \
-        npm
+        npm=10.9.1-r0
 
 COPY . .
 

From b5645a24fbd647e9b81e50828a68b9d7b9089908 Mon Sep 17 00:00:00 2001
From: robertsLando <daniel.sorridi@gmail.com>
Date: Thu, 20 Mar 2025 14:03:54 +0100
Subject: [PATCH 3/3] fix: remove npm version pinning from Dockerfile

---
 docker/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0847b6d0cbf..7d97f3a8ce7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,8 +29,7 @@ RUN \
         jq \
         build-base \
         linux-headers \
-        python3-dev \
-        npm=10.9.1-r0
+        python3-dev
 
 COPY . .