Remove ROOTLESS environment variable as you can now just supply --user directly to the container (#389)

Increase healthcheck timeout (#392)

Author: wolveix

Dockerfile

@@ -12,7 +12,6 @@ ENV AUTOSAVENUM="5" \
     MAXTICKRATE="30" \
     PGID="1000" \
     PUID="1000" \
-    ROOTLESS="false" \
     SERVERGAMEPORT="7777" \
     SERVERSTREAMING="true" \
     SKIPUPDATE="false" \
@@ -35,17 +34,13 @@ RUN mkdir -p /config \
 COPY init.sh healthcheck.sh /
 COPY --chown=steam:steam run.sh /home/steam/
 
-HEALTHCHECK --timeout=10s --start-period=180s \
-  CMD bash /healthcheck.sh
+HEALTHCHECK --timeout=30s --start-period=300s CMD bash /healthcheck.sh
 
 WORKDIR /config
-
 ARG VERSION="DEV"
 ENV VERSION=$VERSION
 LABEL version=$VERSION
-
 STOPSIGNAL SIGINT
-
 EXPOSE 7777/udp 7777/tcp
 
 ENTRYPOINT [ "/init.sh" ]

README.md

@@ -195,7 +195,6 @@ helm install satisfactory k8s-at-home/satisfactory -f values.yaml
 | `MAXTICKRATE`           |   `30`    | set the maximum sim tick rate for your server             |
 | `PGID`                  |  `1000`   | set the group ID of the user the server will run as       |
 | `PUID`                  |  `1000`   | set the user ID of the user the server will run as        |
-| `ROOTLESS`              |  `false`  | run the container as a non-root user                      |
 | `SERVERGAMEPORT`        |  `7777`   | set the game's port                                       |
 | `SERVERIP`              | `0.0.0.0` | set the game's ip (usually not needed)                    |
 | `SERVERSTREAMING`       |  `true`   | toggle whether the game utilizes asset streaming          |
@@ -248,6 +247,12 @@ really get the best out of multiplayer:
 - Right-click each of the 3 config files (Engine.ini, Game.ini, Scalability.ini)
 - Go to Properties > tick Read-only under the attributes
 
+## Rootless
+
+If you'd prefer to run the container as a non-root user, just pass your preferred user to the container using Docker's
+own user implementation (e.g. `--user 1000:1000`). Do note that the container will print a warning for this, and this
+may permissions-related issues.
+
 ## Known Issues
 
 - The container is run as `root`. This is pretty common for Docker images, but is bad practice for security reasons.

init.sh

@@ -53,10 +53,10 @@ if [[ "${LOG,,}" != "true" ]]; then
     fi
 fi
 
-# check if the user and group IDs have been set
-if [[ "$CURRENTUID" -ne "0" ]] && [[ "${ROOTLESS,,}" != "true" ]]; then
-    printf "${MSGERROR} Current user (%s) is not root (0)\\nPass your user and group to the container using the PGID and PUID environment variables\\nDo not use the --user flag (or user: field in Docker Compose) without setting ROOTLESS=true\\n" "$CURRENTUID"
-    exit 1
+# check if the user and group IDs have been set. If so, reset HOME to the upstream default
+if [[ "$CURRENTUID" -ne "0" ]]; then
+    HOME="/root"
+    printf "${MSGWARNING} Current user (%s) is not root (0).\\nNo permissions will be adjusted as we're running within a rootless environment.\\n" "$CURRENTUID"
 fi
 
 if ! [[ "$PGID" =~ $NUMCHECK ]] ; then
@@ -75,18 +75,18 @@ elif [[ "$PUID" -eq 0 ]]; then
     exit 1
 fi
 
-if [[ "${ROOTLESS,,}" != "true" ]]; then
-  if [[ $(getent group $PGID | cut -d: -f1) ]]; then
-      usermod -a -G "$PGID" steam
-  else
-      groupmod -g "$PGID" steam
-  fi
-
-  if [[ $(getent passwd ${PUID} | cut -d: -f1) ]]; then
-      USER=$(getent passwd $PUID | cut -d: -f1)
-  else
-      usermod -u "$PUID" steam
-  fi
+if [[ "$CURRENTUID" -eq "0" ]]; then
+    if [[ $(getent group $PGID | cut -d: -f1) ]]; then
+        usermod -a -G "$PGID" steam
+    else
+        groupmod -g "$PGID" steam
+    fi
+
+    if [[ $(getent passwd ${PUID} | cut -d: -f1) ]]; then
+        USER=$(getent passwd $PUID | cut -d: -f1)
+    else
+        usermod -u "$PUID" steam
+    fi
 fi
 
 if [[ ! -w "/config" ]]; then
@@ -109,9 +109,10 @@ mkdir -p \
 
 echo "Satisfactory logs can be found in /config/gamefiles/FactoryGame/Saved/Logs" > /config/logs/satisfactory-path.txt
 
-if [[ "${ROOTLESS,,}" != "true" ]]; then
-  chown -R "$PUID":"$PGID" /config /home/steam /tmp/dumps
-  exec gosu "$USER" "/home/steam/run.sh" "$@"
+if [[ "$CURRENTUID" -eq "0" ]]; then
+    chown -R "$PUID":"$PGID" /config /home/steam /tmp/dumps
+    exec gosu "$USER" "/home/steam/run.sh" "$@"
 else
-  exec "/home/steam/run.sh" "$@"
+    # running within a rootless environment
+    exec "/home/steam/run.sh" "$@"
 fi