Dockerfile aktualisiert

geändert:       scripts/start-server.sh

Dockerfile

@@ -1,18 +1,21 @@
-FROM ich777/debian-baseimage
+FROM ich777/winehq-baseimage
 
-LABEL maintainer="admin@minenet.at"
+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 lib32stdc++6 && \
+	apt-get -y install --no-install-recommends lib32gcc-s1 lib32stdc++6 lib32z1 winbind && \
 	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_ID="2857200"
-ENV GAME_NAME="template"
+ENV SERVER_NAME="Abiotic Factor Docker"
-ENV GAME_PARAMS="template"
+ENV SERVER_PWD="Docker"
-ENV GAME_PORT=27015
+ENV GAME_PARAMS="-log"
+ENV GAME_PORT=7777
+ENV QUERY_PORT=27015
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99
@@ -33,4 +36,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,50 +1,48 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD and the according game that is pulled via specifying the Tag.
+This Docker will download and install SteamCMD. It will also install Abiotic Factor and run it.
 
-**Please see the different Tags/Branches which games are available.**
+ATTENTION: First Startup can take very long since it downloads the gameserver files!
 
-## Example Env params for CS:Source
+Update Notice: Simply restart the container if a newer version of the game is available.
+
+You can also run multiple servers with only one SteamCMD directory!
+
+## Example Env params
 | Name | Value | Example |
 | --- | --- | --- |
 | 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: '232330 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 232330 |
+| 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: '2857200 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 2857200 |
-| GAME_NAME | SRCDS gamename | cstrike |
+| SERVER_NAME | Your server name goes here | Abiotic Factor Docker |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
+| SERVER_PWD | Your server password goes here | Docker |
+| GAME_PARAMS | Enter your game parameters | -log |
+| GAME_PORT | Enter your preferred game port | 7777 |
+| QUERY_PORT | Enter your preferred query port | 27015 |
 | 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 | true |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-**ATTENTION: You have to disable Steam Guard for games that require authentication, but not all games need Steam credentials, Steam recommends to create a seperate account for dedicated servers **
+## Run example
-
->**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 for CS:Source
 ```
-docker run --name CSSource -d \
+docker run --name AbioticFactor -d \
-	-p 27015:27015 -p 27015:27015/udp \
+	-p 7777:7777/udp -p 27015:27015/udp\
-	--env 'GAME_ID=232330' \
+	--env 'GAME_ID=2857200' \
-	--env 'GAME_NAME=cstrike' \
+	--env 'SERVER_NAME=Abiotic Factor Docker' \
-	--env 'GAME_PORT=27015' \
+	--env 'SERVER_PWD=Docker' \
-	--env 'GAME_PARAMS=-secure +maxplayers 32 +map de_dust2' \
+	--env 'GAME_PARAMS=-log' \
+	--env 'GAME_PORT=7777' \
+	--env 'QUERY_PORT=27015' \
 	--env 'UID=99' \
 	--env 'GID=100' \
-	--volume /mnt/user/appdata/steamcmd:/serverdata/steamcmd \
+	--volume /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /mnt/user/appdata/cstrikesource:/serverdata/serverfiles \
+	--volume /path/to/abioticfactor:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	ich777/steamcmd:abioticfactor
 ```
->**NOTE** port 26900 is the port for vac, in case of multiple servers make sure these are not the same
-
 
 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/

scripts/start-server.sh

@@ -1,68 +1,87 @@
 #!/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 
+  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
+  tar --directory ${STEAMCMD_DIR} -xvzf /serverdata/steamcmd/steamcmd_linux.tar.gz
-    rm ${STEAMCMD_DIR}/steamcmd_linux.tar.gz
+  rm ${STEAMCMD_DIR}/steamcmd_linux.tar.gz
 fi
 
 echo "---Update SteamCMD---"
 if [ "${USERNAME}" == "" ]; then
-    ${STEAMCMD_DIR}/steamcmd.sh \
+  ${STEAMCMD_DIR}/steamcmd.sh \
-    +login anonymous \
+  +login anonymous \
-    +quit
+  +quit
 else
-    ${STEAMCMD_DIR}/steamcmd.sh \
+  ${STEAMCMD_DIR}/steamcmd.sh \
-    +login ${USERNAME} ${PASSWRD} \
+  +login ${USERNAME} ${PASSWRD} \
-    +quit
+  +quit
 fi
 
 echo "---Update Server---"
 if [ "${USERNAME}" == "" ]; then
-    if [ "${VALIDATE}" == "true" ]; then
+  if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
+    echo "---Validating installation---"
-        ${STEAMCMD_DIR}/steamcmd.sh \
+    ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
+    +@sSteamCmdForcePlatformType windows \
-        +login anonymous \
+    +force_install_dir ${SERVER_DIR} \
-        +app_update ${GAME_ID} validate \
+    +login anonymous \
-        +quit
+    +app_update ${GAME_ID} validate \
-    else
+    +quit
-        ${STEAMCMD_DIR}/steamcmd.sh \
+  else
-        +force_install_dir ${SERVER_DIR} \
+    ${STEAMCMD_DIR}/steamcmd.sh \
-        +login anonymous \
+    +@sSteamCmdForcePlatformType windows \
-        +app_update ${GAME_ID} \
+    +force_install_dir ${SERVER_DIR} \
-        +quit
+    +login anonymous \
-    fi
+    +app_update ${GAME_ID} \
+    +quit
+  fi
 else
-    if [ "${VALIDATE}" == "true" ]; then
+  if [ "${VALIDATE}" == "true" ]; then
-    	echo "---Validating installation---"
+    echo "---Validating installation---"
-        ${STEAMCMD_DIR}/steamcmd.sh \
+    ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
+    +@sSteamCmdForcePlatformType windows \
-        +login ${USERNAME} ${PASSWRD} \
+    +force_install_dir ${SERVER_DIR} \
-        +app_update ${GAME_ID} validate \
+    +login ${USERNAME} ${PASSWRD} \
-        +quit
+    +app_update ${GAME_ID} validate \
-    else
+    +quit
-        ${STEAMCMD_DIR}/steamcmd.sh \
+  else
-        +force_install_dir ${SERVER_DIR} \
+    ${STEAMCMD_DIR}/steamcmd.sh \
-        +login ${USERNAME} ${PASSWRD} \
+    +@sSteamCmdForcePlatformType windows \
-        +app_update ${GAME_ID} \
+    +force_install_dir ${SERVER_DIR} \
-        +quit
+    +login ${USERNAME} ${PASSWRD} \
-    fi
+    +app_update ${GAME_ID} \
+    +quit
+  fi
 fi
 
-echo "---Prepare Server---"
+export WINEARCH=win64
-if [ ! -f ${DATA_DIR}/.steam/sdk32/steamclient.so ]; then
+export WINEPREFIX=/serverdata/serverfiles/WINE64
-	if [ ! -d ${DATA_DIR}/.steam ]; then
+export WINEDEBUG=-all
-    	mkdir ${DATA_DIR}/.steam
+echo "---Checking if WINE workdirectory is present---"
-    fi
+if [ ! -d ${SERVER_DIR}/WINE64 ]; then
-	if [ ! -d ${DATA_DIR}/.steam/sdk32 ]; then
+  echo "---WINE workdirectory not found, creating please wait...---"
-    	mkdir ${DATA_DIR}/.steam/sdk32
+  mkdir ${SERVER_DIR}/WINE64
-    fi
+else
-    cp -R ${STEAMCMD_DIR}/linux32/* ${DATA_DIR}/.steam/sdk32/
+  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 "---Prepare Server---"
 chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
 
 echo "---Start Server---"
-cd ${SERVER_DIR}
+if [ ! -f ${SERVER_DIR}/AbioticFactor/Binaries/Win64/AbioticFactorServer-Win64-Shipping.exe ]; then
-${SERVER_DIR}/srcds_run -game ${GAME_NAME} ${GAME_PARAMS} -console +port ${GAME_PORT}
+  echo "---Something went wrong, can't find the executable, putting container into sleep mode!---"
+  sleep infinity
+else
+  cd ${SERVER_DIR}/AbioticFactor/Binaries/Win64
+  wine64 ${SERVER_DIR}/AbioticFactor/Binaries/Win64/AbioticFactorServer-Win64-Shipping.exe ${GAME_PARAMS} -oldconsole -useperfthreads -NoAsyncLoadingThread -PORT=${GAME_PORT} -QUERYPORT=${QUERY_PORT} -ServerPassword="${SERVER_PWD}" -SteamServerName="${SERVER_NAME}"
+fi

scripts/start.sh

@@ -1,28 +1,33 @@
 #!/bin/bash
-echo "---Checking if UID: ${UID} matches user---"
+echo "---Ensuring UID: ${UID} matches user---"
 usermod -u ${UID} ${USER}
-echo "---Checking if GID: ${GID} matches 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---"
-if [ -f /opt/scripts/user.sh ]; then
+cp -f /opt/custom/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
-	echo "---Found optional script, executing---"
+cp -f /opt/scripts/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
-    chmod +x /opt/scripts/user.sh
+
-    /opt/scripts/user.sh
+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---"
+  echo "---No optional script found, continuing---"
 fi
 
-echo "---Starting...---"
+echo "---Taking ownership of data...---"
 chown -R root:${GID} /opt/scripts
 chmod -R 750 /opt/scripts
 chown -R ${UID}:${GID} ${DATA_DIR}
 
+echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM "$killpid"
+	kill -SIGINT $(pidof AbioticFactorServer-Win64-Shipping.exe)
-	wait "$killpid" -f 2>/dev/null
+	tail --pid=$(pidof AbioticFactorServer-Win64-Shipping.exe) -f 2>/dev/null
 	exit 143;
 }
 
@@ -31,6 +36,6 @@ su ${USER} -c "/opt/scripts/start-server.sh" &
 killpid="$!"
 while true
 do
-	wait $killpid
+  wait $killpid
-	exit 0;
+  exit 0;
-done
+done