README.md aktualisiert

ensure group is linked correctly

.github/FUNDING.yml

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

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 lib32stdc++6 lib32z1 && \
+	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_PORT=27015
+ENV GAME_PARAMS="MaxPlayers=60"
+ENV GAME_PARAMS_EXTRA='-QueueThreshold=60 -ServerName="The Front Docker" -port=15636 -BeaconPort=15637 -QueryPort=15638 -UseACE=true'
+ENV PUBLIC_IP="auto"
+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/
+ADD /config/ServerConfig_.ini /opt/ServerConfig_.ini
+RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start-server.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,30 +1,48 @@
-#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 The Front and run it.
 
-##Env params
-| Name | Value | Default |
+Initial server configuration:  
+**Servername:** The Front Docker
+**Password:** Docker  
+
+Your configuration file is located at: .../TheFrontManager/ServerConfig_.ini
+
+**ATTENTION:** First startup can take very long since it downloads the gameserver files and it also installs the runtimes which can take quite some time! 
+
+Update Notice: Simply restart the container if a newer version of the game is available.
+
+## Example Env params for CS:Source
+| 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: '2334200 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 2334200 |
+| GAME_PARAMS | Change if needed (put '?' in between the options if using multiple) | MaxPlayers=60 |
+| GAME_PARAMS_EXTRA | Change if needed (specify your extra game parameters here like: Servername, Password, Ports,...) | -QueueThreshold=60 -port=15636 -BeaconPort=15637 -QueryPort=15638 -UseACE=true |
+| PUBLIC_IP | Set your public IP here (if set to 'auto' the container will try to obtain the public IP automatically) | auto |
+| 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 TheFront -d \
+	-p 15636-15638:15636-15638/udp \
+	--env 'GAME_ID=232330' \
+	--env 'GAME_PARAMS=MaxPlayers=60' \
+	--env 'GAME_PARAMS_EXTRA=-QueueThreshold=60 -port=15636 -BeaconPort=15637 -QueryPort=15638 -UseACE=true' \
+	--env 'PUBLIC_IP=auto' \
+	--env 'UID=99' \
+	--env 'GID=100' \
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/thefront:/serverdata/serverfiles \
+	ich777/steamcmd:thefront
 ```
+
+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/ServerConfig_.ini

@@ -0,0 +1,123 @@
+[BaseServerConfig]
+ServerName=The Front Docker
+ServerPassword=Docker
+QueueThreshold=40
+ServerFightModeType=1
+IsCanSelfDamage=0
+IsCanFriendDamage=0
+ClearSeverTime=2099-12-31
+UseSteamSocket=0
+Port=15636
+BeaconPort=15637
+QueryPort=15638
+ShutDownServicePort=15639
+SaveWorldInterval=300
+GMOverlapRatio=1
+IsUnLockAllTalentAndRecipe=0
+GMBagInitGirdNum=40
+GreenHand=1
+CharacterInitItem=
+GMDeathDropMode=1
+GMDeathInventoryLifeSpan=1800
+CorpsePickAuthority=2
+GMCanDropItem=1
+GMCanDiscardItem=1
+GMDiscardBoxLifeSpan=300
+GMRebirthBaseCD=10
+GMRebirthExtraCD=1
+GMPenaltiesMaxNum=5
+GMPenaltiesCD=600
+ConstructEnableRot=1
+GMAttackCityCdRatio=1
+OpenAllHouseFlag=0
+IsCanChat=1
+IsShowBlood=1
+SensitiveWords=1
+HealthDyingState=1
+UseACE=1
+ServerAdminAccounts=76561197963117432
+IsShowGmTitle=0
+PlayerHotDefAddRate=1
+PlayerIceDefAddRate=1
+HeadNameDisplayDist_Team=200
+HeadNameDisplayDist_Enemy=20
+PlayerDeathAvatarItemDurableRate=0
+PlayerDeatShortcutItemDurableRate=0
+GMCraftTimeRate=1
+PlayerAddExpRate=2
+PlayerKillAddExpRate=2
+PlayerFarmAddExpRate=1
+PlayerCraftAddExpRate=1
+MoveSpeedRate=1
+JumpRate=1
+PlayerLandedDamageRate=1
+PlayerMaxHealthRate=1
+HealthRecoverRate=1
+PlayerMaxStaminaRate=1
+StaminaRecoverRate=1
+PlayerStaminaCostRate=1
+PlayerMaxHungerRate=1
+GMHungerDecRatio=1
+GMBodyHungerAddRate=1
+MaxBodyWaterRate=1
+GMWaterDecRatio=1
+GMBodyWaterAddRate=1
+MaxBreathRate=1
+BreathRecoverRate=1
+PlayerBreathCostRate=1
+GMPlayerHealthRate=1
+GMFoodDragDurationRate=1
+NpcRespawnRatio=1
+AnimalBodyStayTime=300
+HumanBodyStayTime=10
+GMNPCLootableItemRatio=1
+NpcSpawnLevelRatio=1
+WildNPCDamageRate=1
+WildNPCHealthRate=1
+WildNPCSpeedRate=1
+CityNPCLevelRate=1
+CityNPCDamageRate=1
+CityNPCHealthRate=1
+CityNPCSpeedRate=1
+CityNPCNumRate=1
+NpcDisplayDistance=50
+GMInventoryGainRate=1
+GMCityATKNPCLootItemRatio=1
+GMMaxHouseFlagNumber=1
+GMSetGJConstructMaxNumRatio=1
+GMHFTrapMaxNum=0
+GMHFTurretMaxNum=0
+GMConstructDefenseRatio=1
+GMTrapDefenseRatio=1
+GMTurretDefenseRatio=1
+GMTrapDamageRatio=1
+GMTurretDamageRatio=1
+GMConstructMaxHealthRatio=1
+GMConstructReturnHPRatio=1
+GMHouseFlagRepairHealthRatio=1
+GMTTC_Oil_Rate=1
+GMWaterCollecter_Rate=1
+GMTTC_Ore_Rate=1
+GMTTC_Fish_Rate=1
+CHFDamagedByPlayer=1
+CHFDamagedByVehicle=1
+CHFDamagedByNpc=1
+GMHouseFlagExcitantTime=3
+GMMaxRetrieveProductsRate=-1
+GMTreeGainRate=1
+GMBushGainRate=1
+GMOreGainRate=1
+GMCropVegetableReapRatio=1
+GMFleshGainRate=1
+GMCropVegetableGrowRatio=1
+GMMeleeNpcDamageRatio=1
+GMRangedNpcDamageRatio=1
+GMMeleePlayerDamageRatio=1
+GMRangedPlayerDamageRatio=1
+GMMeleeConstructDamageRatio=1
+GMRangedConstructDamageRatio=1
+GMToolDamageRate=1
+GMDurabilityCostRatio=1
+GMVehiclePlayerDamageRatio=1
+GMVehicleConstructDamageRatio=1
+GMVehicleDamageRate=1

scripts/start-server.sh

@@ -1,24 +1,90 @@
 #!/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
-    
-echo "---Update server---"
-${STEAMCMD_DIR}/steamcmd.sh \
-    +login anonymous \
-    +force_install_dir $SERVER_DIR \
-    +app_update $GAME_ID \
+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 \
+        +@sSteamCmdForcePlatformType windows \
+        +force_install_dir ${SERVER_DIR} \
+        +login anonymous \
+        +app_update ${GAME_ID} validate \
+        +quit
+    else
+        ${STEAMCMD_DIR}/steamcmd.sh \
+        +@sSteamCmdForcePlatformType windows \
+        +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 \
+        +@sSteamCmdForcePlatformType windows \
+        +force_install_dir ${SERVER_DIR} \
+        +login ${USERNAME} ${PASSWRD} \
+        +app_update ${GAME_ID} validate \
+        +quit
+    else
+        ${STEAMCMD_DIR}/steamcmd.sh \
+        +@sSteamCmdForcePlatformType windows \
+        +force_install_dir ${SERVER_DIR} \
+        +login ${USERNAME} ${PASSWRD} \
+        +app_update ${GAME_ID} \
+        +quit
+    fi
+fi
+
+if [ "${PUBLIC_IP}" == "auto" ]; then
+  echo "---Trying to obtain public IP address automatically---"
+  PUBLIC_IP="$(wget -qO - ipv4.icanhazip.com)"
+  if [ -z "${PUBLIC_IP}" ]; then
+    echo "---Can't get public IP, please specify your public IP manually in the variable PUBLIC_IP---"
+    echo "---Putting container into sleep mode!---"
+    sleep infinity
+  else
+    echo "---Success, got Public IP: ${PUBLIC_IP}---"
+  fi
+else
+  echo "---Manually set Public IP: ${PUBLIC_IP}---"
+fi
+
+echo "---Prepare Server---"
+echo "---Checking if config is in place---"
+if [ ! -f ${SERVER_DIR}/TheFrontManager/ServerConfig_.ini ]; then
+  echo "---No config file found, copying default config!---"
+  mkdir -p ${SERVER_DIR}/TheFrontManager
+  cp /opt/ServerConfig_.ini ${SERVER_DIR}/TheFrontManager/ServerConfig_.ini
+else
+  echo "---Config file found!"
+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
+if [ ! -f ${SERVER_DIR}/ProjectWar/Binaries/Linux/TheFrontServer ]; then
+  echo "---Something went wrong, can't find the executable, putting container into sleep mode!---"
+  sleep infinity
+else
+  ${SERVER_DIR}/ProjectWar/Binaries/Linux/TheFrontServer ProjectWar_Start?DedicatedServer?${GAME_PARAMS} -server -game ${GAME_PARAMS_EXTRA} -log -OUTIPAddress=${PUBLIC_IP}
+fi

scripts/start.sh

@@ -0,0 +1,42 @@
+#!/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 /opt/ServerConfig_.ini
+chmod -R 750 /opt/scripts /opt/ServerConfig_.ini
+chown -R ${UID}:${GID} ${DATA_DIR}
+
+echo "---Starting...---"
+term_handler() {
+	kill -SIGINT $(pidof TheFrontServer)
+	tail --pid=$(pidof TheFrontServer) -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