Dockerfile aktualisiert

ensure group is linked correctly

Dockerfile

@@ -1,11 +1,16 @@
 FROM ich777/debian-baseimage
 
-LABEL maintainer="admin@minenet.at"
+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 && \
+	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"
@@ -14,11 +19,13 @@ ENV GAME_NAME="template"
 ENV GAME_PARAMS="template"
 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

@@ -14,16 +14,10 @@ This Docker will download and install SteamCMD and the according game that is pu
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
 | GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | true |
+| VALIDATE | Validates the game data | blank |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-**ATTENTION: You have to disable Steam Guard for games that require authentication, but not all games need Steam credentials, Steam recommends to create a seperate account for dedicated servers **
-
->**NOTE** GAME_ID values can be found [here](https://developer.valvesoftware.com/wiki/Dedicated_Servers_List)
-
-> And for GAME_NAME there is no list, so a quick search should give you the result
-
 ## Run example for CS:Source
 ```
 docker run --name CSSource -d \
@@ -34,17 +28,13 @@ docker run --name CSSource -d \
 	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
 	--env 'UID=99' \
 	--env 'GID=100' \
-	--volume /mnt/user/appdata/steamcmd:/serverdata/steamcmd \
-	--volume /mnt/user/appdata/cstrikesource:/serverdata/serverfiles \
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/cstrikesource:/serverdata/serverfiles \
 	ich777/steamcmd:latest
 ```
->**NOTE** port 26900 is the port for vac, in case of multiple servers make sure these are not the same
-
 
 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/

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

@@ -7,62 +7,94 @@ if [ ! -f ${STEAMCMD_DIR}/steamcmd.sh ]; then
 fi
 
 echo "---Update SteamCMD---"
-if [ "${USERNAME}" == "" ]; then
 ${STEAMCMD_DIR}/steamcmd.sh \
   +login anonymous \
   +quit
-else
-    ${STEAMCMD_DIR}/steamcmd.sh \
-    +login ${USERNAME} ${PASSWRD} \
-    +quit
+
+if [[ ! $LOGIN_TIMEOUT =~ ^[0-9]+$ ]]; then
+  echo "LOGIN_TIMEOUT must be a integer, putting container into sleep mode!"
+  sleep infinity
 fi
 
+if [ "$LOGIN_TIMEOUT" -gt 0 ]; then
   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
+  if [ "$LOGIN_TIMEOUT" -lt 5 ]; then
+    echo "LOGIN_TIMEOUT must be greater than 5 seconds, changing to 30!"
+    LOGIN_TIMEOUT=30
   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
+
+  if [ ! -f ~/.screenrc ]; then
+    echo "defscrollback 30000
+bindkey \"^C\" echo 'Blocked. Close this window to exit the terminal.'" > ~/.screenrc
+  fi
+
+  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
+
+export USERNAME="secret"
+export PASSWRD="secret"
 
 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/
-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}
+
+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

@@ -1,25 +1,30 @@
 #!/bin/bash
-echo "---Checking if UID: ${UID} matches user---"
+echo "---Ensuring UID: ${UID} matches user---"
 usermod -u ${UID} ${USER}
-echo "---Checking if GID: ${GID} matches user---"
+echo "---Ensuring GID: ${GID} matches user---"
+groupmod -g ${GID} ${USER} > /dev/null 2>&1 ||:
 usermod -g ${GID} ${USER}
 echo "---Setting umask to ${UMASK}---"
 umask ${UMASK}
 
 echo "---Checking for optional scripts---"
-if [ -f /opt/scripts/user.sh ]; then
+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 +x /opt/scripts/user.sh
-    /opt/scripts/user.sh
+    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---"
 fi
 
-echo "---Starting...---"
+echo "---Taking ownership of data...---"
 chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
 chown -R ${UID}:${GID} ${DATA_DIR}
 
+echo "---Starting...---"
 term_handler() {
 	kill -SIGTERM "$killpid"
 	wait "$killpid" -f 2>/dev/null