From 068e3ab48d5328e1fd8c2060b91806f118922598 Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Sun, 8 Jan 2023 20:05:40 -0600
Subject: [PATCH] feat: better support for mounts

---
 Dockerfile       | 25 ++++++++++++++++++++-----
 scripts/entry.sh |  0
 2 files changed, 20 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 scripts/entry.sh

diff --git a/Dockerfile b/Dockerfile
index 3f8d7d6..863512c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.4
 FROM asgard.orion-technologies.io/steamcmd:1.0 AS build
-
 LABEL maintainer="price@orion-technologies.io"
+USER root
 
 ARG steam_app_id=403240
 ARG steam_beta_app_id=774961
@@ -21,10 +21,14 @@ ENV GAMEPORT=7787 \
     FIXEDMAXTICKRATE=40 \
     RANDOM=NONE
 
+COPY --chown=${USER} ./scripts/entry.sh "${USER_HOME}/entry.sh"
+
 SHELL [ "/bin/bash", "-c" ]
 
 RUN <<__EOR__
 
+chmod 0744 "${USER_HOME}/entry.sh"
+
 if (( use_squad_beta == 1 )); then
     # Install Squad from the Beta branch
     "${STEAM_CMD_INSTALL_DIR}/steamcmd.sh" \
@@ -57,15 +61,26 @@ for mod in "${squad_mods[@]}"; do
         "${SQUAD_SERVER_DIR}/SquadGame/Plugins/Mods/${mod}"
 done
 
+rm -rf "${SQUAD_SERVER_DIR}/SquadGame/ServerConfig"
+mkdir -p /ServerConfig
+ln -s /ServerConfig "${SQUAD_SERVER_DIR}/SquadGame/ServerConfig"
+chown -R "${USER}:${USER}" /ServerConfig
+chmod -R 0744 /ServerConfig
+
 
 __EOR__
 
+USER "${USER}"
+
+
+
+FROM build AS prod
+USER "${USER}"
+WORKDIR "${USER_HOME}"
+CMD [ "/bin/bash", "entry.sh" ]
+
 EXPOSE ${GAMEPORT}/udp \
             ${QUERYPORT}/tcp \
             ${QUERYPORT}/udp \
             ${RCONPORT}/tcp \
             ${RCONPORT}/udp
-
-COPY ./scripts/entry.sh "/entry.sh"
-
-ENTRYPOINT [ "/bin/bash", "/entry.sh" ]
diff --git a/scripts/entry.sh b/scripts/entry.sh
old mode 100644
new mode 100755