Dockerfile aktualisiert

ensure group is linked correctly

Dockerfile

@@ -1,20 +1,18 @@
-FROM ich777/debian-baseimage
+FROM ich777/debian-baseimage:bullseye_amd64
 
 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 xvfb screen libxi6 && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 lib32z1 lsof libicu67 && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
 ENV STEAMCMD_DIR="${DATA_DIR}/steamcmd"
 ENV SERVER_DIR="${DATA_DIR}/serverfiles"
-ENV WORLD_INDEX=0
-ENV WORLD_NAME="Core Keeper Docker"
 ENV GAME_ID="template"
-ENV GAME_NAME=""
-ENV GAME_PARAMS=""
+ENV GAME_NAME="template"
+ENV GAME_PARAMS="template"
 ENV GAME_PORT=27015
 ENV VALIDATE=""
 ENV UMASK=000
@@ -36,4 +34,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,38 +1,44 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install CoreKeeper and run it.
+This Docker will download and install SteamCMD. It will also install Counter-Strike 2 and run it.
 
-**GameID:** Your GameID will be displayed in the log after the server successfully started.
+**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!!!**
 
-**Port Forwarding:** You don't have to forward any ports for this game because it uses the Steam Network and the GameID to establish the connection.
+**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.
+**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!!!)  
 
-## Example Env params
+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: '1963720 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 1963720 |
-| WORLD_NAME | Enter your prefered world name here. | Core Keeper Docker |
-| WORLD_INDEX | Only change when you know what you are doing! | 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: '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 |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
-| VALIDATE | Validates the game data | true |
-| USERNAME | Leave blank for anonymous login | blank |
-| PASSWRD | Leave blank for anonymous login | blank |
+| GAME_PORT | Port the server will be running on | 27015 |
+| VALIDATE | Validates the game data | blank |
 
 ## Run example
 ```
-docker run --name CoreKeeper -d \
-	--env 'GAME_ID=1963720' \
-	--env 'WORLD_NAME=Core Keeper Docker' \
-	--env 'WORLD_INDEX=0' \
+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' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/corekeeper:/serverdata/serverfiles \
-	ich777/steamcmd:corekeeper
+	--volume /path/to/cs2:/serverdata/serverfiles \
+	ich777/steamcmd:cs2
 ```
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!

scripts/start-Xvfb.sh

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

scripts/start-server.sh

@@ -52,35 +52,17 @@ fi
 
 echo "---Prepare Server---"
 if [ ! -f ${DATA_DIR}/.steam/sdk64/steamclient.so ]; then
-  if [ ! -d ${DATA_DIR}/.steam/sdk64 ]; then
-    mkdir -p ${DATA_DIR}/.steam/sdk64
-  fi
-  cp -R ${STEAMCMD_DIR}/linux64/* ${DATA_DIR}/.steam/sdk64/
-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 +x ${SERVER_DIR}/CoreKeeperServer
-if [ -f ${SERVER_DIR}/steamclient.so ]; then
-  rm ${SERVER_DIR}/steamclient.so
+	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/
 fi
+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 3
 
 echo "---Start Server---"
-export DISPLAY=:99
 cd ${SERVER_DIR}
-if [ -f ${SERVER_DIR}/GameID.txt ]; then
-  rm -f ${SERVER_DIR}/GameID.txt
-fi
-${SERVER_DIR}/CoreKeeperServer -batchmode -logfile ${SERVER_DIR}/CoreKeeperServerLog.txt -world ${WORLD_INDEX} -worldname "${WORLD_NAME}" -datapath "${SERVER_DIR}/Save" ${GAME_PARAMS} 2 >/dev/null &
-sleep 2
-screen -S watchdog -d -m /opt/scripts/start-watchdog.sh
-while [ ! -f ${SERVER_DIR}/GameID.txt ]; do
-        sleep 1
-done
-echo "Server Game ID: $(cat ${SERVER_DIR}/GameID.txt 2>/dev/null)"
-sleep infinity
+${SERVER_DIR}/game/bin/linuxsteamrt64/cs2 ${GAME_PARAMS}

scripts/start-watchdog.sh

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

scripts/start.sh

@@ -26,8 +26,8 @@ chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM $(pidof CoreKeeperServer)
-	tail --pid="$(pidof CoreKeeperServer)" -f 2>/dev/null
+	kill -SIGTERM "$killpid"
+	wait "$killpid" -f 2>/dev/null
 	exit 143;
 }
 
@@ -38,4 +38,4 @@ while true
 do
 	wait $killpid
 	exit 0;
-done
+done