scripts/start-server.sh aktualisiert

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

Dockerfile

@@ -1,20 +1,27 @@
-FROM ich777/debian-baseimage:bullseye_amd64
+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 --no-install-recommends lib32gcc-s1 libc6-i386 lib32stdc++6 && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 libsqlite3-0 libgdiplus unzip && \
 	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="template"
-ENV GAME_MOD="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
@@ -35,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,5 +1,5 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Counter-Strike Condition Zero and run it.
+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.
 
@@ -8,35 +8,37 @@ This Docker will download and install SteamCMD. It will also install Counter-Str
 | --- | --- | --- |
 | 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: '90 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 90 +app_set_config '90 mod dmc' |
+| 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_MOD | SteamID for server | 90 mod czero |
+| 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 |
-| GAME_NAME | SRCDS gamename | czero |
+| SERVER_NAME | Name of the Server goes here | RustDockerServer |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map as_oilrig |
+| 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 | false |
-| 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 CStrikeConditionZero -d \
+docker run --name RUST -d \
-	-p 27015:27015 -p 27015:27015/udp \
+	-p 28015:28015/udp \
-	--env 'GAME_ID=90 +app_set_config '90 mod dmc'' \
+	--env 'GAME_ID=258550' \
-	--env 'GAME_MOD=90 mod czero' \
+	--env 'SERVER_NAME=RustDockerServer' \
-	--env 'GAME_NAME=czero' \
+	--env 'SERVER_DISCRIPTION=Simple Unraid Rust Docker Server' \
-	--env 'GAME_PORT=27015' \
+	--env 'GAME_PARAMS=+server.maxplayers 10' \
-	--env 'GAME_PARAMS=-secure +maxplayers 32 +map as_oilrig' \
+	--env 'GAME_PORT=28015' \
 	--env 'UID=99' \
 	--env 'GID=100' \
 	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/cstrikeczero:/serverdata/serverfiles \
+	--volume /path/to/rust:/serverdata/serverfiles \
-	ich777/steamcmd:cstrikeczero
+	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/

scripts/start-server.sh

@@ -24,14 +24,12 @@ if [ "${USERNAME}" == "" ]; then
         ${STEAMCMD_DIR}/steamcmd.sh \
         +force_install_dir ${SERVER_DIR} \
         +login anonymous \
-        +app_set_config ${GAME_MOD} \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
         +force_install_dir ${SERVER_DIR} \
         +login anonymous \
-        +app_set_config ${GAME_MOD} \
         +app_update ${GAME_ID} \
         +quit
     fi
@@ -41,47 +39,127 @@ else
         ${STEAMCMD_DIR}/steamcmd.sh \
         +force_install_dir ${SERVER_DIR} \
         +login ${USERNAME} ${PASSWRD} \
-        +app_set_config ${GAME_MOD} \
         +app_update ${GAME_ID} validate \
         +quit
     else
         ${STEAMCMD_DIR}/steamcmd.sh \
         +force_install_dir ${SERVER_DIR} \
         +login ${USERNAME} ${PASSWRD} \
-        +app_set_config ${GAME_MOD} \
         +app_update ${GAME_ID} \
         +quit
     fi
 fi
 
-echo "---Checking if everything is installed correctly---"
+if [ "${OXIDE_MOD}" == "true" ] && [ "${CARBON_MOD}" == "true" ]; then
-if [ ! -d ${SERVER_DIR}/czero ]; then
+  echo "---Oxide and Carbon mod enabled, you can only enable one at a time, putting container into sleep mode.--"
-    echo "---Not everything is installed correctly, trying again---"
+  sleep infinity
-    if [ "${USERNAME}" == "" ]; then
+fi
-        ${STEAMCMD_DIR}/steamcmd.sh \
+
-        +force_install_dir ${SERVER_DIR} \
+if [ "${OXIDE_MOD}" == "true" ]; then
-        +login anonymous \
+  echo "---Oxide Mod enabled!---"
-        +app_set_config ${GAME_MOD} \
+  CUR_V="$(find ${SERVER_DIR} -maxdepth 1 -name "OxideMod-*.zip" | cut -d '-' -f2)"
-        +app_update ${GAME_ID} validate \
+  LAT_V="$(wget -qO- https://api.github.com/repos/OxideMod/Oxide.Rust/releases/latest | grep tag_name | cut -d '"' -f4)"
-        +quit
+
+  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
-        ${STEAMCMD_DIR}/steamcmd.sh \
+      echo "---Can_t get latest Oxide Mod version, falling back to installed v${CUR_V%.*}!---"
-        +force_install_dir ${SERVER_DIR} \
+      LAT_V="${CUR_V%.*}"
-        +login ${USERNAME} ${PASSWRD} \
-        +app_set_config ${GAME_MOD} \
-        +app_update ${GAME_ID} validate \
-        +quit
     fi
-else
+  fi
-echo "---Everything is installed correctly---"
+
+  if [ -z "${CUR_V%.}" ]; then
+    echo "---Oxide Mod not found, downloading!---"
+    rm -f ${SERVER_DIR}/OxideMod-*.zip
+    cd ${SERVER_DIR}
+    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
+
+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---"
-mkdir ${DATA_DIR}/.steam/sdk32
-cp ${SERVER_DIR}/steamclient.so ${DATA_DIR}/.steam/sdk32/steamclient.so
 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}
-${SERVER_DIR}/hlds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}
+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 -SIGTERM "$killpid"
+	kill -SIGINT $(pidof RustDedicated)
-	wait "$killpid" -f 2>/dev/null
+	tail --pid=$(pidof RustDedicated) -f 2>/dev/null
+	sleep 0.5
 	exit 143;
 }