From 9f66b6701ebbc53627c05eebf9421e926de23622 Mon Sep 17 00:00:00 2001
From: cuqmbr <me@cuqmbr.xyz>
Date: Tue, 12 Aug 2025 19:14:00 +0300
Subject: [PATCH 1/2] rearranged Dockerfile statements and add remove cache
 after locale installation

---
 Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9d0414f..4345650 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,13 +57,17 @@ RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \
 # Generate unicode locale so that cyrillic characters display properly
 RUN apt-get update -y && apt-get install -y locales && \
     echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    rm -Rf var/lib/apt/lists/*
 ENV LANG en_US.UTF-8
 
 
 VOLUME ${DATA_PATH}
 
 
+EXPOSE 25565/tcp
+
+
 ENV MEMORY=4G
 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
 
@@ -84,8 +88,6 @@ ENV SKINSRESTORER_DB_PASSWORD=0000
 
 WORKDIR ${WORKDIR_PATH}/config
 
-EXPOSE 25565/tcp
-
 CMD \
     # Add proxy secret
     sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \

From a33799c886a33f3ca6f4705c02251aea2f9a62dc Mon Sep 17 00:00:00 2001
From: cuqmbr <me@cuqmbr.xyz>
Date: Tue, 12 Aug 2025 19:14:50 +0300
Subject: [PATCH 2/2] add uid/gid selection to run application as in Dockerfile

---
 Dockerfile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4345650..b39d9b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,6 +68,9 @@ VOLUME ${DATA_PATH}
 EXPOSE 25565/tcp
 
 
+ENV GID=988
+ENV UID=999
+
 ENV MEMORY=4G
 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
 
@@ -89,6 +92,13 @@ ENV SKINSRESTORER_DB_PASSWORD=0000
 WORKDIR ${WORKDIR_PATH}/config
 
 CMD \
+    # Create and switch to user with desired UID and GID.
+    # All processes that create/change files in ${DATA_PATH}
+    # must be run under this user.
+    groupadd -g ${GID} worker && \
+    useradd -M -g ${GID} -u ${UID} worker && \
+    chmod -R o-rwx ${WORKDIR_PATH} && \
+
     # Add proxy secret
     sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \
 
@@ -109,5 +119,8 @@ CMD \
     sed -i "s/_SKINSRESTORER_DB_USERNAME_/${SKINSRESTORER_DB_USERNAME}/g" plugins/SkinsRestorer/config.yml && \
     sed -i "s/_SKINSRESTORER_DB_PASSWORD_/${SKINSRESTORER_DB_PASSWORD}/g" plugins/SkinsRestorer/config.yml && \
 
+    # Change UID and GID of used files to desired values.
+    chown -R worker:worker ${WORKDIR_PATH} && \
+
     # Launch
-    java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui
+    su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui"