Dockerfile aktualisiert

geändert:       scripts/start-server.sh

Dockerfile

@@ -1,19 +1,21 @@
-FROM ich777/debian-baseimage:bullseye_amd64
+FROM ich777/winehq-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 lib32stdc++6 lib32z1 && \
+	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

README.md

@@ -1,36 +1,44 @@
 # 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 |
 | USERNAME | Leave blank for anonymous login | blank |
 | PASSWRD | Leave blank for anonymous login | blank |
 
-## Run example for CS:Source
+## Run example
 ```
-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 /path/to/steamcmd:/serverdata/steamcmd \
-	--volume /path/to/cstrikesource:/serverdata/serverfiles \
+	--volume /path/to/abioticfactor:/serverdata/serverfiles \
-	ich777/steamcmd:latest
+	ich777/steamcmd:abioticfactor
 ```
 
 This Docker was mainly edited for better use with Unraid, if you don't use Unraid you should definitely try it!

scripts/start-server.sh

@@ -22,12 +22,14 @@ 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} \
@@ -37,12 +39,14 @@ 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} \
@@ -50,19 +54,34 @@ else
   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

@@ -26,8 +26,8 @@ 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;
 }