diff --git a/Dockerfile b/Dockerfile index 3a723f00..f1ea73a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -103,10 +103,6 @@ RUN set -eux; \ adduser $USERNAME video; \ adduser $USERNAME pulse; \ # - # setup pulseaudio - mkdir -p /home/$USERNAME/.config/pulse/; \ - echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ - # # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 mkdir /tmp/.X11-unix; \ chmod 1777 /tmp/.X11-unix; \ @@ -154,6 +150,7 @@ COPY runtime/fonts /usr/local/share/fonts # set default envs ENV USER=$USERNAME ENV DISPLAY=:99.0 +ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket ENV NEKO_SERVER_BIND=:8080 ENV NEKO_PLUGINS_ENABLED=true ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/ diff --git a/Dockerfile.nvidia b/Dockerfile.nvidia index 22daae35..df8396c2 100644 --- a/Dockerfile.nvidia +++ b/Dockerfile.nvidia @@ -119,10 +119,6 @@ RUN set -eux; \ adduser $USERNAME video; \ adduser $USERNAME pulse; \ # - # setup pulseaudio - mkdir -p /home/$USERNAME/.config/pulse/; \ - echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ - # # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 mkdir /tmp/.X11-unix; \ chmod 1777 /tmp/.X11-unix; \ @@ -199,6 +195,7 @@ COPY runtime/fonts /usr/local/share/fonts # set default envs ENV USER=$USERNAME ENV DISPLAY=:99.0 +ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket ENV NEKO_SERVER_BIND=:8080 ENV NEKO_PLUGINS_ENABLED=true ENV NEKO_PLUGINS_DIR=/etc/neko/plugins/