From 284884fc1d26e0ed2eb87c3e6497b95d2d07a483 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Tue, 30 Sep 2025 18:56:02 +0200
Subject: [PATCH 1/4] Add missing quotes to PLATFORMS in build_and_push.yml

---
 .github/workflows/build_and_push.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_push.yml b/.github/workflows/build_and_push.yml
index 80565493..b88c72e8 100644
--- a/.github/workflows/build_and_push.yml
+++ b/.github/workflows/build_and_push.yml
@@ -72,7 +72,7 @@ jobs:
           TAGS="freikin/dawarich:${VERSION}"
 
           # Set platforms based on version type and release type
-          PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7
+          PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7"
 
           # Check if this is a patch version (x.y.z where z > 0)
           if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[1-9][0-9]*$ ]]; then
@@ -80,7 +80,7 @@ jobs:
             PLATFORMS="linux/amd64"
           elif [[ $VERSION =~ ^[0-9]+\.[0-9]+\.0$ ]]; then
             echo "Detected minor version ($VERSION) - building for all platforms"
-            PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7
+            PLATFORMS="linux/amd64,linux/arm64,linux/arm/v8,linux/arm/v7"
           else
             echo "Version format not recognized or non-semver - using AMD64 only for safety"
             PLATFORMS="linux/amd64"

From ffa90b50f701e64e773186528b57e8c726719d3b Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Tue, 30 Sep 2025 19:17:26 +0200
Subject: [PATCH 2/4] Update Dockerfile.dev

---
 docker/Dockerfile.dev | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index ee6edf40..b16e2bdf 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -28,7 +28,12 @@ RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no
     less \
     libjemalloc2 libjemalloc-dev \
     cmake \
-    && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
+    ca-certificates \
+    gnupg \
+    && 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_lts.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
     && apt-get install -y nodejs \
     && npm install -g yarn \
     && mkdir -p $APP_PATH \

From 4e9e1e933a7153dececce5a8fdce6c19bc07122e Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Tue, 30 Sep 2025 20:09:02 +0200
Subject: [PATCH 3/4] Update Dockerfile.dev

---
 docker/Dockerfile.dev | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index b16e2bdf..6c27d4f5 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -29,14 +29,13 @@ RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no
     libjemalloc2 libjemalloc-dev \
     cmake \
     ca-certificates \
-    gnupg \
-    && 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_lts.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
-    && apt-get update \
+    && mkdir -p $APP_PATH \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Node.js using official NodeSource script
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
     && apt-get install -y nodejs \
     && npm install -g yarn \
-    && mkdir -p $APP_PATH \
     && rm -rf /var/lib/apt/lists/*
 
 # Use jemalloc with check for architecture

From e8cc4c5b8be00e29b3f3d2ea4814e09077940687 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Tue, 30 Sep 2025 20:27:02 +0200
Subject: [PATCH 4/4] Update Dockerfile.dev

---
 docker/Dockerfile.dev | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 6c27d4f5..ca4df914 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -33,10 +33,18 @@ RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -y --no
     && rm -rf /var/lib/apt/lists/*
 
 # Install Node.js using official NodeSource script
-RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
-    && apt-get install -y nodejs \
-    && npm install -g yarn \
-    && rm -rf /var/lib/apt/lists/*
+# NodeSource supports: amd64, arm64, armhf (arm/v7)
+# For unsupported architectures, fall back to Debian's nodejs package
+RUN ARCH=$(dpkg --print-architecture) && \
+    if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \
+        curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+        apt-get install -y nodejs; \
+    else \
+        apt-get update && \
+        apt-get install -y nodejs npm; \
+    fi && \
+    npm install -g yarn && \
+    rm -rf /var/lib/apt/lists/*
 
 # Use jemalloc with check for architecture
 RUN if [ "$(uname -m)" = "x86_64" ]; then \