Dockerfile aktualisiert

Dockerfile

@@ -1,4 +1,4 @@
-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"
@@ -10,10 +10,9 @@ RUN apt-get update && \
 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 GAME_ID="3017300"
+ENV MAP="Level01_Main"
+ENV GAME_PARAMS='-SteamServerName="Soulmask Docker" -MaxPlayers=50 -PSW="Docker" -adminpsw="adminDocker" -pve -Port=8777 -QueryPort=27015 -EchoPort=18888'
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99

README.md

@@ -1,16 +1,23 @@
 # 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 Soulmask and run it.
 
-**Please see the different Tags/Branches which games are available.**
+Defaults: Servername: 'Soulmask Docker' Password: 'Docker' Admin Password: 'adminDocker'
+(You can change that in the GAME_PARAMS variable)
 
-## Example Env params for CS:Source
+ATTENTION: First Startup can take very long since it downloads the gameserver files!
+
+Update Notice: Simply restart the container if a newer version of the game is available.
+
+You can also run multiple servers with only one SteamCMD directory!
+
+## Example Env
 | 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: '3017300 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 3017300 |
+| MAP | Map name | Level01_Main |
+| GAME_PARAMS | Values to start the server | -SteamServerName="Soulmask Docker" -MaxPlayers=50 -PSW="Docker" -adminpsw="adminDocker" -pve -Port=8777 -QueryPort=27015 -EchoPort=18888 |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
 | GAME_PORT | Port the server will be running on | 27015 |
@@ -20,17 +27,16 @@ This Docker will download and install SteamCMD and the according game that is pu
 
 ## Run example for CS:Source
 ```
-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 Soulmask -d \
+	-p 8777:8777/udp -p 27015:27015/udp \
+	--env 'GAME_ID=3017300' \
+	--env 'MAP=Level01_Main' \
+	--env 'GAME_PARAMS=-SteamServerName="Soulmask Docker" -MaxPlayers=50 -PSW="Docker" -adminpsw="adminDocker" -pve -Port=8777 -QueryPort=27015 -EchoPort=18888' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/cstrikesource:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	--volume /path/to/soulmask:/serverdata/serverfiles \
+	ich777/steamcmd:soulmask
 ```
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!

scripts/start-server.sh

@@ -1,68 +1,48 @@
 #!/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
+  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
+${STEAMCMD_DIR}/steamcmd.sh \
+  +login anonymous \
+  +quit
+
 
 echo "---Update Server---"
-if [ "${USERNAME}" == "" ]; then
-    if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login anonymous \
-        +app_update ${GAME_ID} validate \
-        +quit
-    else
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login anonymous \
-        +app_update ${GAME_ID} \
-        +quit
-    fi
+if [ "${VALIDATE}" == "true" ]; then
+  echo "---Validating installation---"
+  ${STEAMCMD_DIR}/steamcmd.sh \
+    +force_install_dir ${SERVER_DIR} \
+    +login anonymous \
+    +app_update ${GAME_ID} validate \
+    +quit
 else
-    if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login ${USERNAME} ${PASSWRD} \
-        +app_update ${GAME_ID} validate \
-        +quit
-    else
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login ${USERNAME} ${PASSWRD} \
-        +app_update ${GAME_ID} \
-        +quit
-    fi
+  ${STEAMCMD_DIR}/steamcmd.sh \
+    +force_install_dir ${SERVER_DIR} \
+    +login anonymous \
+    +app_update ${GAME_ID} \
+    +quit
 fi
 
 echo "---Prepare Server---"
-if [ ! -f ${DATA_DIR}/.steam/sdk32/steamclient.so ]; then
-	if [ ! -d ${DATA_DIR}/.steam ]; then
-    	mkdir ${DATA_DIR}/.steam
-    fi
-	if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
-    	mkdir ${DATA_DIR}/.steam/sdk32
-    fi
-    cp -R ${STEAMCMD_DIR}/linux32/* ${DATA_DIR}/.steam/sdk32/
+if [ ! -d ${DATA_DIR}/.steam/sdk64 ]; then
+  mkdir -p ${DATA_DIR}/.steam/sdk64
+  cp -R ${SERVER_DIR}/linux64/* ${DATA_DIR}/.steam/sdk64/
+  echo "---Server ready---"
+else
+  echo "---Server ready---"
 fi
 chmod -R ${DATA_PERM} ${DATA_DIR}
-echo "---Server ready---"
-
+   
 echo "---Start Server---"
 cd ${SERVER_DIR}
-${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}
+if [ ! -f ${SERVER_DIR}/WS/Binaries/Linux/WSServer-Linux-Shipping ]; then
+  echo "---Something went wrong, can't find the executable, putting container into sleep mode!---"
+  sleep infinity
+else
+  ${SERVER_DIR}/WS/Binaries/Linux/WSServer-Linux-Shipping WS ${MAP} -server ${GAME_PARAMS} -log -UTF8Output -MULTIHOME=0.0.0.0 -forcepassthrough
+fi

scripts/start.sh

@@ -12,11 +12,11 @@ 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---"
+  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 "---Taking ownership of data...---"
@@ -26,9 +26,9 @@ chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM "$killpid"
-	wait "$killpid" -f 2>/dev/null
-	exit 143;
+  kill -SIGINT $(pidof WSServer-Linux-Shipping)
+  tail --pid=$(pidof WSServer-Linux-Shipping) -f 2>/dev/null
+  exit 143;
 }
 
 trap 'kill ${!}; term_handler' SIGTERM
@@ -36,6 +36,6 @@ su ${USER} -c "/opt/scripts/start-server.sh" &
 killpid="$!"
 while true
 do
-	wait $killpid
-	exit 0;
+  wait $killpid
+  exit 0;
 done