From ef71705c2be491b5a3e36d0c711a986e7e330408 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 25 Aug 2020 13:19:30 +0200 Subject: [PATCH] Add wayland support --- Dockerfile | 2 ++ run.sh | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46fca2e..d556d4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,8 @@ FROM mcr.microsoft.com/dotnet/core/runtime-deps RUN apt-get update \ && apt-get -y install --no-install-recommends \ ffmpeg \ + libegl1-mesa-dev \ + libgbm1 \ libgl1 \ pulseaudio \ && rm -rf /var/lib/apt/lists/* diff --git a/run.sh b/run.sh index e4b477c..1b50125 100755 --- a/run.sh +++ b/run.sh @@ -18,16 +18,16 @@ docker run \ --rm \ -it \ --name osu \ - -e DISPLAY \ - -e PULSE_SERVER=/run/user/$(id -u)/pulse/native \ - -e PULSE_COOKIE=/run/pulse/cookie \ --device /dev/dri \ - --group-add $(getent group video|cut -d: -f3) \ --group-add $(getent group audio|cut -d: -f3) \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -v /run/user/$(id -u)/pulse/native:/run/user/$(id -u)/pulse/native \ - -v "$HOME/.config/pulse/cookie:/run/pulse/cookie" \ + --group-add $(getent group video|cut -d: -f3) \ + -e PULSE_COOKIE=/run/pulse/cookie \ + -e PULSE_SERVER=/run/user/$(id -u)/pulse/native \ + -e WAYLAND_DISPLAY \ + -e XDG_RUNTIME_DIR \ -v "$BASEDIR/data/:/home/osu/osu/" \ -v "$BASEDIR/import/:$BASEDIR/import/" \ + -v "$HOME/.config/pulse/cookie:/run/pulse/cookie" \ + -v "${XDG_RUNTIME_DIR}:${XDG_RUNTIME_DIR}" \ r.sbruder.de/osu \ $@