Dockerfile aktualisiert

ensure group is linked correctly

.github/FUNDING.yml

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

Dockerfile

@@ -1,10 +1,10 @@
-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 libsqlite3-0 libgdiplus unzip && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 lib32z1 lsof libicu67 && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
@@ -13,15 +13,7 @@ ENV SERVER_DIR="${DATA_DIR}/serverfiles"
 ENV GAME_ID="template"
 ENV GAME_NAME="template"
 ENV GAME_PARAMS="template"
-ENV GAME_PORT=28015
-ENV QUERY_PORT=28016
-ENV RCON_PORT=28017
-ENV APP_PORT=28018
-ENV SERVER_NAME="RustDocker"
-ENV SERVER_DISCRIPTION="Simple Unraid Rust Docker"
-ENV OXIDE_MOD="false"
-ENV CARBON_MOD="false"
-ENV FORCE_OXIDE_INSTALLATION="true"
+ENV GAME_PORT=27015
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99

README.md

@@ -1,44 +1,48 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install RUST and run it.
+This Docker will download and install SteamCMD. It will also install Counter-Strike 2 and run it.
 
-**Update Notice:** Simply restart the container if a newer version of the game is available.
+**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!!!**
 
-## Env params
+**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
 | 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 use a beta version of the game enter this: '258550 -beta staging' or '258550 -beta prerelease' (without quotes). | 258550 |
-| GAME_PARAMS | Enter here your extra game startup parameters if needed starting with (eg: '+rcon.port 27016 +rcon.password YOURPASSWORD' don't forget to add also a new port mapping with container and host port set to the corresponding RCON port) | +server.maxplayers 10 |
-| SERVER_NAME | Name of the Server goes here | RustDockerServer |
-| SERVER_DISCRIPTION | Server Description goes here | Simple Unraid Rust Docker Server |
-| OXIDE_MOD | Set to 'true' (without quotes) to enable Oxide Mod, otherwise leave empty (the container will check on every start/restart if there is a newer version available). | false |
-| CARBON_MOD | Set to 'true' (without quotes) to enable Carbon Mod, otherwise leave empty (the container will check on every start/restart if there is a newer version available). | false |
-| GAME_PORT | Game port on which the server is running (has to match the port mapping in your container). | 28015 |
+| 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 | false |
-| 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 RUST -d \
-	-p 28015:28015/udp \
-	--env 'GAME_ID=258550' \
-	--env 'SERVER_NAME=RustDockerServer' \
-	--env 'SERVER_DISCRIPTION=Simple Unraid Rust Docker Server' \
-	--env 'GAME_PARAMS=+server.maxplayers 10' \
-	--env 'GAME_PORT=28015' \
+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/rust:/serverdata/serverfiles \
-	ich777/steamcmd:rust
+	--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!
 
 This Docker is forked from mattieserver, thank you for this wonderfull Docker.
 
-### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/
+#### Support Thread: https://forums.unraid.net/topic/79530-support-ich777-gameserver-dockers/

scripts/start-server.sh

@@ -50,116 +50,19 @@ else
     fi
 fi
 
-if [ "${OXIDE_MOD}" == "true" ] && [ "${CARBON_MOD}" == "true" ]; then
-  echo "---Oxide and Carbon mod enabled, you can only enable one at a time, putting container into sleep mode.--"
-  sleep infinity
-fi
-
-if [ "${OXIDE_MOD}" == "true" ]; then
-  echo "---Oxide Mod enabled!---"
-  CUR_V="$(find ${SERVER_DIR} -maxdepth 1 -name "OxideMod-*.zip" | cut -d '-' -f2)"
-  LAT_V="$(wget -qO- https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | grep tag_name | cut -d '"' -f4)"
-
-  if [ -z ${LAT_V} ]; then
-    if [ -z ${CUR_V%.*} ]; then
-      echo "---Can't get latest Oxide Mod version and found no installed version, putting server into sleep mode!---"
-      sleep infinity
-    else
-      echo "---Can_t get latest Oxide Mod version, falling back to installed v${CUR_V%.*}!---"
-      LAT_V="${CUR_V%.*}"
-    fi
-  fi
-
-  if [ -z "${CUR_V%.}" ]; then
-    echo "---Oxide Mod not found, downloading!---"
-    rm -f ${SERVER_DIR}/OxideMod-*.zip
-    cd ${SERVER_DIR}
-    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/OxideMod-${LAT_V}.zip "https://github.com/OxideMod/Oxide.Rust/releases/download/${LAT_V}/Oxide.Rust-linux.zip" ; then
-        echo "---Successfully downloaded Oxide Mode v${LAT_V}!---"
-    else
-        echo "---Something went wrong, can't download Oxide Mod v${LAT_V}, putting server in sleep mode---"
-        sleep infinity
-    fi
-    unzip -o ${SERVER_DIR}/OxideMod-${LAT_V}.zip -d ${SERVER_DIR}
-  elif [ "${LAT_V}" != "${CUR_V%.*}" ]; then
-    cd ${SERVER_DIR}
-    rm -rf ${SERVER_DIR}/OxideMod-*.zip
-    echo "---Newer version of Oxide Mod v${LAT_V} found, currently installed: v${CUR_V%.*}---"
-    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/OxideMod-${LAT_V}.zip "https://github.com/OxideMod/Oxide.Rust/releases/download/${LAT_V}/Oxide.Rust-linux.zip" ; then
-        echo "---Successfully downloaded Oxide Mod v${LAT_V}!---"
-    else
-        echo "---Something went wrong, can't download Oxide Mod v${LAT_V}, putting server in sleep mode---"
-        sleep infinity
-    fi
-    unzip -o ${SERVER_DIR}/OxideMod-${LAT_V}.zip -d ${SERVER_DIR}
-  elif [ "$LAT_V" == "${CUR_V%.*}" ]; then
-    echo "---Oxide Mod v${CUR_V%.*} is Up-To-Date!---"
-  fi
-
-  if [ "${FORCE_OXIDE_INSTALLATION}" == "true" ]; then
-    unzip -o ${SERVER_DIR}/OxideMod-${LAT_V}.zip -d ${SERVER_DIR}
-  fi
-fi
-
-if [ "${CARBON_MOD}" == "true" ]; then
-  echo "---Carbon Mod enabled!---"
-  CUR_V="$(find ${SERVER_DIR} -maxdepth 1 -name "CarbonMod-*.tar.gz" | cut -d '-' -f2)"
-  LAT_V="$(wget -qO- https://api.github.com/repos/CarbonCommunity/Carbon/releases/latest | grep tag_name | cut -d '"' -f4)"
-
-  if [ -z ${LAT_V} ]; then
-    if [ -z ${CUR_V%.tar.gz} ]; then
-      echo "---Can't get latest Carbon Mod version and found no installed version, putting server into sleep mode!---"
-      sleep infinity
-    else
-      echo "---Can_t get latest Carbon Mod version, falling back to installed v${CUR_V%.tar.gz}!---"
-      LAT_V="${CUR_V%.tar.gz}"
-    fi
-  fi
-
-  if [ -z "${CUR_V%.tar.gz}" ]; then
-    echo "---Carbon Mod not found, downloading!---"
-    rm -f ${SERVER_DIR}/CarbonMod-*.tar.gz
-    cd ${SERVER_DIR}
-    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz "https://github.com/CarbonCommunity/Carbon/releases/download/${LAT_V}/Carbon.Linux.Release.tar.gz" ; then
-        echo "---Successfully downloaded Carbon Mode ${LAT_V}!---"
-    else
-        echo "---Something went wrong, can't download Carbon Mod ${LAT_V}, putting server in sleep mode---"
-        sleep infinity
-    fi
-    tar -xvf ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz -C ${SERVER_DIR}
-    #unzip -o ${SERVER_DIR}/CarbonMod-${LAT_V}.zip -d ${SERVER_DIR}
-  elif [ "${LAT_V}" != "${CUR_V%.tar.gz}" ]; then
-    cd ${SERVER_DIR}
-    rm -rf ${SERVER_DIR}/CarbonMod-*.tar.gz
-    echo "---Newer version of Carbon Mod ${LAT_V} found, currently installed: v${CUR_V%.tar.gz}---"
-    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz "https://github.com/CarbonCommunity/Carbon/releases/download/${LAT_V}/Carbon.Linux.Release.tar.gz" ; then
-        echo "---Successfully downloaded Carbon Mod ${LAT_V}!---"
-    else
-        echo "---Something went wrong, can't download Carbon Mod ${LAT_V}, putting server in sleep mode---"
-        sleep infinity
-    fi
-    tar -xvf ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz ${SERVER_DIR}
-  elif [ "$LAT_V" == "${CUR_V%.tar.gz}" ]; then
-    echo "---Carbon Mod ${CUR_V%.tar.gz} is Up-To-Date!---"
-  fi
-
-  if [ "${FORCE_CARBON_INSTALLATION}" == "true" ]; then
-    tar -xvf ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz -C ${SERVER_DIR}
-  fi
-  source "${SERVER_DIR}/carbon/tools/environment.sh"
-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 "---Setting Library path---"
-export LD_LIBRARY_PATH=:/bin/RustDedicated_Data/Plugins/x86_64
 echo "---Server ready---"
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-if [ ! -f ${SERVER_DIR}/RustDedicated ]; then
-  echo "---Can't find game executable, putting server into sleep mode!---"
-  sleep infinity
-else
-  ${SERVER_DIR}/RustDedicated -batchmode -server.port ${GAME_PORT} -server.queryport ${QUERY_PORT} -rcon.port ${RCON_PORT} -app.port ${APP_PORT} -server.hostname "${SERVER_NAME}" -server.description "${SERVER_DISCRIPTION}" ${GAME_PARAMS}
-fi
+${SERVER_DIR}/game/bin/linuxsteamrt64/cs2 ${GAME_PARAMS}

scripts/start.sh

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