Dockerfile aktualisiert

Dockerfile

@@ -1,21 +1,19 @@
-FROM ich777/winehq-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 lib32z1 winbind && \
+	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 GAME_ID="2857200"
-ENV SERVER_NAME="Abiotic Factor Docker"
-ENV SERVER_PWD="Docker"
-ENV GAME_PARAMS="-log"
-ENV GAME_PORT=7777
-ENV QUERY_PORT=27015
+ENV GAME_ID="template"
+ENV GAME_NAME="template"
+ENV GAME_PARAMS="template"
+ENV GAME_PORT=27015
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99

README.md

@@ -1,44 +1,44 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Abiotic Factor and run it.
+This Docker will download and install SteamCMD. It will also install Counter-Strike 2 and run it.
 
-ATTENTION: First Startup can take very long since it downloads the gameserver files!
+**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!!!**
 
-Update Notice: Simply restart the container if a newer version of the game is available.
+**ATTENTION:** First Startup can take very long since it downloads the gameserver files!
+
+**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!!!)  
 
 You can also run multiple servers with only one SteamCMD directory!
 
-## Example Env params
+## 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: '2857200 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 2857200 |
-| SERVER_NAME | Your server name goes here | Abiotic Factor Docker |
-| SERVER_PWD | Your server password goes here | Docker |
-| GAME_PARAMS | Enter your game parameters | -log |
-| GAME_PORT | Enter your preferred game port | 7777 |
-| QUERY_PORT | Enter your preferred query port | 27015 |
+| 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 |
+| GAME_PORT | Port the server will be running on | 27015 |
 | VALIDATE | Validates the game data | blank |
-| USERNAME | Leave blank for anonymous login | blank |
-| PASSWRD | Leave blank for anonymous login | blank |
 
 ## Run example
 ```
-docker run --name AbioticFactor -d \
-	-p 7777:7777/udp -p 27015:27015/udp\
-	--env 'GAME_ID=2857200' \
-	--env 'SERVER_NAME=Abiotic Factor Docker' \
-	--env 'SERVER_PWD=Docker' \
-	--env 'GAME_PARAMS=-log' \
-	--env 'GAME_PORT=7777' \
-	--env 'QUERY_PORT=27015' \
+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/abioticfactor:/serverdata/serverfiles \
-	ich777/steamcmd:abioticfactor
+	--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-server.sh

@@ -1,87 +1,68 @@
 #!/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
+    ${STEAMCMD_DIR}/steamcmd.sh \
+    +login anonymous \
+    +quit
 else
-  ${STEAMCMD_DIR}/steamcmd.sh \
-  +login ${USERNAME} ${PASSWRD} \
-  +quit
+    ${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
+    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
 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
+    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
 fi
 
-export WINEARCH=win64
-export WINEPREFIX=/serverdata/serverfiles/WINE64
-export WINEDEBUG=-all
-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
-else
-  echo "---WINE properly set up---"
-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/
+fi
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
 echo "---Start Server---"
-if [ ! -f ${SERVER_DIR}/AbioticFactor/Binaries/Win64/AbioticFactorServer-Win64-Shipping.exe ]; then
-  echo "---Something went wrong, can't find the executable, putting container into sleep mode!---"
-  sleep infinity
-else
-  cd ${SERVER_DIR}/AbioticFactor/Binaries/Win64
-  wine64 ${SERVER_DIR}/AbioticFactor/Binaries/Win64/AbioticFactorServer-Win64-Shipping.exe ${GAME_PARAMS} -oldconsole -useperfthreads -NoAsyncLoadingThread -PORT=${GAME_PORT} -QUERYPORT=${QUERY_PORT} -ServerPassword="${SERVER_PWD}" -SteamServerName="${SERVER_NAME}"
-fi
+cd ${SERVER_DIR}
+${SERVER_DIR}/game/bin/linuxsteamrt64/cs2 ${GAME_PARAMS}

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,8 +26,8 @@ chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGINT $(pidof AbioticFactorServer-Win64-Shipping.exe)
-	tail --pid=$(pidof AbioticFactorServer-Win64-Shipping.exe) -f 2>/dev/null
+	kill -SIGTERM "$killpid"
+	wait "$killpid" -f 2>/dev/null
 	exit 143;
 }
 
@@ -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