diff --git a/Dockerfile b/Dockerfile index ab5feb3..18e4bbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ ARG SRVDIR=/tmp/tribes2/ ENV INSTDIR=/home/${SRVUSER}/.wine32/drive_c/Dynamix/Tribes2/ # WINE VERSION: wine = 1.6, wine-development = 1.7.29 for i386-jessie -ENV WINEVER=wine-development +ENV WINEVER=wine-stable ENV WINEARCH=win32 ENV WINEPREFIX=/home/${SRVUSER}/.wine32/ @@ -55,7 +55,7 @@ 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 wine-devel=8.16~bookworm-1 wine-devel-i386=8.16~bookworm-1 winehq-devel=8.16~bookworm-1 +RUN apt-get -y install --install-recommends wine-stable=10.0~bookworm-1 wine-stable-i386=10.0~bookworm-1 winehq-stable=10.0~bookworm-1 # INSTALL GAMEMODE #RUN add-apt-repository ppa:samoilov-lex/gamemode diff --git a/_scripts/tribesnext-server-installer b/_scripts/tribesnext-server-installer index a9663a8..ecdec9c 100755 --- a/_scripts/tribesnext-server-installer +++ b/_scripts/tribesnext-server-installer @@ -283,45 +283,45 @@ cp -r $TMPBASE/t2-auth-faster/wine_injector.exe $INSBASE/Tribes2/GameData/wine_i # -- extract needed vcrun22 dlls [ -f $TMPBASE/vcrun22.zip ] && /usr/bin/unzip -o $TMPBASE/vcrun22.zip -d $TMPBASE/vcrun22 2>&1 > /dev/null cp -r $TMPBASE/vcrun22/dlls/. $WINEPREFIX/drive_c/windows/system32/. -echo "[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\27942822A4C04B13EAFEF97C95F63150] 1695592404 -#time=1d9ef318acfaa9a -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\msvcp140.dll" +echo "[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\27942822A4C04B13EAFEF97C95F63150] 1745859623 +#time=1dbb85f0805c6b4 +"915F51E2ADF443844BEEE7CF7E8D4DEE"="C:\\windows\\system32\\msvcp140.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\2D1C5B53B5BE965338BE873EF4C52345] 1695592404 -#time=1d9ef318ad00ec2 -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\concrt140.dll" +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\2D1C5B53B5BE965338BE873EF4C52345] 1745859623 +#time=1dbb85f080687fc +"915F51E2ADF443844BEEE7CF7E8D4DEE"="C:\\windows\\system32\\concrt140.dll" [Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\D8553176F1EDC3731AD2AB9E0064759F] 1695592404 #time=1d9ef318acfc4f8 "F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\msvcp140_1.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\6C9340DAD3CDC2A3FA832B02388D36F9] 1695592404 -#time=1d9ef318acfd4de -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\msvcp140_2.dll" +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\6C9340DAD3CDC2A3FA832B02388D36F9] 1745859623 +#time=1dbb85f08060dfe +"915F51E2ADF443844BEEE7CF7E8D4DEE"="C:\\windows\\system32\\msvcp140_2.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\FD2EFD8F5E4F5484898282946C589AB1] 1695592404 -#time=1d9ef318acfe456 -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\msvcp140_atomic_wait.dll" +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\D2CEC367661A6084E955D760679C2B2C] 1745859613 +#time=1dbb85f01e2cf84 +"1154C0D51AC38FF44AAB0C1E59A7EBAE"="C:\\windows\\syswow64\\msvcp140_atomic_wait.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\1EA31416F42045848B8DD1E28F10CE12] 1695592404 -#time=1d9ef318acffeb4 -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\msvcp140_codecvt_ids.dll" +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\1EA31416F42045848B8DD1E28F10CE12] 1745859623 +#time=1dbb85f080664a2 +"915F51E2ADF443844BEEE7CF7E8D4DEE"="C:\\windows\\system32\\msvcp140_codecvt_ids.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\E9820507FCEB7C2398CD804C84E084B2] 1695592404 -#time=1d9ef318ad02e52 -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\vcamp140.dll" +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\2085E0429CDB18632976C73AF592EEFB] 1745859613 +#time=1dbb85f01e37ccc +"1154C0D51AC38FF44AAB0C1E59A7EBAE"="C:\\windows\\syswow64\\vcamp140.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\FD7D722D8F9DFA339B53B42F4FF7E24A] 1695592404 -#time=1d9ef318ad01f3e -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\vccorlib140.dll" +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\97FC00201A9B4EB359A592AFD9B4A1C5] 1745859613 +#time=1dbb85f01e357b0 +"1154C0D51AC38FF44AAB0C1E59A7EBAE"="C:\\windows\\syswow64\\vccorlib140.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\69D89E5FF7C37D7328F14EBB304D83B4] 1695592404 -#time=1d9ef318ad03d8e -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\vcomp140.dll" +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\69D89E5FF7C37D7328F14EBB304D83B4] 1745859623 +#time=1dbb85f0806e5e4 +"915F51E2ADF443844BEEE7CF7E8D4DEE"="C:\\windows\\system32\\vcomp140.dll" -[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\DF85233BC05724B3B84E35B5849ED74B] 1695592404 -#time=1d9ef318acf8362 -"F2E91D5D9817EF24183029DCF14A752C"="C:\\windows\\system32\\vcruntime140.dll"" > $WINEPREFIX/system.reg +[Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UserData\\S-1-5-18\\Components\\B3D93E8E53F48D638B29B48233F60E14] 1745859613 +#time=1dbb85f01e1af0a +"1154C0D51AC38FF44AAB0C1E59A7EBAE"="C:\\windows\\syswow64\\vcruntime140.dll"" > $WINEPREFIX/system.reg echo "Binding console.log to console.log in logs volume" touch $INSBASE/Tribes2/GameData/console.log