Dockerfile aktualisiert

geändert:       scripts/start-server.sh

Dockerfile

@@ -1,21 +1,21 @@
-FROM ich777/debian-baseimage
+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 xvfb screen libxi6 && \
+	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 WORLD_INDEX=0
-ENV WORLD_NAME="Core Keeper Docker"
-ENV GAME_ID="template"
-ENV GAME_NAME=""
-ENV GAME_PARAMS=""
-ENV GAME_PORT=27015
+ENV GAME_ID="2857200"
+ENV SERVER_NAME="Abiotic Factor Docker"
+ENV SERVER_PWD="Docker"
+ENV GAME_PARAMS="-log"
+ENV GAME_PORT=7777
+ENV QUERY_PORT=27015
 ENV VALIDATE=""
 ENV UMASK=000
 ENV UID=99
@@ -36,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,38 +1,44 @@
 # SteamCMD in Docker optimized for Unraid
-This Docker will download and install SteamCMD. It will also install CoreKeeper and run it.
+This Docker will download and install SteamCMD. It will also install Abiotic Factor and run it.
 
-**GameID:** Your GameID will be displayed in the log after the server successfully started.
-
-**Port Forwarding:** You don't have to forward any ports for this game because it uses the Steam Network and the GameID to establish the connection.
+ATTENTION: First Startup can take very long since it downloads the gameserver files!
 
 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: '1963720 -beta YOURBRANCH' (without quotes, replace YOURBRANCH with the branch or version you want to install). | 1963720 |
-| WORLD_NAME | Enter your prefered world name here. | Core Keeper Docker |
-| WORLD_INDEX | Only change when you know what you are doing! | cstrike |
-| GAME_PARAMS | Values to start the server | -secure +maxplayers 32 +map de_dust2 |
+| 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 |
+| SERVER_NAME | Your server name goes here | Abiotic Factor Docker |
+| 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 |
-| VALIDATE | Validates the game data | true |
+| 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 CoreKeeper -d \
-	--env 'GAME_ID=1963720' \
-	--env 'WORLD_NAME=Core Keeper Docker' \
-	--env 'WORLD_INDEX=0' \
+docker run --name AbioticFactor -d \
+	-p 7777:7777/udp -p 27015:27015/udp\
+	--env 'GAME_ID=2857200' \
+	--env 'SERVER_NAME=Abiotic Factor Docker' \
+	--env 'SERVER_PWD=Docker' \
+	--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/corekeeper:/serverdata/serverfiles \
-	ich777/steamcmd:corekeeper
+	--volume /path/to/abioticfactor:/serverdata/serverfiles \
+	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-Xvfb.sh

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

scripts/start-server.sh

@@ -1,86 +1,87 @@
 #!/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
+  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
+  ${STEAMCMD_DIR}/steamcmd.sh \
+  +login anonymous \
+  +quit
 else
-    ${STEAMCMD_DIR}/steamcmd.sh \
-    +login ${USERNAME} ${PASSWRD} \
-    +quit
+  ${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 \
-        +force_install_dir ${SERVER_DIR} \
-        +login anonymous \
-        +app_update ${GAME_ID} validate \
-        +quit
-    else
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login anonymous \
-        +app_update ${GAME_ID} \
-        +quit
-    fi
+  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 \
-        +force_install_dir ${SERVER_DIR} \
-        +login ${USERNAME} ${PASSWRD} \
-        +app_update ${GAME_ID} validate \
-        +quit
-    else
-        ${STEAMCMD_DIR}/steamcmd.sh \
-        +force_install_dir ${SERVER_DIR} \
-        +login ${USERNAME} ${PASSWRD} \
-        +app_update ${GAME_ID} \
-        +quit
-    fi
+  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
 
+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---"
+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---"
-if [ ! -f ${DATA_DIR}/.steam/sdk64/steamclient.so ]; then
-  if [ ! -d ${DATA_DIR}/.steam/sdk64 ]; then
-    mkdir -p ${DATA_DIR}/.steam/sdk64
-  fi
-  cp -R ${STEAMCMD_DIR}/linux64/* ${DATA_DIR}/.steam/sdk64/
-fi
-echo "---Checking for old display lock files---"
-find /tmp -name ".X99*" -exec rm -f {} \; > /dev/null 2>&1
-echo "---Checking for old logfiles---"
-find ${SERVER_DIR} -name "XvfbLog.*" -exec rm -f {} \; > /dev/null 2>&1
-chmod +x ${SERVER_DIR}/CoreKeeperServer
-if [ -f ${SERVER_DIR}/steamclient.so ]; then
-  rm ${SERVER_DIR}/steamclient.so
-fi
+chmod -R ${DATA_PERM} ${DATA_DIR}
 echo "---Server ready---"
-echo "---Starting Xvfb server---"
-screen -S Xvfb -L -Logfile ${SERVER_DIR}/XvfbLog.0 -d -m /opt/scripts/start-Xvfb.sh
-sleep 3
 
 echo "---Start Server---"
-export DISPLAY=:99
-cd ${SERVER_DIR}
-if [ -f ${SERVER_DIR}/GameID.txt ]; then
-  rm -f ${SERVER_DIR}/GameID.txt
+if [ ! -f ${SERVER_DIR}/AbioticFactor/Binaries/Win64/AbioticFactorServer-Win64-Shipping.exe ]; then
+  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
-${SERVER_DIR}/CoreKeeperServer -batchmode -logfile ${SERVER_DIR}/CoreKeeperServerLog.txt -world ${WORLD_INDEX} -worldname "${WORLD_NAME}" -datapath "${SERVER_DIR}/Save" ${GAME_PARAMS} 2 >/dev/null &
-sleep 2
-screen -S watchdog -d -m /opt/scripts/start-watchdog.sh
-while [ ! -f ${SERVER_DIR}/GameID.txt ]; do
-        sleep 1
-done
-echo "Server Game ID: $(cat ${SERVER_DIR}/GameID.txt 2>/dev/null)"
-sleep infinity

scripts/start-watchdog.sh

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

scripts/start.sh

@@ -12,11 +12,11 @@ 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---"
+  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 "---Taking ownership of data...---"
@@ -26,8 +26,8 @@ chown -R ${UID}:${GID} ${DATA_DIR}
 
 echo "---Starting...---"
 term_handler() {
-	kill -SIGTERM $(pidof CoreKeeperServer)
-	tail --pid="$(pidof CoreKeeperServer)" -f 2>/dev/null
+	kill -SIGINT $(pidof AbioticFactorServer-Win64-Shipping.exe)
+	tail --pid=$(pidof AbioticFactorServer-Win64-Shipping.exe) -f 2>/dev/null
 	exit 143;
 }
 
@@ -36,6 +36,6 @@ su ${USER} -c "/opt/scripts/start-server.sh" &
 killpid="$!"
 while true
 do
-	wait $killpid
-	exit 0;
-done
+  wait $killpid
+  exit 0;
+done