Add ability to disable audio socket for webUI
This commit is contained in:
@@ -363,8 +363,12 @@ ENV \
|
|||||||
DISPLAY_VIDEO_PORT="DFP" \
|
DISPLAY_VIDEO_PORT="DFP" \
|
||||||
DISPLAY=":55" \
|
DISPLAY=":55" \
|
||||||
NVIDIA_DRIVER_CAPABILITIES="all" \
|
NVIDIA_DRIVER_CAPABILITIES="all" \
|
||||||
NVIDIA_VISIBLE_DEVICES="all" \
|
NVIDIA_VISIBLE_DEVICES="all"
|
||||||
MODE="primary"
|
|
||||||
|
# Set container configuration environment variables
|
||||||
|
ENV \
|
||||||
|
MODE="primary" \
|
||||||
|
ENABLE_VNC_AUDIO="true"
|
||||||
|
|
||||||
# Be sure that the noVNC port is exposed
|
# Be sure that the noVNC port is exposed
|
||||||
EXPOSE 8083
|
EXPOSE 8083
|
||||||
|
|||||||
@@ -1,20 +1,30 @@
|
|||||||
|
|
||||||
echo "**** Configure pulseaudio socket ****"
|
echo "**** Configure pulseaudio ****"
|
||||||
sed -i 's|^; default-server.*$|default-server = unix:/tmp/pulseaudio.socket|' /etc/pulse/client.conf
|
if [[ "${ENABLE_VNC_AUDIO}" == "true" ]]; then
|
||||||
sed -i 's|^load-module module-native-protocol-unix.*$|load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1|' \
|
echo "Configure pulseaudio to use a socket to pipe audio to VNC"
|
||||||
/etc/pulse/default.pa
|
sed -i 's|^; default-server.*$|default-server = unix:/tmp/pulseaudio.socket|' /etc/pulse/client.conf
|
||||||
chown -R ${USER} /etc/pulse
|
sed -i 's|^load-module module-native-protocol-unix.*$|load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1|' \
|
||||||
|
/etc/pulse/default.pa
|
||||||
|
chown -R ${USER} /etc/pulse
|
||||||
|
|
||||||
|
# Credits for this audio patch:
|
||||||
|
# - https://github.com/novnc/noVNC/issues/302
|
||||||
|
# - https://github.com/vexingcodes/dwarf-fortress-docker
|
||||||
|
# - https://github.com/calebj/noVNC
|
||||||
|
if [ -f /opt/noVNC/audio.patch ]; then
|
||||||
|
echo "Patching noVNC with audio websocket"
|
||||||
|
pushd /opt/noVNC/ &> /dev/null
|
||||||
|
patch -p1 --input=/opt/noVNC/audio.patch --batch --quiet
|
||||||
|
popd &> /dev/null
|
||||||
|
rm /opt/noVNC/audio.patch
|
||||||
|
fi
|
||||||
|
# Enable supervisord script
|
||||||
|
sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor/conf.d/audio.conf
|
||||||
|
else
|
||||||
|
echo "Disable pulseaudio"
|
||||||
|
# Disable supervisord script
|
||||||
|
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor/conf.d/audio.conf
|
||||||
|
|
||||||
# Credits for this audio patch:
|
|
||||||
# - https://github.com/novnc/noVNC/issues/302
|
|
||||||
# - https://github.com/vexingcodes/dwarf-fortress-docker
|
|
||||||
# - https://github.com/calebj/noVNC
|
|
||||||
if [ -f /opt/noVNC/audio.patch ]; then
|
|
||||||
echo "**** Patching noVNC with audio websocket ****"
|
|
||||||
pushd /opt/noVNC/ &> /dev/null
|
|
||||||
patch -p1 --input=/opt/noVNC/audio.patch --batch --quiet
|
|
||||||
popd &> /dev/null
|
|
||||||
rm /opt/noVNC/audio.patch
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "DONE"
|
echo "DONE"
|
||||||
|
|||||||
Reference in New Issue
Block a user