From dceff4f7dcc8c2c04e8e9e7db1b4b3f7787ae96f Mon Sep 17 00:00:00 2001
From: "Dr. Dvorak" <docdvorak@gmail.com>
Date: Tue, 12 Nov 2024 05:11:17 -0800
Subject: [PATCH] Add UID/GID build args to docker image

---
 Dockerfile         | 18 ++++++++++++++----
 docker-compose.yml |  2 ++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be3e464..339020a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,20 @@ RUN CGO_ENABLED=0 \
     go build -o screeps-launcher ./cmd/screeps-launcher
 
 FROM buildpack-deps:buster
-RUN groupadd --gid 1000 screeps \
-  && useradd --uid 1000 --gid screeps --shell /bin/bash --create-home screeps \
-  && mkdir /screeps && chown screeps.screeps /screeps
-USER screeps
+
+ARG UID=1000
+ARG GID=1000
+RUN <<-EOT bash
+    if [[ "${GID}" != "0" ]] ; then
+        groupadd --gid ${GID} screeps
+    fi
+    if [[ "${UID}" != "0" ]] ; then
+        useradd --uid ${UID} --gid ${GID} --shell /bin/bash --create-home screeps
+    fi
+    mkdir /screeps && chown ${UID}:${GID} /screeps
+EOT
+
+USER ${UID}:${GID}
 VOLUME /screeps
 WORKDIR /screeps
 COPY --from=builder /app/screeps-launcher /usr/bin/
diff --git a/docker-compose.yml b/docker-compose.yml
index 602fd72..9b14160 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,8 @@ services:
       context: .
       args:
         ARCH: amd64
+        UID: 1000
+        GID: 1000
     image: screepers/screeps-launcher
     volumes:
       - ./config.yml:/screeps/config.yml