„scripts/start.sh“ ändern

.github/FUNDING.yml

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

Dockerfile

@@ -4,17 +4,15 @@ 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 xvfb screen libxi6 && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
 ENV STEAMCMD_DIR="${DATA_DIR}/steamcmd"
 ENV SERVER_DIR="${DATA_DIR}/serverfiles"
-ENV WORLD_INDEX=0
-ENV WORLD_NAME="Core Keeper Docker"
 ENV GAME_ID="template"
-ENV GAME_NAME=""
-ENV GAME_PARAMS=""
+ENV GAME_NAME="template"
+ENV GAME_PARAMS="template"
 ENV GAME_PORT=27015
 ENV VALIDATE=""
 ENV UMASK=000

README.md

@@ -1,42 +1,40 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install CoreKeeper and run it.
+This Docker will download and install SteamCMD. It will also install Garry's Mod and run it.
 
-**GameID:** Your GameID will be displayed in the log after the server successfully started.
+**Update Notice:** Simply restart the container if a newer version of the game is available.
 
-**Port Forwarding:** You don't have to forward any ports for this game because it uses the Steam Network and the GameID to establish the connection.
-
-Update Notice: Simply restart the container if a newer version of the game is available.
-
-## Example Env params
+## Env params
 | 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: '1963720 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 1963720 |
-| WORLD_NAME | Enter your prefered world name here. | Core Keeper Docker |
-| WORLD_INDEX | Only change when you know what you are doing! | cstrike |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
+| 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: '4020 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 4020 |
+| GAME_NAME | SRCDS gamename | garrysmod |
+| GAME_PARAMS | Values to start the server | -secure +maxplayers 12 +map gm_flatgrass |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
+| GAME_PORT | Port the server will be running on | 27015 |
 | VALIDATE | Validates the game data | true |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
 ## Run example
 ```
-docker run --name CoreKeeper -d \
-	--env 'GAME_ID=1963720' \
-	--env 'WORLD_NAME=Core Keeper Docker' \
-	--env 'WORLD_INDEX=0' \
+docker run --name GarrysMod -d \
+	-p 27015:27015 -p 27015:27015/udp \
+	--env 'GAME_ID=4020' \
+	--env 'GAME_NAME=garrysmod' \
+	--env 'GAME_PORT=27015' \
+	--env 'GAME_PARAMS=-secure +maxplayers 12 +map gm_flatgrass' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/corekeeper:/serverdata/serverfiles \
-	ich777/steamcmd:corekeeper
+	--volume /path/to/garrysmod:/serverdata/serverfiles \
+	ich777/steamcmd:garrysmod
 ```
 
 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-Xvfb.sh

@@ -1,4 +0,0 @@
-until Xvfb :99 -screen 0 1x1x24 -nolisten tcp; do
-    echo "Xvfb server crashed with exit code $?.  Respawning.." >&2
-    sleep 1
-done

scripts/start-server.sh

@@ -51,36 +51,8 @@ else
 fi
 
 echo "---Prepare Server---"
-if [ ! -f ${DATA_DIR}/.steam/sdk64/steamclient.so ]; then
-  if [ ! -d ${DATA_DIR}/.steam/sdk64 ]; then
-    mkdir -p ${DATA_DIR}/.steam/sdk64
-  fi
-  cp -R ${STEAMCMD_DIR}/linux64/* ${DATA_DIR}/.steam/sdk64/
-fi
-echo "---Checking for old display lock files---"
-find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
-echo "---Checking for old logfiles---"
-find ${SERVER_DIR} -name "XvfbLog.*" -exec rm -f {} \; > /dev/null 2>&1
-chmod +x ${SERVER_DIR}/CoreKeeperServer
-if [ -f ${SERVER_DIR}/steamclient.so ]; then
-  rm ${SERVER_DIR}/steamclient.so
-fi
+chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
-echo "---Starting Xvfb server---"
-screen -S Xvfb -L -Logfile ${SERVER_DIR}/XvfbLog.0 -d -m /opt/scripts/start-Xvfb.sh
-sleep 3
 
 echo "---Start Server---"
-export DISPLAY=:99
-cd ${SERVER_DIR}
-if [ -f ${SERVER_DIR}/GameID.txt ]; then
-  rm -f ${SERVER_DIR}/GameID.txt
-fi
-${SERVER_DIR}/CoreKeeperServer -batchmode -logfile ${SERVER_DIR}/CoreKeeperServerLog.txt -world ${WORLD_INDEX} -worldname "${WORLD_NAME}" -datapath "${SERVER_DIR}/Save" ${GAME_PARAMS} 2 >/dev/null &
-sleep 2
-screen -S watchdog -d -m /opt/scripts/start-watchdog.sh
-while [ ! -f ${SERVER_DIR}/GameID.txt ]; do
-        sleep 1
-done
-echo "Server Game ID: $(cat ${SERVER_DIR}/GameID.txt 2>/dev/null)"
-sleep infinity
+${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}

scripts/start-watchdog.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-killpid="$(pidof CoreKeeperServer)"
-while true
-do
-	tail --pid=$killpid -f /dev/null
-	kill $(pidof sleep)
-exit 0
-done

scripts/start.sh

@@ -26,8 +26,8 @@ chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM $(pidof CoreKeeperServer)
-	tail --pid="$(pidof CoreKeeperServer)" -f 2>/dev/null
+	kill -SIGTERM "$killpid"
+	wait "$killpid" -f 2>/dev/null
 	exit 143;
 }