Seungmin Kim 1 год назад
Родитель
Сommit
327aa1afaf
3 измененных файлов с 2 добавлено и 6 удалено
  1. 0 4
      Dockerfile
  2. 1 1
      entrypoint.sh
  3. 1 1
      supervisord.conf

+ 0 - 4
Dockerfile

@@ -17,7 +17,6 @@ RUN apt-get clean && apt-get update && apt-get dist-upgrade -y && apt-get instal
     apt-utils \
     dbus-user-session \
     fakeroot \
-    fuse \
     locales \
     ssl-cert \
     sudo \
@@ -118,8 +117,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         libvulkan-dev \
         ocl-icd-libopencl1 \
         clinfo \
-        dbus-x11 \
-        libdbus-c++-1-0v5 \
         xkb-data \
         xauth \
         xbitmaps \
@@ -311,7 +308,6 @@ Pin-Priority: -1" > /etc/apt/preferences.d/firefox-nosnap && \
         desktop-file-utils \
         dolphin \
         dolphin-plugins \
-        dbus-x11 \
         enchant-2 \
         fcitx \
         fcitx-frontend-gtk2 \

+ 1 - 1
entrypoint.sh

@@ -138,7 +138,7 @@ fi
 
 # Start KDE desktop environment
 export XDG_SESSION_ID="${DISPLAY#*:}"
-/usr/bin/dbus-launch --exit-with-session /usr/bin/startplasma-x11 &
+/usr/bin/startplasma-x11 &
 
 # Start Fcitx input method framework
 /usr/bin/fcitx &

+ 1 - 1
supervisord.conf

@@ -25,7 +25,7 @@ serverurl=unix:///tmp/supervisor.sock
 files = /etc/supervisor/conf.d/*.conf
 
 [program:entrypoint]
-command=bash -c "/etc/entrypoint.sh"
+command=bash -c "dbus-run-session -- /etc/entrypoint.sh"
 stdout_logfile=/tmp/entrypoint.log
 stdout_logfile_backups=0
 redirect_stderr=true