diff --git a/docker/dedicated-server/Dockerfile b/docker/dedicated-server/Dockerfile index 95909508a..e2dd48610 100644 --- a/docker/dedicated-server/Dockerfile +++ b/docker/dedicated-server/Dockerfile @@ -8,14 +8,34 @@ RUN dpkg --add-architecture i386 \ && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ - wine \ - wine64 \ - wine32:i386 \ xwayland-run \ cage \ + curl \ tini \ && rm -rf /var/lib/apt/lists/* +# Wine from the upstream repo +RUN mkdir -pm755 /etc/apt/keyrings && \ + curl -fsSL https://dl.winehq.org/wine-builds/winehq.key \ + -o /etc/apt/keyrings/winehq-archive.key && \ + curl -fsSL https://dl.winehq.org/wine-builds/debian/dists/trixie/winehq-trixie.sources \ + -o /etc/apt/sources.list.d/winehq-trixie.sources && \ + apt-get update && \ + apt-get install -y --install-recommends winehq-devel + +# UMU +RUN set -eux; \ + ver="$( \ + curl -sIL https://github.com/Open-Wine-Components/umu-launcher/releases/latest \ + | grep -i '^location:' \ + | sed -E 's|.*tag/||' \ + | tr -d '\r' \ + )"; \ + curl -Lo /tmp/umu-launcher.deb \ + "https://github.com/Open-Wine-Components/umu-launcher/releases/download/${ver}/python3-umu-launcher_${ver}-1_amd64_ubuntu-noble.deb"; \ + apt-get install -y /tmp/umu-launcher.deb; \ + rm -f /tmp/umu-launcher.deb; + ENV PROTON_ENABLE_WAYLAND=1 ENV WINEARCH=win64 ENV WINEPREFIX=/var/opt/minecraft_lce