„scripts/start.sh“ ändern

corrected syntax error

Dockerfile

@@ -1,34 +1,37 @@
-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 && \
+	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=27015
+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/ ~/.steam/sdk32
-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 774 /opt/scripts/
+RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start-server.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,30 +1,36 @@
-#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 Squad and run it.
 
-##Env params
-| Name | Value | Default |
+**Update Notice:** Simply restart the container if a newer version of the game is available.
+
+## Env params
+| 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 |
-| GAME_PORT | port the server will be running on | 27015 |
+| 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: '403240 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 403240 |
+| GAME_PARAMS | Values to start the server | Port=7787 QueryPort=27165 |
+| UID | User Identifier | 99 |
+| GID | Group Identifier | 100 |
+| VALIDATE | Validates the game data | blank |
+| USERNAME | Leave blank for anonymous login | blank |
+| PASSWRD | Leave blank for anonymous login | blank |
 
->**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
 ```
-docker run --name csgo-server -d \
-	-p 27015:27015 -p 27015:27015/udp  \
-	--env 'GAME_ID=740' \
-	--env 'GAME_NAME=csgo' \
-	--env 'GAME_PORT=27015' \
-	--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:latest
+docker run --name Squad -d \
+	-p 7787-7788:7787-7788/udp -p 27165-27166:27165-27166/udp -p 21114:21114/udp -p 21114:21114 -p 27166:27166  \
+	--env 'GAME_ID=403240' \
+	--env 'GAME_PARAMS=Port=7787 QueryPort=27165' \
+	--env 'UID=99' \
+	--env 'GID=100' \
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/squad:/serverdata/serverfiles \
+	ich777/steamcmd:squad
 ```
+
+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/Server.cfg

@@ -0,0 +1,22 @@
+ServerName="Squad Docker"
+IsLANMatch=false
+ShouldAdvertise=true
+MaxPlayers=40
+NumReservedSlots=0
+NumPlayersDiffForTeamChanges=3
+AllowTeamChanges=true
+PreventTeamChangeIfUnbalanced=true
+EnforceTeamBalance=true
+RejoinSquadDelayAfterKick=180
+ServerMessageInterval=300
+ServerPassword=Docker
+AutoTkBanTime=1209600
+TKAutoKickEnabled=true	//set to false to disable autokick system, required true for licensed servers.
+RecordDemos=false
+VehicleClaimingDisabled=false
+VehicleKitRequirementDisabled=false
+AllowQA=false
+// Forced on for Licensed servers (Only OWI staff & qa are admins)
+AllowCommunityAdminAccess=false
+// Forced on for Licensed servers (Only OWI devs)
+AllowDevProfiling=false

scripts/start-server.sh

@@ -1,24 +1,79 @@
 #!/bin/bash
 if [ ! -f ${STEAMCMD_DIR}/steamcmd.sh ]; then
-    echo "Steamcmd not found!"
+    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/ ~/.steam/sdk32
 fi
 
-echo "---Update steamcmd---"
-${STEAMCMD_DIR}/steamcmd.sh \
+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---"
-${STEAMCMD_DIR}/steamcmd.sh \
-    +login anonymous \
-    +force_install_dir $SERVER_DIR \
-    +app_update $GAME_ID \
-    +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 grep -rq 'ServerName="Squad Dedicated Server"' ${SERVER_DIR}/SquadGame/ServerConfig/Server.cfg; then
+	echo "---Standard 'Server.cfg' found, downloading custom---"
+	cd ${SERVER_DIR}/SquadGame/ServerConfig
+    if [ -f ${SERVER_DIR}/SquadGame/ServerConfig/Server.cfg ]; then
+    	mv ${SERVER_DIR}/SquadGame/ServerConfig/Server.cfg ${SERVER_DIR}/SquadGame/ServerConfig/Servercfg.bak
+	fi
+    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/squad/config/Server.cfg ; then
+    	echo "---Download of custom 'Server.cfg' successfull---"
+        if [ -f ${SERVER_DIR}/SquadGame/ServerConfig/Servercfg.bak ]; then
+    		rm ${SERVER_DIR}/SquadGame/ServerConfig/Servercfg.bak
+		fi
+    else
+    	echo "-----------------------------------------------------------------------------------------"
+		echo "----Something went wrong can't download 'Server.cfg' falling back to standard config!----"
+		echo "-----------------------------------------------------------------------------------------"
+        if [ -f ${SERVER_DIR}/SquadGame/ServerConfig/Servercfg.bak ]; then
+			mv ${SERVER_DIR}/SquadGame/ServerConfig/Servercfg.bak ${SERVER_DIR}/SquadGame/ServerConfig/Server.cfg
+		fi
+	fi
+fi
+
+chmod -R ${DATA_PERM} ${DATA_DIR}
+echo "---Server ready---"
 
 echo "---Start Server---"
-${SERVER_DIR}/srcds_run -game $GAME_NAME -usercon -console $GAME_PARAMS +ip 0.0.0.0 +port $GAME_PORT +sv_lan 0
+cd ${SERVER_DIR}
+${SERVER_DIR}/SquadGameServer.sh ${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