Fix container build issues

Dockerfile

@@ -151,7 +151,6 @@ RUN dpkg --add-architecture i386 && \
         i965-va-driver-shaders:i386 \
         intel-media-va-driver-non-free \
         intel-media-va-driver-non-free:i386 \
-        libmfx-tools \
         libva2 \
         libva2:i386 \
         vainfo \
@@ -248,7 +247,11 @@ RUN mkdir -pm755 /etc/apt/preferences.d && \
     echo "Package: firefox*\n\
 Pin: version 1:1snap*\n\
 Pin-Priority: -1" > /etc/apt/preferences.d/firefox-nosnap && \
-    add-apt-repository -y ppa:mozillateam/ppa && \
+    # Add Mozilla Firefox PPA
+    mkdir -pm755 /etc/apt/trusted.gpg.d && \
+    curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0AB215679C571D1C8325275B9BDB3D89CE49EC21" | gpg --dearmor -o /etc/apt/trusted.gpg.d/mozillateam-ubuntu-ppa.gpg && \
+    mkdir -pm755 /etc/apt/sources.list.d && \
+    echo "deb https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2) main" > "/etc/apt/sources.list.d/mozillateam-ubuntu-ppa-$(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2).list" && \
     apt-get update && apt-get install --no-install-recommends -y \
         kde-plasma-desktop \
         adwaita-icon-theme-full \
@@ -391,7 +394,7 @@ logout=false" > /etc/xdg/kdeglobals
 # Wine, Winetricks, Lutris, and PlayOnLinux, this process must be consistent with https://wiki.winehq.org/Ubuntu
 ARG WINE_BRANCH=staging
 RUN mkdir -pm755 /etc/apt/keyrings && curl -fsSL -o /etc/apt/keyrings/winehq-archive.key "https://dl.winehq.org/wine-builds/winehq.key" && \
-    curl -fsSL -o "/etc/apt/sources.list.d/winehq-$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2).sources" "https://dl.winehq.org/wine-builds/ubuntu/dists/$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2)/winehq-$(grep VERSION_CODENAME= /etc/os-release | cut -d= -f2).sources" && \
+    curl -fsSL -o "/etc/apt/sources.list.d/winehq-$(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2).sources" "https://dl.winehq.org/wine-builds/ubuntu/dists/$(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2)/winehq-$(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2).sources" && \
     apt-get update && apt-get install --install-recommends -y \
         winehq-${WINE_BRANCH} && \
     apt-get install --no-install-recommends -y \
@@ -455,7 +458,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         va-driver-all \
         i965-va-driver-shaders \
         intel-media-va-driver-non-free \
-        libmfx-tools \
         libva2 \
         vainfo \
         intel-gpu-tools \

entrypoint.sh

@@ -23,6 +23,8 @@ export PATH="${PATH}:/usr/local/games:/usr/games:/opt/VirtualGL/bin"
 # Add LibreOffice to library path
 export LD_LIBRARY_PATH="/usr/lib/libreoffice/program:${LD_LIBRARY_PATH}"
 
+# Start DBus without systemd
+sudo /etc/init.d/dbus start
 # Configure environment for selkies-gstreamer utilities
 source /opt/gstreamer/gst-env
 
@@ -50,9 +52,9 @@ fi
 if [ -n "$(nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)" ]; then
   export VGL_DISPLAY="${VGL_DISPLAY:-egl}"
   export VGL_REFRESHRATE="$REFRESH"
-  /usr/bin/vglrun +wm /usr/bin/dbus-launch /usr/bin/startplasma-x11 &
+  /usr/bin/vglrun +wm /usr/bin/startplasma-x11 &
 else
-  /usr/bin/dbus-launch /usr/bin/startplasma-x11 &
+  /usr/bin/startplasma-x11 &
 fi
 
 # Start Fcitx input method framework