From 9b168d42353ab1aaf340505eae66eb7cfdab30d6 Mon Sep 17 00:00:00 2001
From: xfnw <xfnw@ttm.sh>
Date: Tue, 25 May 2021 20:30:17 -0400
Subject: [PATCH] aaa

---
 Dockerfile           |  7 ++++---
 etc/supervisord.conf | 14 ++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9af331e..55297af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,17 @@
 FROM alpine:latest
-RUN apk add dbus xorg-server xf86-input-libinput eudev xspice supervisor firefox pulseaudio pulseaudio-alsa alsa-plugins-pulse\
+RUN apk add dbus-x11 xorg-server xf86-input-libinput eudev xspice supervisor firefox pulseaudio pulseaudio-alsa alsa-plugins-pulse\
 && addgroup bnuuy \
 && adduser  -G bnuuy -s /bin/sh -D bnuuy \
 && rm -rf /apk /tmp/* /var/cache/apk/*
 ADD etc /etc
 RUN mkdir /tmp/audio_fifo\
 && echo "default-sink = fifo_output" >> /etc/pulse/client.conf \
+&& echo "load-module module-null-sink" >> /etc/pulse/default.pa \
+&& echo "load-module module-always-sink" >> /etc/pulse/default.pa \
 && echo "load-module module-x11-publish" >> /etc/pulse/default.pa \
 && echo "load-module module-pipe-sink sink_name=fifo_output file=/tmp/audio_fifo/audio.fifo format=s16 rate=48000 channels=2" >> /etc/pulse/default.pa
 WORKDIR /home/bnuuy
 ADD mozilla .mozilla/
-RUN chown -R bnuuy:bnuuy .mozilla/
+RUN chown -R bnuuy:bnuuy .mozilla/ /tmp/audio_fifo
 EXPOSE 5900
-USER bnuuy
 CMD ["/usr/bin/supervisord","-c","/etc/supervisord.conf"]
diff --git a/etc/supervisord.conf b/etc/supervisord.conf
index 9135d4f..1edfde0 100644
--- a/etc/supervisord.conf
+++ b/etc/supervisord.conf
@@ -1,11 +1,6 @@
 [supervisord]
 nodaemon=true
-
-[program:dbus]
-command=/usr/bin/dbus-daemon --session
 user=bnuuy
-autorestart=true
-priority=100
 
 [program:xspice]
 command=/usr/bin/Xspice --port 5900 --audio-fifo-dir=/tmp/audio_fifo --disable-ticketing :1
@@ -13,9 +8,16 @@ user=bnuuy
 autorestart=true
 priority=200
 
+[program:pulse]
+environment=HOME="/home/bnuuy",DISPLAY=":1",USER="bnuuy"
+command=/usr/bin/pulseaudio
+user=bnuuy
+autorestart=true
+priority=300
+
 [program:firefox]
 environment=HOME="/home/bnuuy",DISPLAY=":1",USER="bnuuy"
 command=/usr/bin/firefox -width 1366 -height 768
 user=bnuuy
 autorestart=true
-priority=300
+priority=400