scripts/start-server.sh aktualisiert

Updated to support login

.github/FUNDING.yml

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

Dockerfile

@@ -1,38 +1,40 @@
-FROM ubuntu
+FROM ich777/winehq-baseimage
 
-MAINTAINER Mattie
+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
+RUN apt-get update && \
-RUN apt-get update
+	apt-get -y install lib32gcc-s1 winbind xvfb screen cabextract && \
-RUN apt-get -y install libstdc++6:i386
+	wget -q -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks && \
-RUN apt-get -y install wget
+	chmod +x /usr/bin/winetricks && chown 755 /usr/bin/winetricks && \
+	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="740"
+ENV GAME_ID="template"
-ENV GAME_NAME="csgo"
+ENV GAME_NAME="template"
-ENV GAME_PARAMS="+game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2"
+ENV GAME_PARAMS="template"
+ENV GAME_PORT=27015
+ENV VALIDATE=""
+ENV UMASK=000
+ENV UID=99
+ENV GID=100
+ENV USERNAME=""
+ENV PASSWRD=""
+ENV USER="steam"
+ENV DATA_PERM=770
 
-RUN mkdir $DATA_DIR
+RUN mkdir $DATA_DIR && \
-RUN mkdir $STEAMCMD_DIR
+	mkdir $STEAMCMD_DIR && \
-RUN mkdir $SERVER_DIR
+	mkdir $SERVER_DIR && \
-RUN mkdir -p ~/.steam/sdk32
+	useradd -d $DATA_DIR -s /bin/bash $USER && \
-
+	chown -R $USER $DATA_DIR && \
-RUN wget -q -O ${STEAMCMD_DIR}/steamcmd_linux.tar.gz http://media.steampowered.com/client/steamcmd_linux.tar.gz \
+	ulimit -n 2048
-  &&  tar --directory ${STEAMCMD_DIR} -xvzf /serverdata/steamcmd/steamcmd_linux.tar.gz \
-  &&  rm ${STEAMCMD_DIR}/steamcmd_linux.tar.gz \
-  &&  chmod -R 774 ${STEAMCMD_DIR} ${STEAMCMD_DIR}/linux32 $SERVER_DIR \
-  &&  ln -s ${STEAMCMD_DIR}/linux32/steamclient.so ~/.steam/sdk32/steamclient.so
-RUN ulimit -n 2048
-
-EXPOSE 27015
-EXPOSE 27015/udp
-EXPOSE 27020/udp
-EXPOSE 27005/udp
 
 ADD /scripts/ /opt/scripts/
-RUN chmod -R 774 /opt/scripts/
+RUN chmod -R 770 /opt/scripts/
+COPY ServerSettings.ini /opt/ServerSettings.ini
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start-csgo.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,28 +1,44 @@
-#Steamcmd in docker
+# SteamCMD in Docker optimized for Unraid
-This dockerfill will download/install steamcmd.
+This Docker will download and install SteamCMD. It will also install Icarus and run it.
-It will also install the server you want(like csgo,tf2,ins ...)
 
-##Env params
+Initial server configuration:  
-| Name | Value | Default |
+**Servername:** Icarus Docker **Password:** Docker  **AdminPassword:** adminDocker  
+
+**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! 
+
+**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+).
+
+Update Notice: Simply restart the container if a newer version of the game is available.
+
+## Example Env params for CS:Source
+| Name | Value | Example |
 | --- | --- | --- |
-| DATA_DIR | main folder | /serverdata |
+| STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
-| STEAMCMD_DIR | folder for steamcmd | /serverdata/steamcmd |
+| SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| 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: '2089300 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 2089300 |
-| GAME_ID | steamid for server | 740 |
+| GAME_PARAMS | Values to start the server | -SteamServerName="Icarus Docker" -Port=17777 -QueryPort=27015 |
-| GAME_NAME | srcds gamename | csgo |
+| UID | User Identifier | 99 |
-| GAME_PARAMS | values to start the server | +game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2 |
+| GID | Group Identifier | 100 |
+| GAME_PORT | Port the server will be running on | 27015 |
+| VALIDATE | Validates the game data | false |
+| USERNAME | Leave blank for anonymous login | blank |
+| PASSWRD | Leave blank for anonymous login | blank |
 
->**NOTE** GAME_ID values can be found [here](https://developer.valvesoftware.com/wiki/Dedicated_Servers_List)
+## Run example
-
-> And for GAME_NAME there is no list, so a quick search should give you the result
-
-##Run example
 ```
-docker run --name csgo-server -d \
+docker run --name Icarus -d \
-	-p 27015:27015 -p 27015:27015/udp -p 27020:27020/udp -p 27005:27005/udp \
+	-p 17777:17777/udp -p 27015:27015/udp \
-	--env 'GAME_ID=740' \
+	--env 'GAME_ID=2089300' \
-	--env 'GAME_NAME=csgo' \
+	--env 'GAME_PARAMS=-SteamServerName="Icarus Docker" -Port=17777 -QueryPort=27015' \
-	--env 'GAME_PARAMS=+game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2' \
+	--env 'UID=99' \
-	--volume /share/CACHEDEV1_DATA/Public/VM/Docker/CSGO:/serverdata \
+	--env 'GID=100' \
-	mattie/docker-steamcmd-server:latest
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
+	--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!
+
+This Docker is forked from mattieserver, thank you for this wonderfull Docker.
+
+#### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/

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-csgo.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-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 
-    tar --directory ${STEAMCMD_DIR} -xvzf /serverdata/steamcmd/steamcmd_linux.tar.gz
-    rm ${STEAMCMD_DIR}/steamcmd_linux.tar.gz
-    chmod -R 774 ${STEAMCMD_DIR}/steamcmd.sh ${STEAMCMD_DIR}/linux32/steamcmd
-    ln -s ${STEAMCMD_DIR}/linux32/steamclient.so ~/.steam/sdk32/steamclient.so
-fi
-
-echo "---Update steamcmd---"
-${STEAMCMD_DIR}/steamcmd.sh \
-    +login anonymous \
-    +quit
-    
-echo "---Update server---"
-${STEAMCMD_DIR}/steamcmd.sh \
-    +login anonymous \
-    +force_install_dir $SERVER_DIR \
-    +app_update $GAME_ID \
-    +quit
-    
-echo "---Start Server---"
-${SERVER_DIR}/srcds_run -game $GAME_NAME -usercon -console $GAME_PARAMS +ip 0.0.0.0 +port 27015 +sv_lan 0

scripts/start-server.sh

@@ -0,0 +1,141 @@
+#!/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 
+    tar --directory ${STEAMCMD_DIR} -xvzf /serverdata/steamcmd/steamcmd_linux.tar.gz
+    rm ${STEAMCMD_DIR}/steamcmd_linux.tar.gz
+fi
+
+echo "---Update SteamCMD---"
+if [ "${USERNAME}" == "" ]; then
+    ${STEAMCMD_DIR}/steamcmd.sh \
+    +login anonymous \
+    +quit
+else
+    ${STEAMCMD_DIR}/steamcmd.sh \
+    +login ${USERNAME} ${PASSWRD} \
+    +quit
+fi
+
+echo "---Update Server---"
+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} \
+        +quit
+    fi
+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} \
+        +quit
+    fi
+fi
+
+echo "---Prepare Server---"
+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}
+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

@@ -0,0 +1,44 @@
+#!/bin/bash
+echo "---Ensuring UID: ${UID} matches user---"
+usermod -u ${UID} ${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---"
+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---"
+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 -SIGINT $(pidof IcarusServer.exe)
+	tail --pid=$(pidof IcarusServer.exe) -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