From 13817df1e4368b34bf24d379f0b22d9e5a7bc91e Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 21 Apr 2020 19:59:08 +0000 Subject: [PATCH] docker deps update --- .docker/files/deps/Dockerfile | 4 +++- .docker/files/deps/dbus | 11 +++++++++++ .docker/files/deps/default.pa | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100755 .docker/files/deps/dbus create mode 100644 .docker/files/deps/default.pa diff --git a/.docker/files/deps/Dockerfile b/.docker/files/deps/Dockerfile index 715083a8..e81d5662 100644 --- a/.docker/files/deps/Dockerfile +++ b/.docker/files/deps/Dockerfile @@ -3,7 +3,7 @@ FROM debian:stretch-slim # # install neko dependencies RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends pulseaudio openbox dbus-x11 xserver-xorg-video-dummy supervisor; \ + apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy; \ apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx4; \ # # clean up @@ -19,3 +19,5 @@ ENV PKG_CONFIG_PATH=/gst/local/lib/pkgconfig:$PKG_CONFIG_PATH # # copy gst COPY .build/gst/local /gst/local/ +COPY .docker/files/deps/dbus /usr/bin/dbus +COPY .docker/files/deps/default.pa /etc/pulse/default.pa \ No newline at end of file diff --git a/.docker/files/deps/dbus b/.docker/files/deps/dbus new file mode 100755 index 00000000..2859a0e2 --- /dev/null +++ b/.docker/files/deps/dbus @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ ! -d /var/run/dbus ]; then + mkdir -p /var/run/dbus +fi + +if [ -f /var/run/dbus/pid ]; then + rm -f /var/run/dbus/pid +fi + +/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf \ No newline at end of file diff --git a/.docker/files/deps/default.pa b/.docker/files/deps/default.pa new file mode 100644 index 00000000..799bba55 --- /dev/null +++ b/.docker/files/deps/default.pa @@ -0,0 +1,7 @@ +#!/usr/bin/pulseaudio -nF + +# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices +load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1 + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink \ No newline at end of file