tailscale.sh gelöscht

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: ich777

Dockerfile

@@ -1,19 +1,34 @@
-FROM ich777/debian-baseimage:bullseye_amd64
+FROM ich777/debian-baseimage
 
 LABEL org.opencontainers.image.authors="admin@minenet.at"
 LABEL org.opencontainers.image.source="https://github.com/ich777/docker-steamcmd-server"
 
 RUN apt-get update && \
-	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 lib32z1 && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 screen file libc6-dev unzip jq libpulse-dev libatomic1 jq && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
 ENV STEAMCMD_DIR="${DATA_DIR}/steamcmd"
 ENV SERVER_DIR="${DATA_DIR}/serverfiles"
-ENV GAME_ID="template"
-ENV GAME_NAME="template"
-ENV GAME_PARAMS="template"
-ENV GAME_PORT=27015
+ENV SRV_NAME="Valheim Docker"
+ENV WORLD_NAME="Dedicated"
+ENV SRV_PWD="Docker"
+ENV PUBLIC=1
+ENV UPDATE_CHECK="true"
+ENV UPDATE_CHECK_INTERVAL=60
+ENV BACKUP_FILES="true"
+ENV BACKUP_INTERVAL=62
+ENV BACKUP_TO_KEEP=24
+ENV GAME_ID="896660"
+ENV DEBUG_OUTPUT=""
+ENV LOG_OUTPUT=""
+ENV LOG_FILE="valheim.log"
+ENV DELETE_LOG="true"
+ENV GAME_PARAMS=""
+ENV GAME_PORT=2456
+ENV ENABLE_VALHEIMPLUS="false"
+ENV VALHEIMPLUS_ORG_REPO="Grantapher/ValheimPlus"
+ENV ENABLE_BEPINEX="false"
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99
@@ -26,7 +41,7 @@ ENV DATA_PERM=770
 RUN mkdir $DATA_DIR && \
 	mkdir $STEAMCMD_DIR && \
 	mkdir $SERVER_DIR && \
-	useradd -d $DATA_DIR -s /bin/bash $USER && \
+	useradd -d $SERVER_DIR -s /bin/bash $USER && \
 	chown -R $USER $DATA_DIR && \
 	ulimit -n 2048
 
@@ -34,4 +49,4 @@ ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,40 +1,52 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
+This Docker will download and install SteamCMD. It will also install Valheim and run it.
 
-**Please see the different Tags/Branches which games are available.**
+**Update Notice:** Simply restart the container if a newer version of the game is available.
 
-## Example Env params for CS:Source
+## Env params
 | Name | Value | Example |
 | --- | --- | --- |
 | STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
 | SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| GAME_ID | The GAME_ID that the container downloads at startup. If you want to install a static or beta version of the game change the value to: '232330 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 232330 |
-| GAME_NAME | SRCDS gamename | cstrike |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
+| GAME_ID | The GAME_ID that the container downloads at startup. If you want to install a static or beta version of the game change the value to: '896660 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 896660 |
+| SRV_NAME | Name of the Server | Valheim Docker |
+| WORLD_NAME | Name of the Server World | Dedicated |
+| SRV_PWD | Server Password - **ATTENTION:** the minimum length is 6 characters! | Docker |
+| PUBLIC | List Server as Public (set to '0' to disable or set to '1' to enable). | 1 |
+| ENABLE_VALHEIMPLUS | If you want to enable ValheimPlus set this variable to 'true' (without quotes). For more help please refer to this site: [Click](https://github.com/nxPublic/ValheimPlus) | false |
+| VALHEIMPLUS_ORG_REPO | Enables you to use a different repository for ValheimPlus than nxPublic/ValheimPlus (currently set to Grantapher/ValheimPlus) | Grantapher/ValheimPlus |
+| ENABLE_BEPINEX | If you want to enable BepInEx for Valheim set this variable to 'true' (without quotes). For more help please refer to this site: [Click](https://valheim.thunderstore.io/package/denikson/BepInExPack_Valheim/) | false |
+| BACKUP_FILES | Set this value to 'true' to enable the automated backup function from the container, you find the Backups in '.../valheim/Backups/'. Set to 'false' to disable the backup function. | true |
+| BACKUP_INTERVAL | The backup interval in minutes (set to 62 minutes because the game automatically saves the database every 30 minutes) **ATTENTION:** The first backup will be triggered after the set interval in this variable after the start/restart of the container). | 62 |
+| BACKUP_TO_KEEP | Number of backups to keep (by default set to 24 to keep the last backups of the last 24 hours). | 24 |
+| UPDATE_CHECK | If set to 'true' the container will automatically check every 60 minuts if there is an update available and restart the container if a update is found (please keep in mind if you enable the auto update function the container will automatically restart if a newer version is found, set to 'false' to disable the update check). This check is only working on the official branch from the game, if you are using a test or beta branch please set this variable to false, otherwise the server will restart every hour! | false |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
-| GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | blank |
+| GAME_PORT | Only change if you know what you are doing (intital GAME_PORT - Dont forget to create create a new UDP port mapping with the corresponding port range and delete the default port range - GAME_PORT +2) | 2456 |
+| VALIDATE | Validates the game data | false |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-## Run example for CS:Source
+
+## Run example
 ```
-docker run --name CSSource -d \
-	-p 27015:27015 -p 27015:27015/udp \
-	--env 'GAME_ID=232330' \
-	--env 'GAME_NAME=cstrike' \
-	--env 'GAME_PORT=27015' \
-	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
+docker run --name Valheim -d \
+	-p 2456-2458:2456-2458/udp \
+	--env 'GAME_ID=896660' \
+	--env 'SRV_NAME=Valheim Docker' \
+	--env 'WORLD_NAME=Dedicated' \
+	--env 'SRV_PWD=Docker' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/cstrikesource:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	--volume /path/to/valheim:/serverdata/serverfiles \
+	ich777/steamcmd:valheim
 ```
 
+
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!
 
+
 This Docker is forked from mattieserver, thank you for this wonderfull Docker.
 
-#### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/
+### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/

scripts/start-backup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+while true
+do
+	sleep ${BACKUP_INTERVAL}m 
+	cd ${SERVER_DIR}/.config/unity3d/IronGate/Valheim
+	tar -czf ${SERVER_DIR}/Backups/$(date '+%Y-%m-%d_%H.%M.%S').tar.gz .
+	cd ${SERVER_DIR}/Backups
+	ls -1tr ${SERVER_DIR}/Backups | sort | head -n -${BACKUP_TO_KEEP} | xargs -d '\n' rm -f --
+	chmod -R ${DATA_PERM} ${SERVER_DIR}/Backups
+done

scripts/start-server.sh

@@ -20,7 +20,7 @@ fi
 echo "---Update Server---"
 if [ "${USERNAME}" == "" ]; then
     if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
+       echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
         +force_install_dir ${SERVER_DIR} \
         +login anonymous \
@@ -35,7 +35,7 @@ if [ "${USERNAME}" == "" ]; then
     fi
 else
     if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
+      echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
         +force_install_dir ${SERVER_DIR} \
         +login ${USERNAME} ${PASSWRD} \
@@ -51,18 +51,222 @@ else
 fi
 
 echo "---Prepare Server---"
-if [ ! -f ${DATA_DIR}/.steam/sdk32/steamclient.so ]; then
-	if [ ! -d ${DATA_DIR}/.steam ]; then
-    	mkdir ${DATA_DIR}/.steam
+if [ -d ${SERVER_DIR}/.config/unity3d/IronGate/Valheim/worlds ]; then
+    echo "---Found old save directory... Moving saves directory to new location...!---"
+    mv ${SERVER_DIR}/.config/unity3d/IronGate/Valheim/worlds ${SERVER_DIR}/.config/unity3d/IronGate/Valheim/worlds_local
+fi
+if [ "${ENABLE_VALHEIMPLUS}" != "true" ]; then
+    export LD_LIBRARY_PATH=${SERVER_DIR}/linux64:$LD_LIBRARY_PATH
+    export templdpath=$LD_LIBRARY_PATH
+    export SteamAppId=892970
+fi
+if [ "${LOG_OUTPUT}" == "true" ]; then
+    if [ -z "${LOG_FILE}" ]; then
+        echo "---Variable 'LOG_FILE' can't be empty, set it to 'valheim.log'!---"
+        LOG_FILE="valheim.log"
     fi
-	if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
-    	mkdir ${DATA_DIR}/.steam/sdk32
+    if [ "${DELETE_LOG}" == "true" ]; then
+        rm ${SERVER_DIR}/${LOG_FILE}
     fi
-    cp -R ${STEAMCMD_DIR}/linux32/* ${DATA_DIR}/.steam/sdk32/
 fi
 chmod -R ${DATA_PERM} ${DATA_DIR}
+screen -wipe 2&>/dev/null
+
+# Check if both ValheimPlus and BepInEx are enabled and throw error
+if [ "${ENABLE_VALHEIMPLUS}" == "true" ] && [ "${ENABLE_BEPINEX}" == "true" ]; then
+    echo
+    echo "---ValheimPlus and BepInEx are both enabled, only one of the two can---"
+    echo "---be enabled, please disable one of them and restart the container!---"
+    echo
+    echo "------------------Putting Container into sleep mode!-------------------"
+    sleep infinity
+fi
+
+if [ "${ENABLE_VALHEIMPLUS}" == "true" ]; then
+    echo "---ValheimPlus enabled!---"
+    echo
+    echo "-------------------------------------------"
+    echo "Using following repository for ValheimPlus:"
+    echo
+    echo "Orga./User: ${VALHEIMPLUS_ORG_REPO%%/*}"
+    echo "Repository: ${VALHEIMPLUS_ORG_REPO##*/}"
+    echo "-------------------------------------------"
+    echo
+    CUR_V="$(find ${SERVER_DIR} -maxdepth 1 -name "ValheimPlus-*" | cut -d '-' -f2-)"
+    LAT_V="$(wget -qO- https://api.github.com/repos/${VALHEIMPLUS_ORG_REPO}/releases/latest | grep tag_name | cut -d '"' -f4 | cut -d 'v' -f2)"
+    if [ -z "${LAT_V}" ] && [ -z "${CUR_V}" ]; then
+        echo "---Can't get latest version of Valheim Plus!---"
+        echo "---Please try to run the Container without ValheimPlus, putting Container into sleep mode!---"
+        sleep infinity
+    fi
+
+    if [ -f ${SERVER_DIR}/ValheimPlus.zip ]; then
+      rm -rf ${SERVER_DIR}/ValheimPlus.zip
+    fi
+
+    echo "---ValheimPlus Version Check---"
+    if [ -z "${CUR_V}" ]; then
+        echo "---ValheimPlus not found, downloading and installing v$LAT_V...---"
+        cd ${SERVER_DIR}
+        if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/ValheimPlus.zip "https://github.com/${VALHEIMPLUS_ORG_REPO}/releases/download/${LAT_V}/UnixServer.zip" ; then
+            echo "---Successfully downloaded ValheimPlus v$LAT_V---"
+        else
+            echo "---Something went wrong, can't download ValheimPlus v$LAT_V, putting container into sleep mode!---"
+            sleep infinity
+        fi
+        unzip -o ${SERVER_DIR}/ValheimPlus.zip
+        touch ${SERVER_DIR}/ValheimPlus-$LAT_V
+        rm ${SERVER_DIR}/ValheimPlus.zip
+        if [ -d ${SERVER_DIR}/_unstripped_corlib ]; then
+            mv ${SERVER_DIR}/_unstripped_corlib ${SERVER_DIR}/unstripped_corlib
+        fi
+    elif [ "${CUR_V}" != "${LAT_V}" ]; then
+        echo "---Version missmatch, ValheimPlus v$CUR_V installed, downloading and installing v$LAT_V...---"
+        if [ -d ${SERVER_DIR}/_unstripped_corlib ]; then
+            rm -rf ${SERVER_DIR}/_unstripped_corlib
+        fi
+        cd ${SERVER_DIR}
+        rm -rf ${SERVER_DIR}/ValheimPlus-$CUR_V
+        mkdir /tmp/Backup
+        cp -R ${SERVER_DIR}/BepInEx/config /tmp/Backup/
+        if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/ValheimPlus.zip "https://github.com/${VALHEIMPLUS_ORG_REPO}/releases/download/${LAT_V}/UnixServer.zip" ; then
+            echo "---Successfully downloaded ValheimPlus v$LAT_V---"
+        else
+            echo "---Something went wrong, can't download ValheimPlus v$LAT_V, putting container into sleep mode!---"
+            sleep infinity
+        fi
+        unzip -o ${SERVER_DIR}/ValheimPlus.zip
+        touch ${SERVER_DIR}/ValheimPlus-$LAT_V
+        cp -R /tmp/Backup/config ${SERVER_DIR}/BepInEx/
+        rm -rf ${SERVER_DIR}/ValheimPlus.zip /tmp/Backup
+    elif [ "${CUR_V}" == "${LAT_V}" ]; then
+        echo "---ValheimPlus v${CUR_V%%-*} up-to-date---"
+    fi
+fi
+
+if [ "${ENABLE_BEPINEX}" == "true" ]; then
+    echo "---BepInEx for Valheim enabled!---"
+    CUR_V="$(find ${SERVER_DIR} -maxdepth 1 -name "BepInEx-*" | cut -d '-' -f2)"
+    LAT_V="$(wget -qO- https://thunderstore.io/api/experimental/package/denikson/BepInExPack_Valheim/ | jq -r '.latest.version_number')"
+    if [ -z "${LAT_V}" ] && [ -z "${CUR_V}" ]; then
+        echo "---Can't get latest version of BepInEx for Valheim!---"
+        echo "---Please try to run the Container without BepInEx for Valheim, putting Container into sleep mode!---"
+        sleep infinity
+    fi
+
+    if [ -f ${SERVER_DIR}/BepInEx.zip ]; then
+      rm -rf ${SERVER_DIR}/BepInEx.zip
+    fi
+
+    echo "---BepInEx for Valheim Version Check---"
+    echo
+    echo "---https://valheim.thunderstore.io/package/denikson/BepInExPack_Valheim/---"
+    echo
+    if [ -z "${CUR_V}" ]; then
+        echo "---BepInEx for Valheim not found, downloading and installing v$LAT_V...---"
+        cd ${SERVER_DIR}
+        if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/BepInEx.zip --user-agent=Mozilla --content-disposition -E -c "https://thunderstore.io/package/download/denikson/BepInExPack_Valheim/$LAT_V/" ; then
+            echo "---Successfully downloaded BepInEx for Valheim v$LAT_V---"
+        else
+            echo "---Something went wrong, can't download BepInEx for Valheim v$LAT_V, putting container into sleep mode!---"
+            sleep infinity
+        fi
+        mkdir -p /tmp/BepInEx
+        unzip -o ${SERVER_DIR}/BepInEx.zip -d /tmp/BepInEx
+        cp -rf /tmp/BepInEx/BepInEx*/* ${SERVER_DIR}/
+        cp /tmp/BepInEx/README* ${SERVER_DIR}/README_BepInEx_for_Valheim
+        touch ${SERVER_DIR}/BepInEx-$LAT_V
+        rm -rf ${SERVER_DIR}/BepInEx.zip /tmp/BepInEx
+    elif [ "$CUR_V" != "$LAT_V" ]; then
+        echo "---Version missmatch, BepInEx v$CUR_V installed, downloading and installing v$LAT_V...---"
+        cd ${SERVER_DIR}
+        rm -rf ${SERVER_DIR}/BepInEx-$CUR_V
+        mkdir /tmp/Backup
+        cp -R ${SERVER_DIR}/BepInEx/config /tmp/Backup/
+        if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/BepInEx.zip --user-agent=Mozilla --content-disposition -E -c "https://thunderstore.io/package/download/denikson/BepInExPack_Valheim/$LAT_V/" ; then
+            echo "---Successfully downloaded BepInEx for Valheim v$LAT_V---"
+        else
+            echo "---Something went wrong, can't download BepInEx for Valheim v$LAT_V, putting container into sleep mode!---"
+            sleep infinity
+        fi
+        unzip -o ${SERVER_DIR}/BepInEx.zip -d /tmp/BepInEx
+        cp -rf /tmp/BepInEx/BepInEx*/* ${SERVER_DIR}/
+        cp /tmp/BepInEx/README* ${SERVER_DIR}/README_BepInEx_for_Valheim
+        touch ${SERVER_DIR}/BepInEx-$LAT_V
+        cp -R /tmp/Backup/config ${SERVER_DIR}/BepInEx/
+        rm -rf ${SERVER_DIR}/BepInEx.zip /tmp/BepInEx /tmp/Backup
+    elif [ "${CUR_V}" == "${LAT_V}" ]; then
+        echo "---BepInEx v$CUR_V up-to-date---"
+    fi
+    if [ -d ${SERVER_DIR}/unstripped_corlib ]; then
+      mv ${SERVER_DIR}/unstripped_corlib ${SERVER_DIR}/_unstripped_corlib
+    fi
+fi
+
 echo "---Server ready---"
 
+if [ "${BACKUP_FILES}" == "true" ]; then
+    echo "---Starting Backup daemon---"
+    if [ ! -d ${SERVER_DIR}/Backups ]; then
+        mkdir -p ${SERVER_DIR}/Backups
+    fi
+    screen -S backup -d -m /opt/scripts/start-backup.sh
+fi
+
+if [ "${UPDATE_CHECK}" == "true" ]; then
+    echo "---Update check deprecated!---"
+#    /opt/scripts/start-updatecheck.sh &
+fi
+
 echo "---Start Server---"
 cd ${SERVER_DIR}
-${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}
+if [ "${ENABLE_VALHEIMPLUS}" == "true" ]; then
+    echo "---with Valheim Plus---"
+    export DOORSTOP_ENABLE=TRUE
+    export DOORSTOP_INVOKE_DLL_PATH=${SERVER_DIR}/BepInEx/core/BepInEx.Preloader.dll
+    export DOORSTOP_CORLIB_OVERRIDE_PATH=${SERVER_DIR}/unstripped_corlib
+    export LD_LIBRARY_PATH="${SERVER_DIR}/doorstop_libs":$LD_LIBRARY_PATH
+    export LD_PRELOAD=libdoorstop_x64.so:$LD_PRELOAD
+    export DYLD_LIBRARY_PATH="${SERVER_DIR}/doorstop_libs"
+    export DYLD_INSERT_LIBRARIES="${SERVER_DIR}/libdoorstop_x64.so"
+    export templdpath="$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH=${SERVER_DIR}/linux64:"$LD_LIBRARY_PATH"
+    export SteamAppId=892970
+    if [ "${LOG_OUTPUT}" == "true" ]; then
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS} | tee -a ${SERVER_DIR}/${LOG_FILE}
+    elif [ "${DEBUG_OUTPUT}" == "true" ]; then
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS}
+    else
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS} > /dev/null
+    fi
+elif [ "${ENABLE_BEPINEX}" == "true" ]; then
+    echo "---with BepInEx for Valheim---"
+    echo
+    echo "---https://valheim.thunderstore.io/package/denikson/BepInExPack_Valheim/---"
+    echo
+    export DOORSTOP_ENABLE=TRUE
+    export DOORSTOP_INVOKE_DLL_PATH=${SERVER_DIR}/BepInEx/core/BepInEx.Preloader.dll
+    export DOORSTOP_CORLIB_OVERRIDE_PATH=${SERVER_DIR}/unstripped_corlib
+    export LD_LIBRARY_PATH="${SERVER_DIR}/doorstop_libs":$LD_LIBRARY_PATH
+    export LD_PRELOAD=libdoorstop_x64.so:$LD_PRELOAD
+    export DYLD_LIBRARY_PATH="${SERVER_DIR}/doorstop_libs"
+    export DYLD_INSERT_LIBRARIES="${SERVER_DIR}/libdoorstop_x64.so"
+    export templdpath="$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH=${SERVER_DIR}/linux64:"$LD_LIBRARY_PATH"
+    export SteamAppId=892970
+    if [ "${LOG_OUTPUT}" == "true" ]; then
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS} | tee -a ${SERVER_DIR}/${LOG_FILE}
+    elif [ "${DEBUG_OUTPUT}" == "true" ]; then
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS}
+    else
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS} > /dev/null
+    fi
+else
+    if [ "${LOG_OUTPUT}" == "true" ]; then
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS} | tee -a ${SERVER_DIR}/${LOG_FILE}
+    elif [ "${DEBUG_OUTPUT}" == "true" ]; then
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS}
+    else
+        ${SERVER_DIR}/valheim_server.x86_64 -name "${SRV_NAME}" -port ${GAME_PORT} -world "${WORLD_NAME}" -password "${SRV_PWD}" -public ${PUBLIC} ${GAME_PARAMS} > /dev/null
+    fi
+fi

scripts/start-updatecheck.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+echo "---Update Check for Valheim enabled, running automatically every ${UPDATE_CHECK_INTERVAL} minutes.---"
+UPDATE_CUR_V="$(cat ${SERVER_DIR}/Steam/logs/content_log.txt | grep -oP "BuildID \K\w+" | sort | tail -1)"
+if [ -z "${UPDATE_CUR_V}" ]; then
+    echo "UPDATE CHECK: ---Something went wrong, can't get current build version for Valheim, disabling Update Check!---"
+fi
+while true
+do
+    sleep ${UPDATE_CHECK_INTERVAL}m 
+    UPDATE_LAT_V="$(wget -qO- https://api.steamcmd.net/v1/info/896660 | jq -r '.data."'"$GAME_ID"'".depots.branches.public.buildid')"
+    if [ -z "${UPDATE_LAT_V}" ]; then
+        echo "UPDATE CHECK: ---Something went wrong, can't get latest version of Valheim, trying again in ${UPDATE_CHECK_INTERVAL} minutes!---"
+    elif [ "${UPDATE_CUR_V}" != "${UPDATE_LAT_V}" ]; then
+        echo "UPDATE CHECK: ---New version of Valheim found, restarting and updating server in 10 seconds---"
+        sleep 10
+        pkill -SIGINT valheim
+        wait "$(pidof valheim_server.x86_64)" -f 2>/dev/null
+        sleep 4
+        echo 1 > ${SERVER_DIR}/server_exit.drp
+        exit 143;
+    else
+        echo "UPDATE CHECK: ---Nothing to do, Valheim up-to-date---"
+    fi
+done

scripts/start.sh

@@ -24,15 +24,12 @@ chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
 chown -R ${UID}:${GID} ${DATA_DIR}
 
-# Fix for CSDM not working properly
-if [ -f "${SERVER_DIR}/cstrike/addons/sourcemod/gamedata/cssdm.games.txt" ]; then
-  chmod 550 ${SERVER_DIR}/cstrike/addons/sourcemod/gamedata/cssdm.games.txt
-fi
-
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM "$killpid"
-	wait "$killpid" -f 2>/dev/null
+	kill -SIGINT $(pidof valheim_server.x86_64)
+	tail --pid=$(pidof valheim_server.x86_64) -f 2>/dev/null
+	sleep 0.5
+	echo 1 > ${SERVER_DIR}/server_exit.drp
 	exit 143;
 }
 
@@ -43,4 +40,4 @@ while true
 do
 	wait $killpid
 	exit 0;
-done
+done

tailscale.sh

@@ -1,232 +0,0 @@
-#!/bin/bash
-# The script will then add the container to your Tailscale network.
-#
-# For more information see: [Link TBD]
-
-error_handler() {
-  echo
-  echo "======================="
-  exit 1
-}
-
-echo "======================="
-echo
-
-# Import variables from s6-overlay images
-if [ -x "/usr/bin/with-contenv" ]; then
-  echo "just-containers s6-overlay image found, importing variables..."
-  ENV_VARS="$(/usr/bin/with-contenv bash -c 'env')"
-
-  while IFS='=' read -r KEY VALUE; do
-    export "${KEY}"="${VALUE}"
-  done <<< "${ENV_VARS}"
-fi
-
-if [[ ! -f /usr/bin/tailscale || ! -f /usr/bin/tailscaled ]]; then
-  if [ ! -z "${TAILSCALE_EXIT_NODE_IP}" ]; then
-    if [ ! -c /dev/net/tun ]; then
-      echo "ERROR: Device /dev/net/tun not found!"
-      echo "       Make sure to pass through /dev/net/tun to the container."
-      error_handler
-    fi
-    APT_IPTABLES="iptables "
-  fi
-
-  echo "Detecting Package Manager..."
-  if which apt-get >/dev/null 2>&1; then
-    echo "Detected Advanced Package Tool!"
-    PACKAGES_UPDATE="apt-get update"
-    PACKAGES_INSTALL="apt-get -y install --no-install-recommends"
-  elif which apk >/dev/null 2>&1; then
-    echo "Detected Alpine Package Keeper!"
-    PACKAGES_UPDATE="apk update"
-    PACKAGES_INSTALL="apk add"
-  else
-    echo "ERROR: Detection failed!"
-    error_handler
-  fi
-
-  echo "Installing dependencies..."
-  echo "Please wait..."
-  ${PACKAGES_UPDATE} >/dev/null 2>&1
-  ${PACKAGES_INSTALL} jq wget ca-certificates ${APT_IPTABLES}>/dev/null 2>&1
-  echo "Done"
-
-  if [ "${APT_IPTABLES}" == "iptables " ]; then
-    if ! iptables -L >/dev/null 2>&1; then
-      echo "ERROR: Cap: NET_ADMIN not available!"
-      echo "       Make sure to add --cap-add=NET_ADMIN to the Extra Parameters"
-      error_handler
-    fi
-  fi
-
-  echo "Tailscale not found, downloading..."
-  echo "Please wait..."
-
-  TAILSCALE_JSON=$(wget -qO- 'https://pkgs.tailscale.com/stable/?mode=json')
-
-  if [ -z "${TAILSCALE_JSON}" ]; then
-    echo "ERROR: Can't get Tailscale JSON"
-    error_handler
-  fi
-
-  TAILSCALE_TARBALL=$(echo "${TAILSCALE_JSON}" | jq -r .Tarballs.amd64)
-  TAILSCALE_VERSION=$(echo "${TAILSCALE_JSON}" | jq -r .TarballsVersion)
-
-  if [ ! -d /tmp/tailscale ]; then
-    mkdir -p /tmp/tailscale
-  fi
-
-  if wget -q -nc --show-progress --progress=bar:force:noscroll -O /tmp/tailscale/tailscale.tgz "https://pkgs.tailscale.com/stable/${TAILSCALE_TARBALL}" ; then
-    echo "Download from Tailscale version ${TAILSCALE_VERSION} successful!"
-  else
-    echo "ERROR: Download from Tailscale version ${TAILSCALE_VERSION} failed!"
-    rm -rf /tmp/tailscale
-    error_handler
-  fi
-
-  cd /tmp/tailscale
-  tar -xf /tmp/tailscale/tailscale.tgz
-  cp /tmp/tailscale/tailscale_${TAILSCALE_VERSION}_amd64/tailscale /usr/bin/tailscale
-  cp /tmp/tailscale/tailscale_${TAILSCALE_VERSION}_amd64/tailscaled /usr/bin/tailscaled
-  rm -rf /tmp/tailscale
-
-  echo "Done"
-
-else
-  echo "Tailscale found, continuing..."
-fi
-
-unset TSD_PARAMS
-unset TS_PARAMS
-
-if [ ! -z "${TAILSCALE_STATE_DIR}" ]; then
-  TSD_STATE_DIR="${TAILSCALE_STATE_DIR}"
-elif [ -v SERVER_DIR ]; then
-  TSD_STATE_DIR=${SERVER_DIR}/.tailscale_state
-  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
-elif [ -v DATA_DIR ]; then
-  TSD_STATE_DIR=${DATA_DIR}/.tailscale_state
-  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
-else
-  if [ -z "${TAILSCALE_STATE_DIR}" ]; then
-    TAILSCALE_STATE_DIR="/config/.tailscale_state"
-  fi
-  TSD_STATE_DIR=${TAILSCALE_STATE_DIR}
-  echo "Settings Tailscale state dir to: ${TSD_STATE_DIR}"
-fi
-
-if [ ! -d ${TS_STATE_DIR} ]; then
-  mkdir -p ${TS_STATE_DIR}
-fi
-
-if [ ! -z "${TAILSCALE_EXIT_NODE_IP}" ]; then
-  echo "Using ${TAILSCALE_EXIT_NODE_IP} as Exit Node! See https://tailscale.com/kb/1103/exit-nodes"
-  TS_PARAMS=" --exit-node=${TAILSCALE_EXIT_NODE_IP}"
-  if [ ! -z "${TAILSCALE_ALLOW_LAN_ACCESS}" ]; then
-    echo "Enabling local LAN Access to the container!"
-    TS_PARAMS+=" --exit-node-allow-lan-access"
-  fi
-else
-  if [ -z "${TAILSCALE_USERSPACE_NETWORKING}" ] || [ "${TAILSCALE_USERSPACE_NETWORKING}" == "true" ]; then
-    TSD_PARAMS+="-tun=userspace-networking "
-  else
-    if [ ! -c /dev/net/tun ]; then
-      echo "ERROR: Device /dev/net/tun not found!"
-      echo "       Make sure to pass through /dev/net/tun to the container and add the"
-      echo "       parameter --cap-add=NET_ADMIN to the Extra Parameters!"
-      error_handler
-    fi
-  fi
-fi
-
-if [ "${TAILSCALE_USE_SSH}" == "true" ]; then
-  echo "Enabling SSH. See https://tailscale.com/kb/1193/tailscale-ssh"
-  TS_PARAMS+=" --ssh"
-fi
-
-if [ "${TAILSCALE_LOG}" != "false" ]; then
-  TSD_PARAMS+=">>/var/log/tailscaled 2>&1 "
-  TSD_MSG=" with log file /var/log/tailscaled"
-else
-  TSD_PARAMS+=">/dev/null 2>&1 "
-fi
-
-if [[ ! -z "${TAILSCALE_AUTHKEY}" && -f ${TSD_STATE_DIR}/.initialized ]]; then
-  echo
-  echo "-> It is now save to remove the variable TAILSCALE_AUTHKEY from your template <-"
-  echo
-  unset TAILSCALE_AUTHKEY
-fi
-
-if [ ! -z "${TAILSCALE_AUTHKEY}" ]; then
-  TS_AUTH="--authkey=${TAILSCALE_AUTHKEY} "
-fi
-
-if [ ! -z "${TAILSCALE_HOSTNAME}" ]; then
-  echo "Setting host name to ${TAILSCALE_HOSTNAME}"
-  TS_PARAMS+=" --hostname=${TAILSCALE_HOSTNAME/ /}"
-fi
-
-if [ "${TAILSCALE_EXIT_NODE}" == "true" ]; then
-  echo "Configuring container as Exit Node! See https://tailscale.com/kb/1103/exit-nodes"
-  TS_PARAMS+=" --advertise-exit-node"
-fi
-
-if [ ! -z "${TAILSCALED_PARAMS}" ]; then
-  TSD_PARAMS="${TAILSCALED_PARAMS} ${TSD_PARAMS}"
-fi
-
-if [ ! -z "${TAILSCALE_PARAMS}" ]; then
-  TS_PARAMS="${TAILSCALE_PARAMS}${TS_PARAMS}"
-fi
-
-echo "Starting tailscaled${TSD_MSG}"
-eval tailscaled -statedir=${TSD_STATE_DIR} ${TSD_PARAMS}&
-
-echo "Starting tailscale"
-eval tailscale up ${TS_AUTH}${TS_PARAMS}
-EXIT_STATUS="$?"
-
-if [ "${EXIT_STATUS}" == "0" ]; then
-  echo "Connecting to Tailscale successful!"
-  if [ ! -f ${TSD_STATE_DIR}/.initialized ]; then
-    echo "Please don't remove this file!" > ${TSD_STATE_DIR}/.initialized
-  fi
-else
-  echo "ERROR: Connecting to Tailscale not successful!"
-  if [ -f /var/log/tailscaled ]; then
-    echo "Please check the logs:"
-    tail -20 /var/log/tailscaled
-    echo "======================="
-  fi
-  error_handler
-fi
-
-if [[ ! -z "${TAILSCALE_SERVE_PORT}" && "$(tailscale status --json | jq -r '.CurrentTailnet.MagicDNSEnabled')" == "false" ]] ; then
-  echo "ERROR: Enable HTTPS on your Tailscale account to use Tailscale Serve/Funnel."
-  echo "See: https://tailscale.com/kb/1153/enabling-https"
-  error_handler
-fi
-
-if [ ! -z ${TAILSCALE_SERVE_PORT} ]; then
-  if [ ! -z "${TAILSCALE_SERVE_PATH}" ]; then
-    TAILSCALE_SERVE_PATH="=${TAILSCALE_SERVE_PATH}"
-  fi
-  if [ -z "${TAILSCALE_SERVE_MODE}" ]; then
-    TAILSCALE_SERVE_MODE="https"
-  fi
-  if [ -z "${TAILSCALE_SERVE_PROTOCOL_PORT}" ]; then
-    TAILSCALE_SERVE_PROTOCOL_PORT="=443"
-  fi
-  if [ "${TAILSCALE_FUNNEL}" == "true" ]; then
-    echo "Enabling Funnel! See https://tailscale.com/kb/1223/funnel"
-    eval tailscale funnel --bg --"${TAILSCALE_SERVE_MODE}"${TAILSCALE_SERVE_PROTOCOL_PORT}${TAILSCALE_SERVE_PATH} http://localhost:"${TAILSCALE_SERVE_PORT}${TAILSCALE_SERVER_LOCALPATH}"
-  else
-    echo "Enabling Serve! See https://tailscale.com/kb/1312/serve"
-    eval tailscale serve --bg --"${TAILSCALE_SERVE_MODE}"${TAILSCALE_SERVE_PROTOCOL_PORT}${TAILSCALE_SERVE_PATH} http://localhost:"${TAILSCALE_SERVE_PORT}${TAILSCALE_SERVER_LOCALPATH}"
-  fi
-fi
-
-echo
-echo "======================="