scripts/start-server.sh aktualisiert

Dockerfile

@@ -1,10 +1,12 @@
-FROM ich777/debian-baseimage:bullseye_amd64
+FROM ich777/winehq-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 lsof libicu67 && \
+	apt-get -y install lib32gcc-s1 winbind xvfb screen cabextract && \
+	wget -q -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks && \
+	chmod +x /usr/bin/winetricks && chown 755 /usr/bin/winetricks && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
@@ -32,6 +34,7 @@ RUN mkdir $DATA_DIR && \
 
 ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
+COPY ServerSettings.ini /opt/ServerSettings.ini
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,44 +1,40 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Counter-Strike 2 and run it.
+This Docker will download and install SteamCMD. It will also install Icarus and run it.
 
-**ATTENTION:** You have to provide a valid Steam account with the game in it is Library and SteamGuard completely disabled so that the download is working!  
-_It is recommended that you create dedicated Steam account for your dedicated servers with the games in it and SteamGuard completely disabled!_  
-**DON'T DISABLE STEAM GUARD ON YOUR PRIMARY ACCOUNT!!!**
+Initial server configuration:  
+**Servername:** Icarus Docker **Password:** Docker  **AdminPassword:** adminDocker  
 
-**ATTENTION:** First Startup can take very long since it downloads the gameserver files!
+**ATTENTION:** First startup can take very long since it downloads the gameserver files and it also installs the runtimes which can take quite some time! 
 
-**PUBLIC PLAY:** If you want that your server is public listed you must add '+sv_setsteamaccount YOURTOKEN' to the GAME_PARAMS (without the quotes and replace YOURTOKEN with your token).  
-Create your token here: https://steamcommunity.com/dev/managegameservers (every gameserver needs it's own token!!!)  
+**First Start Notice:** On First startup the container installs the necessary runtimes and it might seem that the container hangs but please be patient since the installation can take very long on some systems (5 minutes+).
 
-You can also run multiple servers with only one SteamCMD directory!
+Update Notice: Simply restart the container if a newer version of the game is available.
 
-## Example Env
+## Example Env params for CS:Source
 | 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: '730 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 730 |
-| USERNAME | Leave blank for anonymous login | \<STEAMUSER> |
-| PASSWRD | Leave blank for anonymous login | \<STEAMPASSWORD> |
-| GAME_PARAMS | Values to start the server | -dedicated -dev +map de_inferno +game_type 0 +game_mode 1 -usercon |
+| 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: '2089300 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 2089300 |
+| GAME_PARAMS | Values to start the server | -SteamServerName="Icarus Docker" -Port=17777 -QueryPort=27015 |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
 | GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | blank |
+| VALIDATE | Validates the game data | false |
+| USERNAME | Leave blank for anonymous login | blank |
+| PASSWRD | Leave blank for anonymous login | blank |
 
 ## Run example
 ```
-docker run --name CS2 -d \
-	-p 27015:27015 -p 27015:27015/udp \
-	--env 'GAME_ID=730' \
-	--env 'USERNAME=<STEAMUSER>' \
-	--env 'PASSWRD=<STEAMPASSWORD>' \
-	--env 'GAME_PARAMS=-dedicated -dev +map de_inferno +game_type 0 +game_mode 1 -usercon' \
+docker run --name Icarus -d \
+	-p 17777:17777/udp -p 27015:27015/udp \
+	--env 'GAME_ID=2089300' \
+	--env 'GAME_PARAMS=-SteamServerName="Icarus Docker" -Port=17777 -QueryPort=27015' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/cs2:/serverdata/serverfiles \
-	ich777/steamcmd:cs2
+	--volume /path/to/icarus:/serverdata/serverfiles \
+	ich777/steamcmd:icarus
 ```
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!

ServerSettings.ini

@@ -0,0 +1,13 @@
+[/Script/Icarus.DedicatedServerSettings]
+SessionName=Icarus Docker
+JoinPassword=Docker
+MaxPlayers=8
+AdminPassword=adminDocker
+ShutdownIfNotJoinedFor=300.000000
+ShutdownIfEmptyFor=300.000000
+AllowNonAdminsToLaunchProspects=True
+AllowNonAdminsToDeleteProspects=False
+LoadProspect=
+CreateProspect=
+ResumeProspect=True
+LastProspectName=

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

@@ -1,4 +1,5 @@
 #!/bin/bash
+export DISPLAY=:99
 if [ ! -f ${STEAMCMD_DIR}/steamcmd.sh ]; then
     echo "SteamCMD not found!"
     wget -q -O ${STEAMCMD_DIR}/steamcmd_linux.tar.gz http://media.steampowered.com/client/steamcmd_linux.tar.gz 
@@ -22,12 +23,14 @@ if [ "${USERNAME}" == "" ]; then
     if [ "${VALIDATE}" == "true" ]; then
     	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
+        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login anonymous \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
+        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login anonymous \
         +app_update ${GAME_ID} \
@@ -37,12 +40,14 @@ else
     if [ "${VALIDATE}" == "true" ]; then
     	echo "---Validating installation---"
         ${STEAMCMD_DIR}/steamcmd.sh \
+        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
+        +@sSteamCmdForcePlatformType windows \
         +force_install_dir ${SERVER_DIR} \
         +login ${USERNAME} ${PASSWRD} \
         +app_update ${GAME_ID} \
@@ -51,18 +56,86 @@ else
 fi
 
 echo "---Prepare Server---"
-if [ ! -f ${DATA_DIR}/.steam/sdk64/steamclient.so ]; then
-	if [ ! -d ${DATA_DIR}/.steam ]; then
-    	mkdir ${DATA_DIR}/.steam
-    fi
-	if [ ! -d ${DATA_DIR}/.steam/sdk64 ]; then
-    	mkdir ${DATA_DIR}/.steam/sdk64
-    fi
-    cp -R ${STEAMCMD_DIR}/linux64/* ${DATA_DIR}/.steam/sdk64/
+export WINEARCH=win64
+export WINEPREFIX=/serverdata/serverfiles/WINE64
+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
+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
+    wineserver -k >/dev/null 2>&1
+else
+	echo "---WINE properly set up---"
+fi
+
+if [ -f ${SERVER_DIR}/runtimes ]; then
+  rm -f ${SERVER_DIR}/runtimes
+  touch ${SERVER_DIR}/WINE64/runtimes
+fi
+
+echo "---Checking if runtimes are installed---"
+if [ ! -f ${SERVER_DIR}/WINE64/runtimes ]; then
+  echo "---Runtimes not installed, please wait installing...---"
+  mkdir -p ${DATA_DIR}/.cache/winetricks
+  find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
+  /opt/scripts/start-Xvfb.sh 2>/dev/null &
+  echo "---...this can take some time...---"
+  sleep 5
+  timeout 10m /usr/bin/winetricks -q dotnet45 2>/dev/null
+  timeout 3m /usr/bin/winetricks -q vcrun2019 2>/dev/null
+  wine64 ${SERVER_DIR}/IcarusServer.exe -log ${GAME_PARAMS} >/dev/null 2&>1 &
+  sleep 10
+  wineserver -k >/dev/null 2>&1
+  kill $(pidof Xvfb) 2>/dev/null
+  touch ${SERVER_DIR}/WINE64/runtimes
+  echo "---Installation from runtimes finished!---"
+else
+  echo "---Runtimes found! Continuing...---"
+fi
+
+echo "---Looking 'ServerSettings.ini' file is in place---"
+if [ ! -f ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer/ServerSettings.ini ]; then
+  echo "---'ServerSettings.ini' not found, copying template...---"
+  if [ ! -d ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer ]; then
+    mkdir -p ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer
+  fi
+  cp /opt/ServerSettings.ini ${SERVER_DIR}/Icarus/Saved/Config/WindowsServer/
+else
+  echo "---'ServerSettings.ini' found---"
+fi
+echo "---Checking for old display lock files---"
+find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
+chmod -R ${DATA_PERM} ${DATA_DIR}
+
+echo "---Starting Xvfb server---"
+screen -S Xvfb -d -m /opt/scripts/start-Xvfb.sh
+sleep 5
+
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-${SERVER_DIR}/game/bin/linuxsteamrt64/cs2 ${GAME_PARAMS}
+if [ ! -f ${SERVER_DIR}/IcarusServer.exe ]; then
+  echo "---Something went wrong, can't find the executable, putting container into sleep mode!---"
+  sleep infinity
+else
+  screen -S Icarus -d -m wine64 ${SERVER_DIR}/IcarusServer.exe -log ${GAME_PARAMS}
+  if [ ! -f ${SERVER_DIR}/Icarus/Saved/Logs/Icarus.log ]; then
+    if [ ! -d ${SERVER_DIR}/Icarus/Saved/Logs ]; then
+      mkdir -p ${SERVER_DIR}/Icarus/Saved/Logs
+    fi
+    touch ${SERVER_DIR}/Icarus/Saved/Logs/Icarus.log
+  fi
+  sleep 2
+  /opt/scripts/start-watchdog.sh &
+  tail -n 9999 -f ${SERVER_DIR}/Icarus/Saved/Logs/Icarus.log
+fi

scripts/start-watchdog.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+killpid="$(pidof IcarusServer.exe)"
+while true
+do
+	tail --pid=$killpid -f /dev/null
+	kill "$(pidof tail)"
+exit 0
+done

scripts/start.sh

@@ -22,13 +22,16 @@ fi
 echo "---Taking ownership of data...---"
 chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
+chown ${UID}:${GID} /opt/ServerSettings.ini
+chmod 750 /opt/ServerSettings.ini
 chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM "$killpid"
-	wait "$killpid" -f 2>/dev/null
+	kill -SIGINT $(pidof IcarusServer.exe)
+	tail --pid=$(pidof IcarusServer.exe) -f 2>/dev/null
 	exit 143;
+
 }
 
 trap 'kill ${!}; term_handler' SIGTERM
@@ -38,4 +41,4 @@ while true
 do
 	wait $killpid
 	exit 0;
-done
+done