From 4932429b1fd43d469cfe8eaad4d49cd3663cee40 Mon Sep 17 00:00:00 2001
From: Tom Trumper <tom-trumper@hotmail.co.uk>
Date: Wed, 15 Jul 2026 11:23:11 +0100
Subject: [PATCH] fix(apps/docker): Include build ARGs in client-data (#25737)

---
 apps/docker/Dockerfile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/docker/Dockerfile b/apps/docker/Dockerfile
index 0ad7080bf..8b4ff60b2 100644
--- a/apps/docker/Dockerfile
+++ b/apps/docker/Dockerfile
@@ -225,9 +225,21 @@ LABEL description="AzerothCore client-data"
 ENV DATAPATH=/azerothcore/env/dist/data
 
 RUN apt-get update && \
-    apt-get install -y curl unzip && \
+    apt-get install -y curl unzip adduser && \
     rm -rf /var/lib/apt/lists/*
 
+ARG USER_ID=1000
+ARG GROUP_ID=1000
+ARG DOCKER_USER=acore
+
+# To use GID/UID 1000 in ubuntu > 23.04 the existing user must be deleted
+# See https://bugs.launchpad.net/cloud-images/+bug/2005129
+RUN userdel --remove ubuntu \
+  && addgroup --gid "$GROUP_ID" "$DOCKER_USER" \
+  && adduser --disabled-password --gecos '' --uid "$USER_ID" --gid "$GROUP_ID" "$DOCKER_USER" \
+  && passwd -d "$DOCKER_USER" \
+  && chown -R "$DOCKER_USER:$DOCKER_USER" /azerothcore
+
 COPY --chown=$DOCKER_USER:$DOCKER_USER apps apps
 
 VOLUME /azerothcore/env/dist/data