diff --git a/files/bin/dz-common b/files/bin/dz-common index 9189e51..4e96985 100755 --- a/files/bin/dz-common +++ b/files/bin/dz-common @@ -52,7 +52,7 @@ export FILES="/files" export SERVER_FILES="/serverfiles" # Used to check if dayZ is installed -export SERVER_INSTALL_FILE="${SERVER_FILES}/DayZServer" +export SERVER_INSTALL_FILE="${SERVER_FILES}/DayZServer_x64.exe" if [ -f ${SERVER_INSTALL_FILE} ] then @@ -63,12 +63,12 @@ then else RELEASE="Experimental" fi - VERSION=$(strings /serverfiles/DayZServer | grep -P "1\.\d{2}\.\d{6}")" - ${RELEASE}" + VERSION=$(strings ${SERVER_INSTALL_FILE} | grep -P "1\.\d{2}\.\d{6}")" - ${RELEASE}" fi # Steam files export STEAM_LOGIN="${HOME}/steamlogin" -export STEAMCMD=steamcmd +export STEAMCMD="steamcmd +@sSteamCmdForcePlatformType windows" # Other stuff export YES="${green}yes${default}" diff --git a/server/Dockerfile b/server/Dockerfile index d6e148b..ca807ea 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -6,6 +6,9 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh # Set debconf to run non-interactively RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections +# Add 32 bit support +RUN dpkg --add-architecture i386 + # Add backports and contrib RUN sed -i /etc/apt/sources.list.d/debian.sources -e 's/Components: main/Components: main contrib non-free/g' @@ -22,7 +25,12 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install --no-install-reco procps \ strace \ wget \ - xmlstarlet + wine \ + wine64 \ + wine32:i386 \ + winbind \ + xmlstarlet \ + xvfb # Add bercon-cli https://github.com/WoozyMasta/bercon RUN wget https://github.com/WoozyMasta/bercon-cli/releases/latest/download/bercon-cli-linux-amd64 -O bercon-cli \ diff --git a/server/bin/dz b/server/bin/dz index 69c87fd..8991beb 100755 --- a/server/bin/dz +++ b/server/bin/dz @@ -421,7 +421,7 @@ start(){ then sed -e "s,^steamQueryPort.*,steamQueryPort = ${STEAM_PORT};," -i "${SERVER_CFG_DST}" fi - ./DayZServer "${mod_command_line}" "${server_command_line}" ${parameters} + /usr/lib/wine/wine64 DayZServer_x64.exe "${mod_command_line}" "${server_command_line}" ${parameters} EXIT_CODE=$? printf "\n[ ${yellow}DayZ${default} ] Server exited. Exit code: ${EXIT_CODE}\n" report diff --git a/server/bin/start.sh b/server/bin/start.sh index 4dfd183..1a27823 100755 --- a/server/bin/start.sh +++ b/server/bin/start.sh @@ -8,6 +8,12 @@ export TERM=screen.xterm-256color unset DEVELOPMENT EOF +# Start the Xvfb display server in the background +Xvfb ${DISPLAY} -screen 0 1024x768x24 & + +# Let it start up +sleep 5 + # Start the server. # If the DEVELOPMENT environment variable is set to 1, the container will just block and not start the server. exec dz start