Dockerfile aktualisiert

ensure group is linked correctly

.github/FUNDING.yml

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

Dockerfile

@@ -4,30 +4,28 @@ 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 screen && \
 	rm -rf /var/lib/apt/lists/*
 
+RUN wget -O /tmp/gotty.tar.gz https://github.com/yudai/gotty/releases/download/v1.0.1/gotty_linux_amd64.tar.gz && \
+	tar -C /usr/bin/ -xvf /tmp/gotty.tar.gz && \
+	rm -rf /tmp/gotty.tar.gz
+
 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=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 GOTTY_PARAMS="-w --title-format SteamLogin"
+ENV LOGIN_TIMEOUT=60
 ENV UMASK=000
 ENV UID=99
 ENV GID=100
-ENV USERNAME=""
-ENV PASSWRD=""
+ENV USERNAME="steamuser"
+ENV PASSWRD="steampwd"
 ENV USER="steam"
 ENV DATA_PERM=770
 

README.md

@@ -1,44 +1,40 @@
 # 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 and the according game that is pulled via specifying the Tag.
 
-**Update Notice:** Simply restart the container if a newer version of the game is available.
+**Please see the different Tags/Branches which games are available.**
 
-## Env params
+## Example Env params for CS:Source
 | 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: '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 |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
-| VALIDATE | Validates the game data | false |
+| 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
+## Run example for CS:Source
 ```
-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 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' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/rust:/serverdata/serverfiles \
-	ich777/steamcmd:rust
+	--volume /path/to/cstrikesource:/serverdata/serverfiles \
+	ich777/steamcmd:latest
 ```
 
 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-gotty.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+TERM=linux gotty ${GOTTY_PARAMS} screen -xS steamcmd &
+killpid="$(pgrep screen)"
+while true
+do
+  tail --pid=$killpid -f /dev/null
+  kill "$(pidof gotty)"
+  exit 0
+done

scripts/start-server.sh

@@ -1,165 +1,100 @@
 #!/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
-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
-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.--"
+if [[ ! $LOGIN_TIMEOUT =~ ^[0-9]+$ ]]; then
+  echo "LOGIN_TIMEOUT must be a integer, 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
+if [ "$LOGIN_TIMEOUT" -gt 0 ]; then
+  echo "---Update Server---"
+  if [ "$LOGIN_TIMEOUT" -lt 5 ]; then
+    echo "LOGIN_TIMEOUT must be greater than 5 seconds, changing to 30!"
+    LOGIN_TIMEOUT=30
   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!---"
+  if [ ! -f ~/.screenrc ]; then
+    echo "defscrollback 30000
+bindkey \"^C\" echo 'Blocked. Close this window to exit the terminal.'" > ~/.screenrc
   fi
 
-  if [ "${FORCE_OXIDE_INSTALLATION}" == "true" ]; then
-    unzip -o ${SERVER_DIR}/OxideMod-${LAT_V}.zip -d ${SERVER_DIR}
+  screen -wipe 2&>/dev/null
+
+  if [ ! -d ${DATA_DIR}/Steam/logs ]; then
+    mkdir -p ${DATA_DIR}/Steam/logs
+  elif [ -f ${DATA_DIR}/Steam/logs/steamcmd.log ]; then
+    rm -f ${DATA_DIR}/Steam/logs/steamcmd.log
   fi
+
+  screen -S steamcmd -L -Logfile ${DATA_DIR}/Steam/logs/steamcmd.log -d -m \
+    ${STEAMCMD_DIR}/steamcmd.sh \
+    +force_install_dir ${SERVER_DIR} \
+    +login ${USERNAME} ${PASSWRD} \
+    +app_update ${GAME_ID} \
+    +quit
+
+  sleep 1
+
+  /opt/scripts/start-gotty.sh >/dev/null 2>&1 &
+
+  echo "+----------------------------------------------------------------------"
+  echo "| Please connect to the built in SteamCMD web console (not the Docker"
+  echo "| console) and enter your 2FA token if you have SteamGuard enabled."
+  echo "|"
+  echo "| You can close the SteamCMD web console after entering the 2FA token."
+  echo "+----------------------------------------------------------------------"
+  echo
+  echo "Waiting $LOGIN_TIMEOUT seconds for login..."
+  echo
+
+  ELAPSED_TIME=0
+  while [ $ELAPSED_TIME -lt $LOGIN_TIMEOUT ]; do
+    if grep -q "Waiting for user info...OK" ${DATA_DIR}/Steam/logs/steamcmd.log; then
+      echo "Login successfull, continuing, please wait..."
+      sed -i 's/^Two-factor code:.*/Two-factor code:\*HIDDEN\*/' ${DATA_DIR}/Steam/logs/steamcmd.log
+      /opt/scripts/start-tail.sh
+      rm -f ${DATA_DIR}/Steam/logs/steamcmd.log
+      screen -wipe 2&>/dev/null
+      LOGINOK="true"
+      break
+    else
+      sleep 2
+      ((ELAPSED_TIME += 2))
+    fi
+  done
+
+  if [ "$LOGINOK" != "true" ]; then
+    echo "Login Failed after $LOGIN_TIMEOUT seconds, continuing..."
+    kill -SIGKILL $(pgrep screen) >/dev/null 2>&1
+    kill -SIGKILL $(pidof gotty) >/dev/null 2>&1
+    sed -i 's/^Two-factor code:.*/Two-factor code:\*HIDDEN\*/' ${DATA_DIR}/Steam/logs/steamcmd.log
+    cat ${DATA_DIR}/Steam/logs/steamcmd.log
+    rm -f ${DATA_DIR}/Steam/logs/steamcmd.log >/dev/null 2>&1
+    screen -wipe 2&>/dev/null
+  fi
+else
+  echo "LOGIN_TIMEOUT set to 0, Update Server skipped!"
 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
+export USERNAME="secret"
+export PASSWRD="secret"
 
 echo "---Prepare Server---"
 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
+
+echo
+echo "---Putting container into sleep mode zZzZzZzZz---"
+sleep infinity

scripts/start-tail.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+tail -n 100 -f ${DATA_DIR}/Steam/logs/steamcmd.log
+sleep 5
+killpid="$(pidof gotty)"
+while true
+do
+  if [ -z "$killpid" ]; then
+    kill $(pidof tail)
+    exit 0
+  fi
+  tail --pid=$killpid -f /dev/null
+  kill $(pidof tail)
+  exit 0
+done

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