From c078c13ca2732f132be4788ab763332d8e8079df Mon Sep 17 00:00:00 2001
From: Arlind <arlind@sulej.net>
Date: Tue, 6 Jan 2026 18:04:53 +0100
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 44a36e3..1bd129d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ENV PATH=/usr/local/go/bin:$PATH
 
+# Added jq and wget so the ImageMagick build step works
 RUN apt-get update && apt-get install -y --no-install-recommends \
-  build-essential git git-lfs ca-certificates curl xz-utils xorg-dev libgl1-mesa-dev libgtk-3-dev \
+  build-essential git git-lfs ca-certificates curl xz-utils xorg-dev libgl1-mesa-dev libgtk-3-dev jq wget \
  && rm -rf /var/lib/apt/lists/*
 
 RUN set -eux; \
@@ -61,6 +62,7 @@ RUN set -eux; \
     mkdir -p /out/danser/settings /out/danser/Songs /out/danser/Skins /out/danser/Replays /out/danser/videos; \
     rm -rf "$BUILD_DIR"
 
+# ImageMagick build (kept from your original image)
 RUN set -eux; \
   IMAGICK_URL="$(curl -s https://api.github.com/repos/ImageMagick/ImageMagick/releases/latest | jq -r '.tarball_url')"; \
   mkdir -p /tmp/im; \
@@ -104,9 +106,7 @@ RUN install -d -m 755 /etc/glvnd/egl_vendor.d \
  && cat >/etc/glvnd/egl_vendor.d/10_nvidia.json <<'EOF'
 {
   "file_format_version": "1.0.0",
-  "ICD": {
-    "library_path": "libEGL_nvidia.so.0"
-  }
+  "ICD": { "library_path": "libEGL_nvidia.so.0" }
 }
 EOF
 
@@ -114,10 +114,15 @@ RUN groupadd -g 1000 appuser 2>/dev/null || true \
  && id -u 1000 >/dev/null 2>&1 || useradd -u 1000 -g 1000 -m -s /bin/bash appuser \
  && mkdir -p /app
 
-COPY --from=builder /src/danser        /app/danser
-COPY --from=builder /tmp/im/usr/local/ /usr/local/
+# New-style copy from danser-builder and from /out/danser,
+# with ownership + perms set during copy (like your new image)
+COPY --from=danser-builder --chown=1000:1000 --chmod=755 /out/danser /app/danser
 
-ENV LD_LIBRARY_PATH=/app/danser:/app/danser/ffmpeg/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:${LD_LIBRARY_PATH}
+# Copy ImageMagick from builder stage (fixed stage name)
+COPY --from=danser-builder /tmp/im/usr/local/ /usr/local/
+
+# LD_LIBRARY_PATH updated to include /app/danser/ffmpeg as in the new image
+ENV LD_LIBRARY_PATH=/app/danser:/app/danser/ffmpeg:/app/danser/ffmpeg/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:${LD_LIBRARY_PATH}
 
 RUN ldconfig \
  && mkdir -p /app/danser/{songs,settings,videos,screenshots,custom-replays,skins/default-skin,ffmpeg} \