„scripts/start.sh“ ändern

Dockerfile

@@ -1,10 +1,11 @@
 FROM ich777/winehq-baseimage
 
-LABEL maintainer="admin@minenet.at"
+LABEL org.opencontainers.image.authors="admin@minenet.at"
+LABEL org.opencontainers.image.source="https://github.com/ich777/docker-steamcmd-server"
 
 RUN dpkg --add-architecture i386 && \
 	apt-get update && \
-	apt-get -y install lib32gcc1 screen xvfb && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 screen xvfb && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"

README.md

@@ -1,45 +1,40 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Counter-Strike: Source and run it. Update Notice: Simply restart the container if a newer version of the game is available.
+This Docker will download and install SteamCMD. It will also install NEOTOKYO and run it.
+
+**Update Notice:** Simply restart the container if a newer version of the game is available.
 
 ## Env params
 | Name | Value | Example |
 | --- | --- | --- |
 | STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
 | SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| GAME_ID | SteamID for server | 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: '313600 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 313600 |
+| GAME_NAME | SRCDS gamename | NeotokyoSource |
+| GAME_PARAMS | Values to start the server | +maxplayers 32 +map nt_dawn_ctg |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
 | GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | true |
+| VALIDATE | Validates the game data | blank |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-***ATTENTION: You have to disable Steam Guard for games that require authentication, Steam recommends to create a seperate account for dedicated servers***
-
->**NOTE** GAME_ID values can be found [here](https://developer.valvesoftware.com/wiki/Dedicated_Servers_List)
-
-> And for GAME_NAME there is no list, so a quick search should give you the result
-
 ## Run example
 ```
-docker run --name CSSource -d \
+docker run --name NEOTOKYO -d \
 	-p 27015:27015 -p 27015:27015/udp \
-	--env 'GAME_ID=232330' \
-	--env 'GAME_NAME=cstrike' \
+	--env 'GAME_ID=313600' \
+	--env 'GAME_NAME=NeotokyoSource' \
 	--env 'GAME_PORT=27015' \
-	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
+	--env 'GAME_PARAMS=+maxplayers 32 +map nt_dawn_ctg' \
 	--env 'UID=99' \
 	--env 'GID=100' \
-	--volume /mnt/user/appdata/steamcmd:/serverdata/steamcmd \
-	--volume /mnt/user/appdata/cstrikesource:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/neotokyo:/serverdata/serverfiles \
+	ich777/steamcmd:neotokyo
 ```
->**NOTE** port 26900 is the port for vac, in case of multiple servers make sure these are not the same
-
 
 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/

config/Engine.ini

@@ -1,5 +0,0 @@
-[OnlineSubsystem]
-ServerName=Docker ConanExile
-ServerPassword=Docker
-
-

config/ServerSettings.ini

@@ -1,3 +0,0 @@
-[ServerSettings]
-MaxNudity=2
-AdminPassword=adminDocker

scripts/start-Xvfb.sh

@@ -0,0 +1,4 @@
+until Xvfb :99 -screen scrn 640x480x16; do
+    echo "Xvfb server crashed with exit code $?.  Respawning.." >&2
+    sleep 1
+done

scripts/start-server.sh

@@ -23,15 +23,15 @@ if [ "${USERNAME}" == "" ]; then
     	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
         +@sSteamCmdForcePlatformType windows \
-        +login anonymous \
         +force_install_dir ${SERVER_DIR} \
+        +login anonymous \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
         +@sSteamCmdForcePlatformType windows \
-        +login anonymous \
         +force_install_dir ${SERVER_DIR} \
+        +login anonymous \
         +app_update ${GAME_ID} \
         +quit
     fi
@@ -40,113 +40,53 @@ else
     	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
         +@sSteamCmdForcePlatformType windows \
-        +login ${USERNAME} ${PASSWRD} \
         +force_install_dir ${SERVER_DIR} \
+        +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
         +@sSteamCmdForcePlatformType windows \
-        +login ${USERNAME} ${PASSWRD} \
         +force_install_dir ${SERVER_DIR} \
+        +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} \
         +quit
     fi
 fi
 
-if [ ! -z "${WS_CONTENT}" ]; then
-	echo "---Installing Workshop Content with ID('s): ${WS_CONTENT}---"
-	${STEAMCMD_DIR}/steamcmd.sh \
-	+@sSteamCmdForcePlatformType windows \
-	+login anonymous \
-	+force_install_dir ${SERVER_DIR} \
-	+workshop_download_item 440900 ${WS_CONTENT// / +workshop_download_item 440900  } \
-	+quit
-	if [ ! -d ${SERVER_DIR}/ConanSandbox/Mods ]; then
-		if [ ! -d ${SERVER_DIR}/ConanSandbox ]; then
-			echo "-----------------------------------"
-			echo "------Something went wrong can't find folder-"
-			echo "---'ConanSandbox' putting server into sleep mode---"
-			echo "-"
-			sleep infinity
-		fi
-		echo "---Folder 'Mods' not found, creating...---"
-		mkdir ${SERVER_DIR}/ConanSandbox/Mods
-	fi
-	if [ ! -f ${SERVER_DIR}/ConanSandbox/Mods/modlist.txt ]; then
-		echo "---File 'modlist.txt' not found, creating...---"
-		touch ${SERVER_DIR}/ConanSandbox/Mods/modlist.txt
-	fi
-	echo "---Putting workshop content into modlist---"
-	find ${SERVER_DIR}/steamapps/workshop/content/ -name *.pak > ${SERVER_DIR}/ConanSandbox/Mods/modlist.txt
-fi
-
 echo "---Prepare Server---"
-echo "---Looking for config files---"
-if [ ! -d ${SERVER_DIR}/ConanSandbox/Saved/Config/WindowsServer ]; then
-	if [ ! -d ${SERVER_DIR}/ConanSandbox ]; then
-    	echo "-----------------------------------------------------------"
-    	echo "---Something went wrong can't find folder 'ConanSandbox'---"
-    	echo "--------------Putting Server into sleep mode---------------"
-    	sleep infinity
-    	fi
-    if [ ! -d ${SERVER_DIR}/ConanSandbox/Saved ]; then
-		mkdir ${SERVER_DIR}/ConanSandbox/Saved
-    fi
-	if [ ! -d ${SERVER_DIR}/ConanSandbox/Saved/Config ]; then
-		mkdir ${SERVER_DIR}/ConanSandbox/Saved/Config
-    fi
-    if [ ! -d ${SERVER_DIR}/ConanSandbox/Saved/Config/WindowsServer ]; then
-		mkdir ${SERVER_DIR}/ConanSandbox/Saved/Config/WindowsServer
-    fi
-fi
-if [ ! -f ${SERVER_DIR}/ConanSandbox/Saved/Config/WindowsServer/Engine.ini ]; then
-	echo "---'Engine.ini' not found, downloading template---"
-    cd ${SERVER_DIR}/ConanSandbox/Saved/Config/WindowsServer
-	if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/conanexiles/config/Engine.ini ; then
-		echo "---Sucessfully downloaded 'Engine.ini'---"
-	else
-		echo "---Something went wrong, can't download 'Engine.ini', putting server in sleep mode---"
-		sleep infinity
-	fi
-else
-	echo "---'Engine.ini' found---"
-fi
-if [ ! -f ${SERVER_DIR}/ConanSandbox/Saved/Config/WindowsServer/ServerSettings.ini ]; then
-	echo "---'ServerSettings.ini' not found, downloading template---"
-    cd ${SERVER_DIR}/ConanSandbox/Saved/Config/WindowsServer
-	if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/conanexiles/config/ServerSettings.ini ; then
-		echo "---Sucessfully downloaded 'ServerSettings.ini'---"
-	else
-		echo "---Something went wrong, can't download 'ServerSettings.ini', putting server in sleep mode---"
-		sleep infinity
-	fi
-else
-	echo "---'ServerSettings.ini' found---"
-fi
 export WINEARCH=win64
 export WINEPREFIX=/serverdata/serverfiles/WINE64
+export DISPLAY=:99
 echo "---Checking if WINE workdirectory is present---"
 if [ ! -d ${SERVER_DIR}/WINE64 ]; then
 	echo "---WINE workdirectory not found, creating please wait...---"
-    mkdir ${SERVER_DIR}/WINE64
+	mkdir ${SERVER_DIR}/WINE64
 else
 	echo "---WINE workdirectory found---"
 fi
 echo "---Checking if WINE is properly installed---"
 if [ ! -d ${SERVER_DIR}/WINE64/drive_c/windows ]; then
 	echo "---Setting up WINE---"
-    cd ${SERVER_DIR}
-    winecfg > /dev/null 2>&1
-    sleep 15
+	cd ${SERVER_DIR}
+	winecfg > /dev/null 2>&1
+	sleep 15
 else
 	echo "---WINE properly set up---"
 fi
 echo "---Checking for old display lock files---"
 find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
+echo "---Checking for old logfiles---"
+find ${SERVER_DIR} -name "XvfbLog.*" -exec rm -f {} \; > /dev/null 2>&1
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
+echo "---Starting Xvfb server---"
+screen -S Xvfb -L -Logfile ${SERVER_DIR}/XvfbLog.0 -d -m /opt/scripts/start-Xvfb.sh
+sleep 5
+
 echo "---Start Server---"
 cd ${SERVER_DIR}
-xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 ${SERVER_DIR}/ConanSandboxServer.exe -log ${GAME_PARAMS}
+screen -S Neotokyo -L -d -m wine64 start srcds.exe -game ${GAME_NAME} ${GAME_PARAMS} -console -port ${GAME_PORT}
+sleep 5
+tail -f /dev/null

scripts/start.sh

@@ -1,21 +1,41 @@
 #!/bin/bash
-echo "---Checking if UID: ${UID} matches user---"
+echo "---Ensuring UID: ${UID} matches user---"
 usermod -u ${UID} ${USER}
-echo "---Checking if GID: ${GID} matches user---"
+echo "---Ensuring GID: ${GID} matches user---"
+groupmod -g ${GID} ${USER} > /dev/null 2>&1 ||:
 usermod -g ${GID} ${USER}
 echo "---Setting umask to ${UMASK}---"
 umask ${UMASK}
 
 echo "---Checking for optional scripts---"
-if [ -f /opt/scripts/user.sh ]; then
-	echo "---Found optional script, executing---"
-    chmod +x /opt/scripts/user.sh
-    /opt/scripts/user.sh
+cp -f /opt/custom/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
+cp -f /opt/scripts/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
+
+if [ -f /opt/scripts/start-user.sh ]; then
+    echo "---Found optional script, executing---"
+    chmod -f +x /opt/scripts/start-user.sh ||:
+    /opt/scripts/start-user.sh || echo "---Optional Script has thrown an Error---"
 else
-	echo "---No optional script found, continuing---"
+    echo "---No optional script found, continuing---"
 fi
 
-echo "---Starting...---"
-chown -R ${UID}:${GID} /opt/scripts
+echo "---Taking ownership of data...---"
+chown -R root:${GID} /opt/scripts
+chmod -R 750 /opt/scripts
 chown -R ${UID}:${GID} ${DATA_DIR}
-su ${USER} -c "/opt/scripts/start-server.sh"
+
+echo "---Starting...---"
+term_handler() {
+	kill -SIGTERM "$killpid"
+	wait "$killpid" -f 2>/dev/null
+	exit 143;
+}
+
+trap 'kill ${!}; term_handler' SIGTERM
+su ${USER} -c "/opt/scripts/start-server.sh" &
+killpid="$!"
+while true
+do
+	wait $killpid
+	exit 0;
+done