From 40ccd5a8c80b266b858328e677709c8695161977 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 30 Sep 2023 20:32:20 -0400 Subject: [PATCH] Update Debian 12 --- Dockerfile | 21 ++++++++++----------- _scripts/start-server | 4 ++-- _scripts/tribesnext-server-installer | 15 +++++++-------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3aa94c..3330692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,12 +11,12 @@ WORKDIR /tmp RUN git clone --depth 1 "https://github.com/ChocoTaco1/TacoServer/" && cd ./TacoServer WORKDIR /tmp -RUN git clone --depth 1 "https://github.com/ChocoTaco1/TacoMaps/" && cd ./TacoMaps +RUN git clone --depth 1 "https://github.com/ChocoTaco1/TacoMaps/" && cd ./TacoMaps WORKDIR /tmp # Main Game Server Image -FROM i386/ubuntu:disco +FROM i386/debian:bookworm LABEL maintainer="sairuk, amineo, chocotaco" # ENVIRONMENT @@ -43,19 +43,18 @@ sudo unzip \ # -- logging rsyslog \ # -- utilities -sed less nano vim file wget gnupg2 software-properties-common git \ +sed less nano vim file wget gnupg2 software-properties-common git htop \ # --- wine #${WINEVER} \ # -- display xvfb # GET WINE -RUN wget --no-check-certificate https://dl.winehq.org/wine-builds/winehq.key -RUN apt-key add winehq.key -RUN add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ disco main' -RUN add-apt-repository ppa:cybermax-dexter/sdl2-backport -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install --install-recommends winehq-devel - +RUN mkdir -pm755 /etc/apt/keyrings +RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key +RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources +RUN apt-get -y update && apt-get -y upgrade +RUN apt-get -y install --install-recommends winehq-devel # INSTALL GAMEMODE #RUN add-apt-repository ppa:samoilov-lex/gamemode @@ -75,7 +74,7 @@ RUN apt-get -y update && apt-get -y upgrade && apt-get -y install --install-reco #RUN cd ~/wine-dirs/wine-source #RUN sh ~/wine-dirs/wine-source/configure --prefix=/usr --libdir=/usr/lib --with-x --with-gstreamer --enable-win64 #RUN sh ~/wine-dirs/wine-source/configure --prefix=/usr --libdir=/usr/lib32 --with-x -#RUN make -j4 +#RUN make -j4 #RUN make install @@ -134,7 +133,7 @@ RUN chown -R ${SRVUSER}: /home/${SRVUSER} EXPOSE \ # -- tribes 666/tcp \ -28000/udp +28000/udp USER ${SRVUSER} WORKDIR ${INSTDIR} diff --git a/_scripts/start-server b/_scripts/start-server index 816c2e3..3ea4f5d 100755 --- a/_scripts/start-server +++ b/_scripts/start-server @@ -10,9 +10,9 @@ echo "Finished!" find ${BASEDIR} -name \*.dso -execdir /bin/rm {} \; -cd $WINEPREFIX/drive_c/Dynamix/Tribes2/GameData +cd $WINEPREFIX/drive_c/Dynamix/Tribes2/GameData wine --version echo "Running the Tribes 2 server" -xvfb-run -a -w 5 taskset -c 0 wine Tribes2.exe 28000 -dedicated -mod Classic +xvfb-run -a -w 5 taskset -c 0 wine Tribes2.exe 28000 -dedicated -mod Classic \ No newline at end of file diff --git a/_scripts/tribesnext-server-installer b/_scripts/tribesnext-server-installer index 49c5bb3..b94853c 100755 --- a/_scripts/tribesnext-server-installer +++ b/_scripts/tribesnext-server-installer @@ -52,10 +52,11 @@ fi # -- download files -get_files tribes2gsi.exe "https://www.the-construct.net/downloads/tribes2/" "$TMPBASE" -get_files TribesNext_rc2a.exe "https://www.tribesnext.com/files/" "$TMPBASE" -get_files TribesNext_RC2_LinuxVersion.zip "https://lutris.net/files/games/tribes-2/" "$TMPBASE" -get_files classic_v152.zip "https://tribes2stats.com/files/mods/" "$TMPBASE" +get_files tribes2gsi.exe "https://www.the-construct.net/downloads/tribes2/" "$TMPBASE" +get_files TribesNext_rc2a.exe "https://www.tribesnext.com/files/" "$TMPBASE" +get_files msvcrt-ruby190.zip "https://www.dropbox.com/s/bvh9631a4mtuisf/msvcrt-ruby190.zip" "$TMPBASE" +get_files classic_v152.zip "https://tribes2stats.com/files/mods/" "$TMPBASE" + # -- some items require an headerless export DISPLAY=:99 @@ -255,10 +256,8 @@ echo "Running Patches and Updates..." # -- install tribesnext silently [ -f $TMPBASE/TribesNext_rc2a.exe ] && /usr/bin/wine $TMPBASE/TribesNext_rc2a.exe /S - -# -- extract updated linux version and replace the existing installation -[ -f $TMPBASE/TribesNext_RC2_LinuxVersion.zip ] && /usr/bin/unzip -o $TMPBASE/TribesNext_RC2_LinuxVersion.zip -d $INSBASE/Tribes2/GameData 2>&1 > /dev/null - +# -- extract updated msvcrt and replace the existing installation +[ -f $TMPBASE/msvcrt-ruby190.zip ] && /usr/bin/unzip -o $TMPBASE//msvcrt-ruby190.zip -d $INSBASE/Tribes2/GameData 2>&1 > /dev/null # -- update Classic mod to v1.5.2 [ -f $TMPBASE/classic_v152.zip ] && /usr/bin/unzip -o $TMPBASE/classic_v152.zip -d $TMPBASE/classic 2>&1 > /dev/null