Update Debian 12

This commit is contained in:
ChocoTaco 2023-09-30 20:32:20 -04:00
parent 3b363f6f67
commit 40ccd5a8c8
3 changed files with 19 additions and 21 deletions

View file

@ -11,12 +11,12 @@ WORKDIR /tmp
RUN git clone --depth 1 "https://github.com/ChocoTaco1/TacoServer/" && cd ./TacoServer RUN git clone --depth 1 "https://github.com/ChocoTaco1/TacoServer/" && cd ./TacoServer
WORKDIR /tmp 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 WORKDIR /tmp
# Main Game Server Image # Main Game Server Image
FROM i386/ubuntu:disco FROM i386/debian:bookworm
LABEL maintainer="sairuk, amineo, chocotaco" LABEL maintainer="sairuk, amineo, chocotaco"
# ENVIRONMENT # ENVIRONMENT
@ -43,19 +43,18 @@ sudo unzip \
# -- logging # -- logging
rsyslog \ rsyslog \
# -- utilities # -- 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 # --- wine
#${WINEVER} \ #${WINEVER} \
# -- display # -- display
xvfb xvfb
# GET WINE # GET WINE
RUN wget --no-check-certificate https://dl.winehq.org/wine-builds/winehq.key RUN mkdir -pm755 /etc/apt/keyrings
RUN apt-key add winehq.key RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
RUN add-apt-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ disco main' RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources
RUN add-apt-repository ppa:cybermax-dexter/sdl2-backport RUN apt-get -y update && apt-get -y upgrade
RUN apt-get -y update && apt-get -y upgrade && apt-get -y install --install-recommends winehq-devel RUN apt-get -y install --install-recommends winehq-devel
# INSTALL GAMEMODE # INSTALL GAMEMODE
#RUN add-apt-repository ppa:samoilov-lex/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 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/lib --with-x --with-gstreamer --enable-win64
#RUN sh ~/wine-dirs/wine-source/configure --prefix=/usr --libdir=/usr/lib32 --with-x #RUN sh ~/wine-dirs/wine-source/configure --prefix=/usr --libdir=/usr/lib32 --with-x
#RUN make -j4 #RUN make -j4
#RUN make install #RUN make install
@ -134,7 +133,7 @@ RUN chown -R ${SRVUSER}: /home/${SRVUSER}
EXPOSE \ EXPOSE \
# -- tribes # -- tribes
666/tcp \ 666/tcp \
28000/udp 28000/udp
USER ${SRVUSER} USER ${SRVUSER}
WORKDIR ${INSTDIR} WORKDIR ${INSTDIR}

View file

@ -10,9 +10,9 @@ echo "Finished!"
find ${BASEDIR} -name \*.dso -execdir /bin/rm {} \; find ${BASEDIR} -name \*.dso -execdir /bin/rm {} \;
cd $WINEPREFIX/drive_c/Dynamix/Tribes2/GameData cd $WINEPREFIX/drive_c/Dynamix/Tribes2/GameData
wine --version wine --version
echo "Running the Tribes 2 server" 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

View file

@ -52,10 +52,11 @@ fi
# -- download files # -- download files
get_files tribes2gsi.exe "https://www.the-construct.net/downloads/tribes2/" "$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 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 msvcrt-ruby190.zip "https://www.dropbox.com/s/bvh9631a4mtuisf/msvcrt-ruby190.zip" "$TMPBASE"
get_files classic_v152.zip "https://tribes2stats.com/files/mods/" "$TMPBASE" get_files classic_v152.zip "https://tribes2stats.com/files/mods/" "$TMPBASE"
# -- some items require an headerless # -- some items require an headerless
export DISPLAY=:99 export DISPLAY=:99
@ -255,10 +256,8 @@ echo "Running Patches and Updates..."
# -- install tribesnext silently # -- install tribesnext silently
[ -f $TMPBASE/TribesNext_rc2a.exe ] && /usr/bin/wine $TMPBASE/TribesNext_rc2a.exe /S [ -f $TMPBASE/TribesNext_rc2a.exe ] && /usr/bin/wine $TMPBASE/TribesNext_rc2a.exe /S
# -- extract updated msvcrt and replace the existing installation
# -- extract updated linux version 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
[ -f $TMPBASE/TribesNext_RC2_LinuxVersion.zip ] && /usr/bin/unzip -o $TMPBASE/TribesNext_RC2_LinuxVersion.zip -d $INSBASE/Tribes2/GameData 2>&1 > /dev/null
# -- update Classic mod to v1.5.2 # -- 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 [ -f $TMPBASE/classic_v152.zip ] && /usr/bin/unzip -o $TMPBASE/classic_v152.zip -d $TMPBASE/classic 2>&1 > /dev/null