scripts/start-server.sh aktualisiert

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

Dockerfile

@@ -1,22 +1,27 @@
-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 dpkg --add-architecture i386 && \
-	apt-get update && \
-	apt-get -y install lib32gcc-s1 screen xvfb winbind && \
+RUN apt-get update && \
+	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 UPDATE_PUBLIC_IP="false"
-ENV BACKUP="false"
-ENV BACKUP_INTERVAL=360
-ENV BACKUPS_TO_KEEP=8
-ENV GAME_PARAMS=""
+ENV GAME_NAME="template"
+ENV GAME_PARAMS="template"
+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,8 +39,7 @@ RUN mkdir $DATA_DIR && \
 	ulimit -n 2048
 
 ADD /scripts/ /opt/scripts/
-COPY /etc/ /etc/
 RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,18 +1,5 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install Astroneer and run it.
-
-**ATTENTION:** You have to add this entry to the Engine.ini from the clients which are going to connecting to this dedicated server:
-```
-[SystemSettings]
-net.AllowEncryption=False
-```
-You'll find the file on your local Windows machine at: `%localappdata%\Astro\Saved\Config\WindowsNoEditor`
-
-**WARNING:** If a client tries to connect to the Dedicated Server which don't has this entry in the Engine.ini the server will be left in a semi bricked state and you have to restart the Docker container.
-
-**Servername:** 'AstroneerDocker' Password: 'Docker' ConsolePassword: 'adminDocker'
-
-**Serveradmin:** If you want to become a server admin then stop the container and edit the file ../Astro/Saved/Config/WindowsServer/AstroServerSettings.ini and add your Steam name after `OwnerName=` eg: `OwnerName=YourSteamName`, after that start the container and connect to the Dedicated Server.
+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.
 
@@ -21,32 +8,33 @@ You'll find the file on your local Windows machine at: `%localappdata%\Astro\Sav
 | --- | --- | --- |
 | STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
 | SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| GAME_PARAMS | Values to start the server if needed. | empty |
-| UPDATE_PUBLIC_IP | If set to 'true' the container will check on each container start if the Public IP is still valid. | false |
-| BACKUP | Set this value to 'true' to enable the automated backup function from the container, you find the Backups in '.../astroneer/Backups/'. Set to 'false' to disable the backup function. | true |
-| BACKUP_INTERVAL | The backup interval in minutes (ATTENTION: The first backup will be triggered after the set interval in this variable after the start/restart of the container) | 360 |
-| BACKUPS_TO_KEEP | Number of backups to keep (by default set to 8 to keep the last backups of the last 48 hours) | 8 |
+| 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 |
 | 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 Astroneer -d \
-	-p 8777:8777/udp \
-	--env 'GAME_ID=728470' \
-	--env 'UPDATE_PUBLIC_IP=false' \
-	--env 'BACKUP=true' \
-	--env 'BACKUP_INTERVAL=360' \
-	--env 'BACKUPS_TO_KEEP=8' \
+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/astroneer:/serverdata/serverfiles \
-	ich777/steamcmd:astroneer
+	--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!

etc/asound.conf

@@ -1,4 +0,0 @@
-pcm.!default {
-    type plug
-    slave.pcm "null"
-}

scripts/start-backup.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-while true
-do
-        sleep ${BACKUP_INTERVAL}m
-        cd ${SERVER_DIR}/Astro/Saved
-        tar --warning=no-file-changed --exclude='./Config/CrashReportClient' -czf ${SERVER_DIR}/Backups/$(date '+%Y-%m-%d_%H.%M.%S').tar.gz ./SaveGames/ ./Config/
-        cd ${SERVER_DIR}/Backups
-        ls -1tr ${SERVER_DIR}/Backups | sort | head -n -${BACKUPS_TO_KEEP} | xargs -d '\n' rm -f --
-        chmod -R ${DATA_PERM} ${SERVER_DIR}/Backups
-done

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,123 +50,116 @@ else
     fi
 fi
 
-echo "---Prepare Server---"
-echo "---Looking for config files---"
-if [ ! -d ${SERVER_DIR}/Astro/Saved/Config/WindowsServer ]; then
-  mkdir -p ${SERVER_DIR}/Astro/Saved/Config/WindowsServer
-fi
-if [ ! -f ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/AstroServerSettings.ini ]; then
-  echo "[/Script/Astro.AstroServerSettings]
-bLoadAutoSave=True
-MaxServerFramerate=30.000000
-MaxServerIdleFramerate=3.000000
-bWaitForPlayersBeforeShutdown=False
-ConsolePassword=adminDocker
-PublicIP=
-ServerName=AstroneerDocker
-ServerGuid=
-OwnerName=
-OwnerGuid=0
-PlayerActivityTimeout=0
-ServerPassword=Docker
-bDisableServerTravel=False
-DenyUnlistedPlayers=False
-VerbosePlayerProperties=False
-AutoSaveGameInterval=900
-BackupSaveGamesInterval=7200
-ActiveSaveFileDescriptiveName=SAVE_1
-ServerAdvertisedName=" > ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/AstroServerSettings.ini
-else
-  echo "---'AstroServerSettings.ini' found---"
-fi
-if [ ! -f ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/Engine.ini ]; then
-  echo "[URL]
-Port=8777
-
-[SystemSettings]
-net.AllowEncryption=False" > ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/Engine.ini
-else
-  echo "---'Engine.ini' found---"
-  sed -i '/^HeartbeatInterval=0/d' ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/AstroServerSettings.ini
+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 "---Checking if PublicIP is in place---"
-PUBLIC_IP="$(cat ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/AstroServerSettings.ini | grep "PublicIP=" | cut -d '=' -f2)"
-if [ -z "${PUBLIC_IP}" ]; then
-  echo "---No PublicIP found in AstroServerSettings.ini, trying to obtain it...---"
-  PUBLIC_IP="$(wget -qO - icanhazip.com)"
-  if [ -z "${PUBLIC_IP}" ]; then
-    echo "---Can't get PublicIP, please set it manually in your AstroServerSettings.ini!---"
-  else
-    echo "---Sucessfully obtained PublicIP: ${PUBLIC_IP}, adding to AstroServerSettings.ini"
-    sed -i "s/PublicIP=.*/PublicIP=${PUBLIC_IP}/g" ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/AstroServerSettings.ini
-  fi
-else
-  if [ "${UPDATE_PUBLIC_IP}" == "true" ]; then
-    NEW_PUBLIC_IP="$(wget -qO - icanhazip.com)"
-    if [ -z "${NEW_PUBLIC_IP}" ]; then
-      echo "---Can't get PublicIP, please set it manually in your AstroServerSettings.ini!---"
+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
-      if [ "${PUBLIC_IP}" != "${NEW_PUBLIC_IP}" ]; then
-        echo "---Changing PublicIP in AstroServerSettings.ini to: ${NEW_PUBLIC_IP}!---"
-        sed -i "s/PublicIP=.*/PublicIP=${NEW_PUBLIC_IP}/g" ${SERVER_DIR}/Astro/Saved/Config/WindowsServer/AstroServerSettings.ini
-      else
-        echo "---Nothing to do, PublicIP: ${PUBLIC_IP} still up-to-date!---"
-      fi
+      echo "---Can_t get latest Oxide Mod version, falling back to installed v${CUR_V%.*}!---"
+      LAT_V="${CUR_V%.*}"
     fi
-  else
-    echo "---PublicIP in AstroServerSettings.ini found: ${PUBLIC_IP}"
+  fi
+
+  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
 
-export WINEARCH=win64
-export WINEPREFIX=/serverdata/serverfiles/WINE64
-export WINEDEBUG=-all
-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---"
+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 "---Checking if WINE is properly installed---"
-if [ ! -d ${SERVER_DIR}/WINE64/drive_c/windows ]; then
-  echo "---Setting up WINE---"
-  cd ${SERVER_DIR}
-  winecfg > /dev/null 2>&1
-  sleep 15
-else
-  echo "---WINE properly set up---"
-fi
-echo "---Checking for old display lock files---"
-find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
+
+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
-echo "+--------------------------------------------------------------------------"
-echo "| Please don't forget to add this entry to your Engine.ini on your Clients:"
-echo "+--------------------------------------------------------------------------"
-echo
-echo "[SystemSettings]"
-echo "net.AllowEncryption=False"
-echo
-echo "+-------------------------------------------------------------------------------"
-echo "| ATTENTION: If a client tries to connect without that in Engine.ini, the server"
-echo "| will be left in a semi bricked state and you have to restart the container!"
-echo "|"
-echo "| You can find the file on your local Windows machine at:"
-echo "| %localappdata%\Astro\Saved\Config\WindowsNoEditor"
-echo "+-------------------------------------------------------------------------------"
-echo
-
-if [ "${BACKUP}" == "true" ]; then
-  echo "---Starting Backup daemon---"
-  if [ ! -d ${SERVER_DIR}/Backups ]; then
-    mkdir -p ${SERVER_DIR}/Backups
-  fi
-  /opt/scripts/start-backup.sh &
-fi
 
 echo "---Start Server---"
 cd ${SERVER_DIR}
-xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 AstroServer.exe ${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 -SIGKILL $(pidof AstroServer.exe)
-	tail --pid=$(pidof AstroServer.exe) -f 2>/dev/null
+	kill -SIGINT $(pidof RustDedicated)
+	tail --pid=$(pidof RustDedicated) -f 2>/dev/null
+	sleep 0.5
 	exit 143;
 }