README.md aktualisiert

corrected syntax error

Dockerfile

@@ -1,38 +1,41 @@
-FROM ubuntu
+FROM ich777/winehq-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 dpkg --add-architecture i386 && \
-RUN apt-get update
+	apt-get update && \
-RUN apt-get -y install libstdc++6:i386
+	apt-get -y install lib32gcc-s1 screen xvfb winbind mariadb-server && \
-RUN apt-get -y install wget
+	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_ID="template"
-ENV GAME_NAME="csgo"
+ENV GAME_PARAMS="-world 1"
-ENV GAME_PARAMS="+game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2"
+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 $DATA_DIR && \
-RUN mkdir $STEAMCMD_DIR
+	mkdir $STEAMCMD_DIR && \
-RUN mkdir $SERVER_DIR
+	mkdir $SERVER_DIR && \
-RUN mkdir -p ~/.steam/sdk32
+	useradd -d $DATA_DIR -s /bin/bash $USER && \
-
+	chown -R $USER $DATA_DIR && \
-RUN wget -q -O ${STEAMCMD_DIR}/steamcmd_linux.tar.gz http://media.steampowered.com/client/steamcmd_linux.tar.gz \
+	ulimit -n 2048 && \
-  &&  tar --directory ${STEAMCMD_DIR} -xvzf /serverdata/steamcmd/steamcmd_linux.tar.gz \
+	/etc/init.d/mariadb start && \
-  &&  rm ${STEAMCMD_DIR}/steamcmd_linux.tar.gz \
+	mysql -u root -e "CREATE USER IF NOT EXISTS 'steam'@'%' IDENTIFIED BY 'lifyo';FLUSH PRIVILEGES;" && \
-  &&  chmod -R 774 ${STEAMCMD_DIR} ${STEAMCMD_DIR}/linux32 $SERVER_DIR \
+	mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'steam'@'%' IDENTIFIED BY 'lifyo';" && \
-  &&  ln -s ${STEAMCMD_DIR}/linux32/steamclient.so ~/.steam/sdk32/steamclient.so
+	mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'LiFYO';FLUSH PRIVILEGES;" && \
-RUN ulimit -n 2048
+	echo "\n[mysqld]\ndatadir=/serverdata/serverfiles/.database/" >> /etc/alternatives/my.cnf
-
-EXPOSE 27015
-EXPOSE 27015/udp
-EXPOSE 27020/udp
-EXPOSE 27005/udp
 
 ADD /scripts/ /opt/scripts/
-RUN chmod -R 774 /opt/scripts/
+RUN chmod -R 770 /opt/scripts/
 
 #Server Start
-ENTRYPOINT ["/opt/scripts/start-csgo.sh"]
+ENTRYPOINT ["/opt/scripts/start.sh"]

README.md

@@ -1,28 +1,43 @@
-#Steamcmd in docker
+# SteamCMD in Docker optimized for Unraid
-This dockerfill will download/install steamcmd.
+This Docker will download and install SteamCMD. It will also install Life is Feudal: Your Own and run it.
-It will also install the server you want(like csgo,tf2,ins ...)
 
-##Env params
+Initial server configuration:  
-| Name | Value | Default |
+**Servername:** LiF Docker **Password:** Docker **Admin Password:** adminDocker  
+
+**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.
+
+## Env params
+| Name | Value | Example |
 | --- | --- | --- |
-| DATA_DIR | main folder | /serverdata |
+| STEAMCMD_DIR | Folder for SteamCMD | /serverdata/steamcmd |
-| STEAMCMD_DIR | folder for steamcmd | /serverdata/steamcmd |
+| SERVER_DIR | Folder for gamefile | /serverdata/serverfiles |
-| SERVER_DIR | folder for gamefile | /serverdata/serverfiles |
+| GAME_PARAMS | Values to start the server if needed. | empty |
-| GAME_ID | steamid for server | 740 |
+| 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: '320850 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 320850 |
-| GAME_NAME | srcds gamename | csgo |
+| UID | User Identifier | 99 |
-| GAME_PARAMS | values to start the server | +game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2 |
+| GID | Group Identifier | 100 |
+| VALIDATE | Validates the game data | false |
+| 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 \
+docker run --name LifeIsFeudal-YourOwn -d \
-	-p 27015:27015 -p 27015:27015/udp -p 27020:27020/udp -p 27005:27005/udp \
+	-p 28000-28003 -p 28000-28003/udp \
-	--env 'GAME_ID=740' \
+	--env 'GAME_ID=320850' \
-	--env 'GAME_NAME=csgo' \
+	--env 'UID=99' \
-	--env 'GAME_PARAMS=+game_type 0 +game_mode 0 +mapgroup mg_active +map de_dust2' \
+	--env 'GID=100' \
-	--volume /share/CACHEDEV1_DATA/Public/VM/Docker/CSGO:/serverdata \
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	mattie/docker-steamcmd-server:latest
+	--volume /path/to/lifeisfeudal-yo:/serverdata/serverfiles \
+	ich777/steamcmd:lifyo
 ```
+
+
+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_config.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server_data port="25564" name="Stormworks Docker" save_name="autosave_server" max_players="32" password="Docker" day_night_length="60" sunrise="0.25" sunset="0.791" infinite_resources="false" unlock_all_islands="false" settings_menu="false" base_island="data/tiles/island12.xml" settings_menu_lock="false" infinite_batteries="false" infinite_fuel="false" engine_overheating="false" ceasefire="false" infinite_ammo="false" no_clip="false" map_teleport="false" vehicle_spawn="false" photo_mode="false" respawning="false" cleanup_vehicle="false" clear_fow="false" third_person="true" third_person_vehicle="true" vehicle_damage="false" player_damage="false" npc_damage="false" aggressive_animals="false" sea_monsters="false" lightning="true" teleport_vehicle="true" fast_travel="true" starting_currency="20000" despawn_on_leave="false" map_show_players="false" map_show_vehicles="false" show_3d_waypoints="false" show_name_plates="false" override_weather="false" override_time="false" override_wind="false" physics_timestep="0" wildlife_enabled="true" fish_spawn_rate="2" unlock_components="true" dlc_weapons="false" dlc_arid="false"/>

scripts/start-Xvfb.sh

@@ -0,0 +1,4 @@
+until Xvfb :99 -screen scrn 640x480x16; do
+    echo "Xvfb server crashed with exit code $?.  Respawning.." >&2
+    sleep 1
+done

scripts/start-csgo.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-if [ ! -f ${STEAMCMD_DIR}/steamcmd.sh ]; then
-    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/steamclient.so ~/.steam/sdk32/steamclient.so
-fi
-
-echo "---Update steamcmd---"
-${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 \
-    +quit
-    
-echo "---Start Server---"
-${SERVER_DIR}/srcds_run -game $GAME_NAME -usercon -console $GAME_PARAMS +ip 0.0.0.0 +port 27015 +sv_lan 0

scripts/start-server.sh

@@ -0,0 +1,133 @@
+#!/bin/bash
+if [ ! -f ${STEAMCMD_DIR}/steamcmd.sh ]; then
+    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
+fi
+
+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---"
+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
+
+echo "---Prepare Server---"
+export WINEARCH=win64
+export WINEPREFIX=/serverdata/serverfiles/WINE64
+export DISPLAY=:99
+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---"
+    cd ${SERVER_DIR}
+    winecfg > /dev/null 2>&1
+    sleep 15
+else
+	echo "---WINE properly set up---"
+fi
+
+echo "---Checking config---"
+if grep -q "<name>My own LiF server</name>" ${SERVER_DIR}/config/world_1.xml ; then
+  echo "---Adding initial config parameters to config file---"
+  sed -i 's/\<My own LiF server\>/LiF Docker/g' ${SERVER_DIR}/config/world_1.xml
+  sed -i s/"<password><\/password>"/"<password>Docker<\/password>"/g ${SERVER_DIR}/config/world_1.xml
+  sed -i s/"<adminPassword><\/adminPassword>"/"<adminPassword>adminDocker<\/adminPassword>"/g ${SERVER_DIR}/config/world_1.xml
+else
+  echo "---Config check done---"
+fi
+
+echo "---Checking if database is in place---"
+if [ ! -d ${SERVER_DIR}/.database ]; then
+  echo "---Database not found, setting up databbase...---"
+  mkdir -p ${SERVER_DIR}/.database
+  cp -R /var/lib/mysql/* ${SERVER_DIR}/.database/
+else
+  echo "---Database found---"
+fi
+
+echo "---Checking if database configuration is in place---"
+if [ ! -f ${SERVER_DIR}/config_local.cs ]; then
+  echo "---Database configuration not found, configuring...---"
+  cp ${SERVER_DIR}/docs/config_local.cs ${SERVER_DIR}/config_local.cs
+  sed -i 's/\<root\>/steam/g' ${SERVER_DIR}/config_local.cs
+  sed -i 's/\<rootPassword\>/lifyo/g' ${SERVER_DIR}/config_local.cs
+else
+  echo "---Database connection found---"
+fi
+
+echo "---Starting MariaDB---"
+screen -S MariaDB -d -m mysqld_safe
+sleep 2
+
+echo "---Starting Xvfb---"
+screen -S Xvfb -d -m /opt/scripts/start-Xvfb.sh
+sleep 2
+
+echo "---Checking for old display lock files---"
+find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
+chmod -R ${DATA_PERM} ${DATA_DIR}
+echo "---Server ready---"
+
+echo "---Start Server---"
+if [ ! -f ${SERVER_DIR}/ddctd_cm_yo_server.exe ]; then
+  echo "---Something went wrong, can't find the executable, putting container into sleep mode!---"
+  sleep infinity
+else
+  cd ${SERVER_DIR}
+  screen -S LiFYO -d -m wine64 ddctd_cm_yo_server.exe ${GAME_PARAMS}
+  echo "---Waiting for logs...---"
+  sleep 3
+  /opt/scripts/start-watchdog.sh &
+  cd ${SERVER_DIR}/logs
+  cd $(ls -1d */ | tail -1)
+  tail -n 9999 -f $(ls -t | head -n 1)
+fi

scripts/start-watchdog.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+killpid="$(pidof ddctd_cm_yo_server.exe)"
+while true
+do
+	tail --pid=$killpid -f /dev/null
+	kill "$(pidof tail)"
+exit 0
+done

scripts/start.sh

@@ -0,0 +1,45 @@
+#!/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} /var/lib/mysql
+chown -R ${UID}:${GID} /var/run/mysqld
+chown -R ${UID}:${GID} ${DATA_DIR}
+chmod -R 770 /var/lib/mysql
+chmod -R 770 /var/run/mysqld
+
+echo "---Starting...---"
+term_handler() {
+	kill -SIGINT $(pidof ddctd_cm_yo_server.exe)
+	tail --pid=$(pidof ddctd_cm_yo_server.exe) -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