Remove dbus (#55)

* remove dbus.

* xfce needs dbus installed.

.devcontainer/Dockerfile

@@ -58,7 +58,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
         wget ca-certificates supervisor \
-        pulseaudio dbus-x11 xserver-xorg-video-dummy \
+        pulseaudio xserver-xorg-video-dummy \
         libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 \
         #
         # needed for profile upload preStop hook
@@ -122,7 +122,6 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/
 COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so
 
 # copy runtime files
-COPY runtime/dbus /usr/bin/dbus
 COPY runtime/default.pa /etc/pulse/default.pa
 COPY runtime/supervisord.conf /etc/neko/supervisord.conf
 COPY runtime/xorg.conf /etc/neko/xorg.conf
@@ -133,8 +132,7 @@ COPY dev/runtime/config.yml /etc/neko/neko.yml
 COPY dev/runtime/supervisord.conf /etc/neko/supervisord/dev.conf
 
 # customized scripts
-RUN chmod +x /usr/bin/dbus;\
+RUN echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \
-    echo '#!/bin/sh\nsleep infinity' > /usr/bin/neko; \
     chmod +x /usr/bin/neko; \
     echo '#!/bin/sh\nsudo sh -c "export USER='$USERNAME'\nexport HOME=/home/'$USERNAME'\n/usr/bin/supervisord -c /etc/neko/supervisord.conf"' > /usr/bin/deps; \
     chmod +x /usr/bin/deps; \

Dockerfile

@@ -79,7 +79,7 @@ RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         wget ca-certificates supervisor \
-        pulseaudio dbus-x11 xserver-xorg-video-dummy \
+        pulseaudio xserver-xorg-video-dummy \
         libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libxcvt0 \
         #
         # needed for profile upload preStop hook
@@ -133,7 +133,6 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xor
 #
 # copy runtime configs
 COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources
-COPY runtime/dbus /usr/bin/dbus
 COPY runtime/default.pa /etc/pulse/default.pa
 COPY runtime/supervisord.conf /etc/neko/supervisord.conf
 COPY runtime/xorg.conf /etc/neko/xorg.conf

Dockerfile.nvidia

@@ -189,7 +189,7 @@ RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         wget ca-certificates supervisor \
-        pulseaudio dbus-x11 xserver-xorg-video-dummy \
+        pulseaudio xserver-xorg-video-dummy \
         libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx7 libx264-163 libvo-aacenc0 librtmp1 libxcvt0 \
         libgtk-3-bin software-properties-common cabextract aptitude vim curl \
         #
@@ -279,7 +279,6 @@ RUN set -eux; \
 #
 # copy runtime configs
 COPY --chown=neko:neko runtime/.Xresources /home/$USERNAME/.Xresources
-COPY runtime/dbus /usr/bin/dbus
 COPY runtime/default.pa /etc/pulse/default.pa
 COPY runtime/supervisord.conf /etc/neko/supervisord.conf
 COPY runtime/xorg.conf /etc/neko/xorg.conf

dev/runtime/Dockerfile

@@ -7,7 +7,7 @@ ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lan
 # install xfce and firefox
 RUN set -eux; apt-get update; \
     apt-get install -y --no-install-recommends \
-        xfce4 xfce4-terminal sudo \
+        dbus-x11 xfce4 xfce4-terminal sudo \
         xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \
     #
     # fetch latest firefox release

runtime/dbus

@@ -1,11 +0,0 @@
-#!/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

runtime/supervisord.conf

@@ -8,16 +8,6 @@ logfile_maxbytes=0
 [include]
 files=/etc/neko/supervisord/*.conf
 
-[program:dbus]
-environment=HOME="/root",USER="root"
-command=/usr/bin/dbus
-autorestart=true
-priority=100
-user=root
-stdout_logfile=/dev/stderr
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-
 [program:x-server]
 environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
 command=/usr/bin/X %(ENV_DISPLAY)s -config /etc/neko/xorg.conf -noreset -nolisten tcp