From dd9174b9aeffc64487e05541a8c165a394aea566 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 14 Apr 2022 11:30:42 -0500
Subject: [PATCH] Fixed running as uid=0 even with UID unset

---
 Dockerfile    | 2 +-
 scripts/start | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 38a8e395f68..3bcbb61aa3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,7 +57,7 @@ WORKDIR /data
 
 STOPSIGNAL SIGTERM
 
-ENV TYPE=VANILLA VERSION=LATEST EULA=""
+ENV TYPE=VANILLA VERSION=LATEST EULA="" UID=1000 GID=1000
 
 COPY --chmod=755 scripts/start* /
 COPY --chmod=755 bin/ /usr/local/bin/
diff --git a/scripts/start b/scripts/start
index bed48a77b24..4efe066c2fa 100755
--- a/scripts/start
+++ b/scripts/start
@@ -3,6 +3,7 @@
 # shellcheck source=start-utils
 . "${SCRIPTS:-/}start-utils"
 
+# The Dockerfile ENVs take precedence here, but defaulting for testing consistency
 : "${UID:=1000}"
 : "${GID:=1000}"