Dockerfile aktualisiert

ensure group is linked correctly

.github/FUNDING.yml

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

Dockerfile

@@ -1,9 +1,15 @@
-FROM ubuntu
+FROM ich777/debian-baseimage
 
-MAINTAINER ich777
+LABEL org.opencontainers.image.authors="admin@minenet.at"
+LABEL org.opencontainers.image.source="https://github.com/ich777/docker-steamcmd-server"
 
-RUN apt-get update
-RUN apt-get -y install libc6-i386 wget language-pack-en lib32stdc++6
+RUN apt-get update && \
+	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"
@@ -13,24 +19,25 @@ 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
 
-RUN mkdir $DATA_DIR
-RUN mkdir $STEAMCMD_DIR
-RUN mkdir $SERVER_DIR
-RUN useradd -d $DATA_DIR -s /bin/bash --uid $UID --gid $GID steam
-RUN chown -R steam $DATA_DIR
-
-RUN ulimit -n 2048
+RUN mkdir $DATA_DIR && \
+	mkdir $STEAMCMD_DIR && \
+	mkdir $SERVER_DIR && \
+	useradd -d $DATA_DIR -s /bin/bash $USER && \
+	chown -R $USER $DATA_DIR && \
+	ulimit -n 2048
 
 ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
-RUN chown -R steam /opt/scripts
-
-USER steam
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start-server.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,28 +1,24 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Counter-Strike: Source and run it. Update Notice: Simply restart the container if a newer version of the game is available.
+This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
 
-## Env params
+**Please see the different Tags/Branches which games are available.**
+
+## 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 | SteamID for server | 232330 |
+| 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 |
 | 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, 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
+## Run example for CS:Source
 ```
 docker run --name CSSource -d \
 	-p 27015:27015 -p 27015:27015/udp \
@@ -32,14 +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

@@ -1,66 +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
+${STEAMCMD_DIR}/steamcmd.sh \
+  +login anonymous \
+  +quit
+
+if [[ ! $LOGIN_TIMEOUT =~ ^[0-9]+$ ]]; then
+  echo "LOGIN_TIMEOUT must be a integer, putting container into sleep mode!"
+  sleep infinity
 fi
 
-echo "---Update Server---"
-if [ "${USERNAME}" == "" ]; then
-    if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +login anonymous \
-        +force_install_dir ${SERVER_DIR} \
-        +app_update ${GAME_ID} validate \
-        +quit
+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 [ ! -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
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +login anonymous \
-        +force_install_dir ${SERVER_DIR} \
-        +app_update ${GAME_ID} \
-        +quit
+      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
-    if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +login ${USERNAME} ${PASSWRD} \
-        +force_install_dir ${SERVER_DIR} \
-        +app_update ${GAME_ID} validate \
-        +quit
-    else
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +login ${USERNAME} ${PASSWRD} \
-        +force_install_dir ${SERVER_DIR} \
-        +app_update ${GAME_ID} \
-        +quit
-    fi
+  echo "LOGIN_TIMEOUT set to 0, Update Server skipped!"
 fi
 
+export USERNAME="secret"
+export PASSWRD="secret"
+
 echo "---Prepare Server---"
-if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
-    mkdir ${DATA_DIR}/.steam/sdk32
-    cp -R ${SERVER_DIR}/bin/* ${DATA_DIR}/.steam/sdk32/
-fi
-echo "---Please wait---"
-chmod -R 770 ${DATA_DIR}
+chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
 echo "---Start Server---"
-${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} +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

@@ -0,0 +1,41 @@
+#!/bin/bash
+echo "---Ensuring UID: ${UID} matches user---"
+usermod -u ${UID} ${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---"
+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---"
+else
+    echo "---No optional script found, continuing---"
+fi
+
+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
+	exit 143;
+}
+
+trap 'kill ${!}; term_handler' SIGTERM
+su ${USER} -c "/opt/scripts/start-server.sh" &
+killpid="$!"
+while true
+do
+	wait $killpid
+	exit 0;
+done