Dockerfile aktualisiert

corrected syntax error

Dockerfile

@@ -1,38 +1,39 @@
-FROM ubuntu
+FROM ich777/debian-baseimage
 
-MAINTAINER Mattie
+LABEL org.opencontainers.image.authors="admin@minenet.at"
+LABEL org.opencontainers.image.source="https://github.com/ich777/docker-steamcmd-server"
 
-RUN dpkg --add-architecture i386
-RUN apt-get update
-RUN apt-get -y install libstdc++6:i386
-RUN apt-get -y install wget
+RUN apt-get update && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 libcurl4 libfontconfig1 libpangocairo-1.0-0 libnss3 libgconf-2-4 libxi6 libxcursor1 libxss1 libxcomposite1 libasound2 libxdamage1 libxtst6 libatk1.0-0 libxrandr2 iputils-ping libcurl3-gnutls && \
+	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
 ENV STEAMCMD_DIR="${DATA_DIR}/steamcmd"
 ENV SERVER_DIR="${DATA_DIR}/serverfiles"
-ENV GAME_ID="740"
-ENV GAME_NAME="csgo"
-ENV GAME_PARAMS="+game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2"
+ENV GAME_ID="template"
+ENV GAME_NAME="template"
+ENV GAME_PARAMS="template"
+ENV GAME_PORT=7777
+ENV QUERY_PORT=27015
+ENV BEACON_PORT=15000
+ENV VALIDATE=""
+ENV UMASK=000
+ENV UID=99
+ENV GID=100
+ENV USERNAME=""
+ENV PASSWRD=""
+ENV USER="steam"
+ENV DATA_PERM=770
 
-RUN mkdir $DATA_DIR
-RUN mkdir $STEAMCMD_DIR
-RUN mkdir $SERVER_DIR
-RUN mkdir -p ~/.steam/sdk32
-
-RUN 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 \
-  &&  chmod -R 774 ${STEAMCMD_DIR} ${STEAMCMD_DIR}/linux32 $SERVER_DIR \
-  &&  ln -s ${STEAMCMD_DIR}/linux32/steamclient.so ~/.steam/sdk32/steamclient.so
-RUN ulimit -n 2048
-
-EXPOSE 27015
-EXPOSE 27015/udp
-EXPOSE 27020/udp
-EXPOSE 27005/udp
+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 774 /opt/scripts/
+RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start-csgo.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,28 +1,39 @@
-#Steamcmd in docker
-This dockerfill will download/install steamcmd.
-It will also install the server you want(like csgo,tf2,ins ...)
+# 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.
 
 ## Env params
-| Name | Value | Default |
+| Name | Value | Example |
 | --- | --- | --- |
-| DATA_DIR | main folder | /serverdata |
-| STEAMCMD_DIR | folder for steamcmd | /serverdata/steamcmd |
-| SERVER_DIR | folder for gamefile | /serverdata/serverfiles |
-| GAME_ID | steamid for server | 740 |
-| GAME_NAME | srcds gamename | csgo |
-| GAME_PARAMS | values to start the server | +game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2 |
-
->**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
+| 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: '629800 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 629800 |
+| GAME_PARAMS | Values to start the server | empty |
+| UID | User Identifier | 99 |
+| GID | Group Identifier | 100 |
+| GAME_PORT | Port the server will be running on | 7777 |
+| QUERY_PORT | UDP Queryport | 27015 |
+| BEACON_PORT | UDP Beaconport | 15000 |
+| VALIDATE | Validates the game data | blank |
+| USERNAME | Leave blank for anonymous login | blank |
+| PASSWRD | Leave blank for anonymous login | blank |
 
 ## Run example
 ```
-docker run --name csgo-server -d \
-	-p 27015:27015 -p 27015:27015/udp -p 27020:27020/udp -p 27005:27005/udp \
-	--env 'GAME_ID=740' \
-	--env 'GAME_NAME=csgo' \
-	--env 'GAME_PARAMS=+game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2' \
-	--volume /share/CACHEDEV1_DATA/Public/VM/Docker/CSGO:/serverdata \
-	mattie/docker-steamcmd-server:stable
+docker run --name Mordhau -d \
+	-p 7777:7777/udp -p 27015:27015/udp -p 15000:15000/udp \
+	--env 'GAME_ID=629800' \
+	--env 'GAME_PORT=7777' \
+	--env 'QUERY_PORT=27015' \
+	--env 'BEACON_PORT=15000' \
+	--env 'UID=99' \
+	--env 'GID=100' \
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/mordhau:/serverdata/serverfiles \
+	ich777/steamcmd:mordhau
 ```
+
+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/

config/Game2.ini

@@ -0,0 +1,35 @@
+[/Script/Mordhau.MordhauGameMode]
+PlayerRespawnTime=5.000000
+BallistaRespawnTime=30.000000
+CatapultRespawnTime=30.000000
+HorseRespawnTime=30.000000
+DamageFactor=1.000000
+TeamDamageFactor=0.500000
+MapRotation=FFA_ThePit
+MapRotation=TDM_Camp
+MapRotation=SKM_Grad
+MapRotation=FFA_Contraband
+MapRotation=TDM_Tourney
+MapRotation=SKM_MountainPeak
+MapRotation=FFA_Taiga
+MapRotation=TDM_ThePit
+MapRotation=SKM_Camp
+MapRotation=FFA_Grad
+MapRotation=TDM_Contraband
+MapRotation=SKM_Tourney
+MapRotation=FFA_MountainPeak
+MapRotation=TDM_Taiga
+MapRotation=SKM_ThePit
+MapRotation=FFA_Camp
+MapRotation=TDM_Grad
+MapRotation=SKM_Contraband
+MapRotation=FFA_Tourney
+MapRotation=TDM_MountainPeak
+MapRotation=SKM_Taiga
+
+[/Script/Mordhau.MordhauGameSession]
+MaxSlots=16
+ServerName=MordhauDocker
+ServerPassword=Docker
+AdminPassword=adminDocker
+BannedPlayers=()

scripts/start-csgo.sh

@@ -1,24 +0,0 @@
-#!/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
-    chmod -R 774 ${STEAMCMD_DIR}/steamcmd.sh ${STEAMCMD_DIR}/linux32/steamcmd
-    ln -s ${STEAMCMD_DIR}/linux32/steamclient.so ~/.steam/sdk32/steamclient.so
-fi
-
-echo "---Update steamcmd---"
-${STEAMCMD_DIR}/steamcmd.sh \
-    +login anonymous \
-    +quit
-    
-echo "---Update server---"
-${STEAMCMD_DIR}/steamcmd.sh \
-    +login anonymous \
-    +force_install_dir $SERVER_DIR \
-    +app_update $GAME_ID \
-    +quit
-    
-echo "---Start Server---"
-${SERVER_DIR}/srcds_run -game $GAME_NAME -usercon -console $GAME_PARAMS +ip 0.0.0.0 +port 27015 +sv_lan 0

scripts/start-server.sh

@@ -0,0 +1,81 @@
+#!/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
+fi
+
+echo "---Update SteamCMD---"
+if [ "${USERNAME}" == "" ]; then
+    ${STEAMCMD_DIR}/steamcmd.sh \
+    +login anonymous \
+    +quit
+else
+    ${STEAMCMD_DIR}/steamcmd.sh \
+    +login ${USERNAME} ${PASSWRD} \
+    +quit
+fi
+
+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
+
+echo "---Prepare Server---"
+echo "---Checking for 'Game2.ini'---"
+if [ ! -f ${SERVER_DIR}/Mordhau/Saved/Config/LinuxServer/Game2.ini ]; then
+	echo "---'Game2.ini' not found, downloading---"
+    if [ ! -d ${SERVER_DIR}/Mordhau/Saved ]; then
+    	mkdir ${SERVER_DIR}/Mordhau/Saved
+    fi
+    if [ ! -d ${SERVER_DIR}/Mordhau/Saved/Config ]; then
+    	mkdir ${SERVER_DIR}/Mordhau/Saved/Config
+    fi
+    if [ ! -d ${SERVER_DIR}/Mordhau/Saved/Config/LinuxServer ]; then
+    	mkdir ${SERVER_DIR}/Mordhau/Saved/Config/LinuxServer
+    fi
+    cd ${SERVER_DIR}/Mordhau/Saved/Config/LinuxServer
+    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/mordhau/config/Game2.ini ; then
+    	echo "---Successfully downloaded 'Game2.ini'---"
+	else
+    	echo "---Can't download 'Game2.ini' putting server into sleep mode---"
+        sleep infinity
+    fi
+else
+	echo "---'Game2.ini' found!---"
+fi
+chmod -R ${DATA_PERM} ${DATA_DIR}
+echo "---Server ready---"
+
+echo "---Start Server---"
+cd ${SERVER_DIR}
+${SERVER_DIR}/MordhauServer.sh -Port=${GAME_PORT} -QueryPort=${QUERY_PORT} -Beaconport=${BEACON_PORT} -GAMEINI=${SERVER_DIR}/Mordhau/Saved/Config/LinuxServer/Game2.ini -ENGINEINI=${SERVER_DIR}/Mordhau/Saved/Config/LinuxServer/Engine2.ini ${GAME_PARAMS}

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