scripts/start-server.sh aktualisiert

geändert:       README.md
	geändert:       scripts/start-server.sh

Dockerfile

@@ -1,10 +1,10 @@
-FROM ich777/winehq-baseimage
+FROM ich777/debian-baseimage
 
 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 lib32gcc-s1 winbind xvfb screen && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 libsqlite3-0 libgdiplus unzip && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV DATA_DIR="/serverdata"
@@ -13,7 +13,15 @@ ENV SERVER_DIR="${DATA_DIR}/serverfiles"
 ENV GAME_ID="template"
 ENV GAME_NAME="template"
 ENV GAME_PARAMS="template"
-ENV GAME_PORT=27015
+ENV GAME_PORT=28015
+ENV QUERY_PORT=28016
+ENV RCON_PORT=28017
+ENV APP_PORT=28018
+ENV SERVER_NAME="RustDocker"
+ENV SERVER_DISCRIPTION="Simple Unraid Rust Docker"
+ENV OXIDE_MOD="false"
+ENV CARBON_MOD="false"
+ENV FORCE_OXIDE_INSTALLATION="true"
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99
@@ -34,4 +42,4 @@ ADD /scripts/ /opt/scripts/
 RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,10 +1,5 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install The Forest and run it.
-
-**SERVERNAME:** 'The Forest Docker' **SERVERPASSWORD:** 'Docker' **ADMINPASSWORD:** 'adminDocker' (you can change this in your SERVERFOLDER/config/config.cfg)
-
-**WARNING:** You have to create a Steam Token to play Online.
-Create your token here: https://steamcommunity.com/dev/managegameservers (please note that you must generate the token for the APPID: '242760' and every gameserver needs it's own token!!!). After creating your token you have to go to the file .../theforest/config/config.txt and append your token to the line that starts with: serverSteamAccount (eg: serverSteamAccount YOURTOKEN).  
+This Docker will download and install SteamCMD. It will also install RUST and run it.
 
 **Update Notice:** Simply restart the container if a newer version of the game is available.
 
@@ -13,28 +8,37 @@ Create your token here: https://steamcommunity.com/dev/managegameservers (please
 | --- | --- | --- |
 | 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: '556450 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 556450 |
-| GAME_PARAMS | Values to start the server | empty |
+| GAME_ID | The GAME_ID that the container downloads at startup. If you want to use a beta version of the game enter this: '258550 -beta staging' or '258550 -beta prerelease' (without quotes). | 258550 |
+| GAME_PARAMS | Enter here your extra game startup parameters if needed starting with (eg: '+rcon.port 27016 +rcon.password YOURPASSWORD' don't forget to add also a new port mapping with container and host port set to the corresponding RCON port) | +server.maxplayers 10 |
+| SERVER_NAME | Name of the Server goes here | RustDockerServer |
+| SERVER_DISCRIPTION | Server Description goes here | Simple Unraid Rust Docker Server |
+| OXIDE_MOD | Set to 'true' (without quotes) to enable Oxide Mod, otherwise leave empty (the container will check on every start/restart if there is a newer version available). | false |
+| CARBON_MOD | Set to 'true' (without quotes) to enable Carbon Mod, otherwise leave empty (the container will check on every start/restart if there is a newer version available). | false |
+| GAME_PORT | Game port on which the server is running (has to match the port mapping in your container). | 28015 |
 | UID | User Identifier | 99 |
 | GID | Group Identifier | 100 |
-| GAME_PORT | Port the server will be running on | 27015 |
-| VALIDATE | Validates the game data | blank |
+| VALIDATE | Validates the game data | false |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
 ## Run example
 ```
-docker run --name TheForest -d \
-	-p 8766:8766/udp -p 27015:27015/udp -p 27016:27016/udp \
+docker run --name RUST -d \
+	-p 28015:28015/udp \
+	--env 'GAME_ID=258550' \
+	--env 'SERVER_NAME=RustDockerServer' \
+	--env 'SERVER_DISCRIPTION=Simple Unraid Rust Docker Server' \
+	--env 'GAME_PARAMS=+server.maxplayers 10' \
+	--env 'GAME_PORT=28015' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/theforest:/serverdata/serverfiles \
-	ich777/steamcmd:theforest
+	--volume /path/to/rust:/serverdata/serverfiles \
+	ich777/steamcmd:rust
 ```
 
 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/

config/config.cfg

@@ -1,55 +0,0 @@
-// Dedicated Server Settings.
-// Server IP address - Note: If you have a router, this address is the internal address, and you need to configure ports forwarding
-serverIP 0.0.0.0
-// Steam Communication Port - Note: If you have a router you will need to open this port.
-serverSteamPort 8766
-// Game Communication Port - Note: If you have a router you will need to open this port.
-serverGamePort 27015
-// Query Communication Port - Note: If you have a router you will need to open this port.
-serverQueryPort 27016
-// Server display name
-serverName The Forest Docker
-// Maximum number of players
-serverPlayers 4
-// Enable VAC (Valve Anti-cheat System at the server. Must be set off or on
-enableVAC off
-// Server password. blank means no password
-serverPassword Docker
-// Server administration password. blank means no password
-serverPasswordAdmin adminDocker
-// Your Steam account name. blank means anonymous
-serverSteamAccount 
-// Time between server auto saves in minutes - The minumum time is 15 minutes, the default time is 30
-serverAutoSaveInterval 30
-// Game difficulty mode. Must be set to Peaceful Normal or Hard
-difficulty Normal
-// New or continue a game. Must be set to New or Continue
-initType Continue
-// Slot to save the game. Must be set 1 2 3 4 or 5
-slot 1
-// Show event log. Must be set off or on
-showLogs off
-// Contact email for server admin
-serverContact email@gmail.com
-// No enemies
-veganMode off
-// No enemies during day time
-vegetarianMode off
-// Reset all structure holes when loading a save
-resetHolesMode off
-// Regrow 10% of cut down trees when sleeping
-treeRegrowMode off
-// Allow building destruction
-allowBuildingDestruction on
-// Allow enemies in creative games
-allowEnemiesCreativeMode off
-// Allow clients to use the built in debug console
-allowCheats off
-// Use full weapon damage values when attacking other players
-realisticPlayerDamage off
-// Allows defining a custom folder for save slots, leave empty to use the default location
-saveFolderPath
-// Target FPS when no client is connected
-targetFpsIdle 5
-// Target FPS when there is at least one client connected
-targetFpsActive 60

scripts/start-server.sh

@@ -22,14 +22,12 @@ 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} \
@@ -39,14 +37,12 @@ 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} \
@@ -54,50 +50,116 @@ else
     fi
 fi
 
-echo "---Prepare Server---"
-export WINEARCH=win64
-export WINEPREFIX=/serverdata/serverfiles/WINE64
-echo "---Checking for 'saves' directory---"
-if [ ! -d ${SERVER_DIR}/saves ]; then
-	echo "---'saves' not found creating---"
-    mkdir ${SERVER_DIR}/saves
+if [ "${OXIDE_MOD}" == "true" ] && [ "${CARBON_MOD}" == "true" ]; then
+  echo "---Oxide and Carbon mod enabled, you can only enable one at a time, putting container into sleep mode.--"
+  sleep infinity
 fi
-echo "---Directory 'saves' found!---"
-echo "---Checking for 'config.cfg'---"
-if [ ! -f ${SERVER_DIR}/config/config.cfg ]; then
-	echo "---'config.cfg' not found downloading---"
-    if [ ! -d ${SERVER_DIR}/config ]; then
-    	mkdir ${SERVER_DIR}/config
+
+if [ "${OXIDE_MOD}" == "true" ]; then
+  echo "---Oxide Mod enabled!---"
+  CUR_V="$(find ${SERVER_DIR} -maxdepth 1 -name "OxideMod-*.zip" | cut -d '-' -f2)"
+  LAT_V="$(wget -qO- https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | grep tag_name | cut -d '"' -f4)"
+
+  if [ -z ${LAT_V} ]; then
+    if [ -z ${CUR_V%.*} ]; then
+      echo "---Can't get latest Oxide Mod version and found no installed version, putting server into sleep mode!---"
+      sleep infinity
+    else
+      echo "---Can_t get latest Oxide Mod version, falling back to installed v${CUR_V%.*}!---"
+      LAT_V="${CUR_V%.*}"
     fi
-    cd ${SERVER_DIR}/config
-    if wget -q -nc --show-progress --progress=bar:force:noscroll https://raw.githubusercontent.com/ich777/docker-steamcmd-server/theforest/config/config.cfg ; then
-		echo "---Successfully downloaded 'config.cfg'---"
-	else
-		echo "---Something went wrong, can't download 'config.cfg', putting server in sleep mode---"
-		sleep infinity
-	fi
-fi
-echo "---Checking if WINE workdirectory is present---"
-if [ ! -d ${SERVER_DIR}/WINE64 ]; then
-	echo "---WINE workdirectory not found, creating please wait...---"
-    mkdir ${SERVER_DIR}/WINE64
-else
-	echo "---WINE workdirectory found---"
-fi
-echo "---Checking if WINE is properly installed---"
-if [ ! -d ${SERVER_DIR}/WINE64/drive_c/windows ]; then
-	echo "---Setting up WINE---"
+  fi
+
+  if [ -z "${CUR_V%.}" ]; then
+    echo "---Oxide Mod not found, downloading!---"
+    rm -f ${SERVER_DIR}/OxideMod-*.zip
     cd ${SERVER_DIR}
-    winecfg > /dev/null 2>&1
-    sleep 15
-else
-	echo "---WINE properly set up---"
+    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/OxideMod-${LAT_V}.zip "https://github.com/OxideMod/Oxide.Rust/releases/download/${LAT_V}/Oxide.Rust-linux.zip" ; then
+        echo "---Successfully downloaded Oxide Mode v${LAT_V}!---"
+    else
+        echo "---Something went wrong, can't download Oxide Mod v${LAT_V}, putting server in sleep mode---"
+        sleep infinity
+    fi
+    unzip -o ${SERVER_DIR}/OxideMod-${LAT_V}.zip -d ${SERVER_DIR}
+  elif [ "${LAT_V}" != "${CUR_V%.*}" ]; then
+    cd ${SERVER_DIR}
+    rm -rf ${SERVER_DIR}/OxideMod-*.zip
+    echo "---Newer version of Oxide Mod v${LAT_V} found, currently installed: v${CUR_V%.*}---"
+    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/OxideMod-${LAT_V}.zip "https://github.com/OxideMod/Oxide.Rust/releases/download/${LAT_V}/Oxide.Rust-linux.zip" ; then
+        echo "---Successfully downloaded Oxide Mod v${LAT_V}!---"
+    else
+        echo "---Something went wrong, can't download Oxide Mod v${LAT_V}, putting server in sleep mode---"
+        sleep infinity
+    fi
+    unzip -o ${SERVER_DIR}/OxideMod-${LAT_V}.zip -d ${SERVER_DIR}
+  elif [ "$LAT_V" == "${CUR_V%.*}" ]; then
+    echo "---Oxide Mod v${CUR_V%.*} is Up-To-Date!---"
+  fi
+
+  if [ "${FORCE_OXIDE_INSTALLATION}" == "true" ]; then
+    unzip -o ${SERVER_DIR}/OxideMod-${LAT_V}.zip -d ${SERVER_DIR}
+  fi
 fi
-echo "---Checking for old display lock files---"
-find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
+
+if [ "${CARBON_MOD}" == "true" ]; then
+  echo "---Carbon Mod enabled!---"
+  CUR_V="$(find ${SERVER_DIR} -maxdepth 1 -name "CarbonMod-*.tar.gz" | cut -d '-' -f2)"
+  LAT_V="$(wget -qO- https://api.github.com/repos/CarbonCommunity/Carbon/releases/latest | grep tag_name | cut -d '"' -f4)"
+
+  if [ -z ${LAT_V} ]; then
+    if [ -z ${CUR_V%.tar.gz} ]; then
+      echo "---Can't get latest Carbon Mod version and found no installed version, putting server into sleep mode!---"
+      sleep infinity
+    else
+      echo "---Can_t get latest Carbon Mod version, falling back to installed v${CUR_V%.tar.gz}!---"
+      LAT_V="${CUR_V%.tar.gz}"
+    fi
+  fi
+
+  if [ -z "${CUR_V%.tar.gz}" ]; then
+    echo "---Carbon Mod not found, downloading!---"
+    rm -f ${SERVER_DIR}/CarbonMod-*.tar.gz
+    cd ${SERVER_DIR}
+    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz "https://github.com/CarbonCommunity/Carbon/releases/download/${LAT_V}/Carbon.Linux.Release.tar.gz" ; then
+        echo "---Successfully downloaded Carbon Mode ${LAT_V}!---"
+    else
+        echo "---Something went wrong, can't download Carbon Mod ${LAT_V}, putting server in sleep mode---"
+        sleep infinity
+    fi
+    tar -xvf ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz -C ${SERVER_DIR}
+    #unzip -o ${SERVER_DIR}/CarbonMod-${LAT_V}.zip -d ${SERVER_DIR}
+  elif [ "${LAT_V}" != "${CUR_V%.tar.gz}" ]; then
+    cd ${SERVER_DIR}
+    rm -rf ${SERVER_DIR}/CarbonMod-*.tar.gz
+    echo "---Newer version of Carbon Mod ${LAT_V} found, currently installed: v${CUR_V%.tar.gz}---"
+    if wget -q -nc --show-progress --progress=bar:force:noscroll -O ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz "https://github.com/CarbonCommunity/Carbon/releases/download/${LAT_V}/Carbon.Linux.Release.tar.gz" ; then
+        echo "---Successfully downloaded Carbon Mod ${LAT_V}!---"
+    else
+        echo "---Something went wrong, can't download Carbon Mod ${LAT_V}, putting server in sleep mode---"
+        sleep infinity
+    fi
+    tar -xvf ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz ${SERVER_DIR}
+  elif [ "$LAT_V" == "${CUR_V%.tar.gz}" ]; then
+    echo "---Carbon Mod ${CUR_V%.tar.gz} is Up-To-Date!---"
+  fi
+
+  if [ "${FORCE_CARBON_INSTALLATION}" == "true" ]; then
+    tar -xvf ${SERVER_DIR}/CarbonMod-${LAT_V}.tar.gz -C ${SERVER_DIR}
+  fi
+  source "${SERVER_DIR}/carbon/tools/environment.sh"
+fi
+
+echo "---Prepare Server---"
 chmod -R ${DATA_PERM} ${DATA_DIR}
+echo "---Setting Library path---"
+export LD_LIBRARY_PATH=:/bin/RustDedicated_Data/Plugins/x86_64
 echo "---Server ready---"
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 ${SERVER_DIR}/TheForestDedicatedServer.exe -batchmode -dedicated -savefolderpath "${SERVER_DIR}/saves/" -configfilepath "${SERVER_DIR}/config/config.cfg" ${GAME_PARAMS}
+if [ ! -f ${SERVER_DIR}/RustDedicated ]; then
+  echo "---Can't find game executable, putting server into sleep mode!---"
+  sleep infinity
+else
+  ${SERVER_DIR}/RustDedicated -batchmode -server.port ${GAME_PORT} -server.queryport ${QUERY_PORT} -rcon.port ${RCON_PORT} -app.port ${APP_PORT} -server.hostname "${SERVER_NAME}" -server.description "${SERVER_DISCRIPTION}" ${GAME_PARAMS}
+fi

scripts/start.sh

@@ -26,8 +26,9 @@ chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGINT $(pgrep TheForestDedica)
-	tail --pid=$(pgrep TheForestDedica) -f 2>/dev/null
+	kill -SIGINT $(pidof RustDedicated)
+	tail --pid=$(pidof RustDedicated) -f 2>/dev/null
+	sleep 0.5
 	exit 143;
 }