Moved trap to init

Dockerfile

@@ -31,7 +31,8 @@ RUN apt-get update          \
     && apt-get install -y   \
     htop net-tools nano     \
     netcat curl wget        \
-    cron sudo
+    cron sudo gosu          \
+    && gosu nobody true
 
 # Set up timezone information
 ENV TZ=America/Los_Angeles
@@ -65,4 +66,4 @@ RUN usermod -u ${PUID} steam \
     && groupmod -g ${PGID} steam \
     && chsh -s /bin/bash steam
 
-ENTRYPOINT ["/init.sh"]
+ENTRYPOINT ["/bin/bash","/init.sh"]

src/scripts/entrypoint.sh

@@ -36,13 +36,13 @@ log "Starting server..."
 
 odin start || exit 1
 
+trap 'cleanup' INT TERM EXIT
 
 cleanup() {
     log "Halting server! Received interrupt!"
     odin stop
     exit
 }
-trap 'cleanup' INT TERM EXIT SIGINT SIGTERM
 
 initialize "
 Valheim Server Started...

src/scripts/init.sh

@@ -56,7 +56,7 @@ write_env_var() {
   # shellcheck disable=SC2039
   VARIABLE_VALUE=$(printf '%s\n' "${!env_name}" | tr -d '"')
   echo "Writing $1 to env file..."
-  if [ $2 = true ]; then
+  if [[ $2 = true ]]; then
     echo "${env_name}=\"${VARIABLE_VALUE}\"" >> /home/steam/.env
   else
     echo "${env_name}=${VARIABLE_VALUE}" >> /home/steam/.env
@@ -71,6 +71,17 @@ write_env_var "PUBLIC"
 write_env_var "PASSWORD" true
 write_env_var "AUTO_UPDATE" true
 
-su -s /bin/bash --login steam -c "/bin/bash /home/steam/scripts/entrypoint.sh"
 
+trap 'cleanup' INT TERM EXIT
 
+cleanup() {
+  echo "Running Cleanup!....."
+  gosu steam:steam /home/steam/scripts/shutdown.sh
+  exit 0
+}
+
+gosu steam:steam /home/steam/scripts/entrypoint.sh
+
+while :; do
+  sleep 1s
+done

src/scripts/shutdown.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+. /home/steam/scripts/load_env.sh
+echo "
+Shutting down the server.........
+"
+cd /home/steam/valheim || exit 1
+odin stop || exit 1