From 55e88a861c0145393742ef1b54e8a58ab52aa0c6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Jan 2026 03:41:31 +0000
Subject: [PATCH] fix(deps): update weekly-non-major-updates

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index dd6b18df..94e64fde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,7 +60,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 # ---- Frontend Builder ----
 # Build the frontend using the BUILDPLATFORM to avoid arm64 musl Rollup native issues
+<<<<<<< HEAD
 FROM --platform=$BUILDPLATFORM node:24.13.0-slim AS frontend-builder
+=======
+FROM --platform=$BUILDPLATFORM node:24.13.0-alpine AS frontend-builder
+>>>>>>> 45def8e3 (fix(deps): update weekly-non-major-updates)
 WORKDIR /app/frontend
 
 # Copy frontend package files