From e417ec5dbe6ef3601f1f7ac38fa33c2eb41e9164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Sun, 9 Apr 2023 15:42:33 +0200 Subject: [PATCH] add XDG_RUNTIME_DIR to env. --- .docker/base/Dockerfile | 8 ++++++-- .docker/base/Dockerfile.arm | 8 ++++++-- .docker/base/Dockerfile.intel | 8 ++++++-- .docker/base/Dockerfile.nvidia | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.docker/base/Dockerfile b/.docker/base/Dockerfile index 87b6077b..8d704cf6 100644 --- a/.docker/base/Dockerfile +++ b/.docker/base/Dockerfile @@ -96,9 +96,12 @@ RUN set -eux; \ chown $USERNAME /tmp/.X11-unix/; \ # # make directories for neko - mkdir -p /etc/neko /var/www /var/log/neko /home/$USERNAME/.config/pulse /home/$USERNAME/.local/share/xorg; \ + mkdir -p /etc/neko /var/www /var/log/neko \ + /tmp/runtime-$USERNAME \ + /home/$USERNAME/.config/pulse \ + /home/$USERNAME/.local/share/xorg; \ chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/; \ + chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ chown -R $USERNAME:$USERNAME /home/$USERNAME; \ # # clean up @@ -117,6 +120,7 @@ COPY .docker/base/xorg.conf /etc/neko/xorg.conf ENV USER=$USERNAME ENV DISPLAY=:99.0 ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket +ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME ENV NEKO_PASSWORD=neko ENV NEKO_PASSWORD_ADMIN=admin ENV NEKO_BIND=:8080 diff --git a/.docker/base/Dockerfile.arm b/.docker/base/Dockerfile.arm index c9d633c0..f8a6fcd7 100644 --- a/.docker/base/Dockerfile.arm +++ b/.docker/base/Dockerfile.arm @@ -102,9 +102,12 @@ RUN set -eux; \ chown $USERNAME /tmp/.X11-unix/; \ # # make directories for neko - mkdir -p /etc/neko /var/www /var/log/neko /home/$USERNAME/.config/pulse /home/$USERNAME/.local/share/xorg; \ + mkdir -p /etc/neko /var/www /var/log/neko \ + /tmp/runtime-$USERNAME \ + /home/$USERNAME/.config/pulse \ + /home/$USERNAME/.local/share/xorg; \ chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/; \ + chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ chown -R $USERNAME:$USERNAME /home/$USERNAME; \ # # clean up @@ -123,6 +126,7 @@ COPY .docker/base/xorg.conf /etc/neko/xorg.conf ENV USER=$USERNAME ENV DISPLAY=:99.0 ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket +ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME ENV NEKO_PASSWORD=neko ENV NEKO_PASSWORD_ADMIN=admin ENV NEKO_BIND=:8080 diff --git a/.docker/base/Dockerfile.intel b/.docker/base/Dockerfile.intel index 0abcb889..0c327d17 100644 --- a/.docker/base/Dockerfile.intel +++ b/.docker/base/Dockerfile.intel @@ -105,9 +105,12 @@ RUN set -eux; \ chown $USERNAME /tmp/.X11-unix/; \ # # make directories for neko - mkdir -p /etc/neko /var/www /var/log/neko /home/$USERNAME/.config/pulse /home/$USERNAME/.local/share/xorg; \ + mkdir -p /etc/neko /var/www /var/log/neko \ + /tmp/runtime-$USERNAME \ + /home/$USERNAME/.config/pulse \ + /home/$USERNAME/.local/share/xorg; \ chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/; \ + chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ chown -R $USERNAME:$USERNAME /home/$USERNAME; \ # # clean up @@ -127,6 +130,7 @@ COPY .docker/base/intel/add-render-group.sh /usr/bin/add-render-group.sh ENV USER=$USERNAME ENV DISPLAY=:99.0 ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket +ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME ENV NEKO_PASSWORD=neko ENV NEKO_PASSWORD_ADMIN=admin ENV NEKO_BIND=:8080 diff --git a/.docker/base/Dockerfile.nvidia b/.docker/base/Dockerfile.nvidia index 68366bca..d0140560 100644 --- a/.docker/base/Dockerfile.nvidia +++ b/.docker/base/Dockerfile.nvidia @@ -201,9 +201,12 @@ RUN set -eux; \ chown $USERNAME /tmp/.X11-unix/; \ # # make directories for neko - mkdir -p /etc/neko /var/www /var/log/neko /home/$USERNAME/.config/pulse /home/$USERNAME/.local/share/xorg; \ + mkdir -p /etc/neko /var/www /var/log/neko \ + /tmp/runtime-$USERNAME \ + /home/$USERNAME/.config/pulse \ + /home/$USERNAME/.local/share/xorg; \ chmod 1777 /var/log/neko; \ - chown $USERNAME /var/log/neko/; \ + chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \ chown -R $USERNAME:$USERNAME /home/$USERNAME; \ # # clean up @@ -263,6 +266,7 @@ COPY .docker/base/nvidia/entrypoint.sh /bin/entrypoint.sh ENV USER=$USERNAME ENV DISPLAY=:99.0 ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket +ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME ENV NEKO_PASSWORD=neko ENV NEKO_PASSWORD_ADMIN=admin ENV NEKO_BIND=:8080