Clean up linux-appimage image. (#45)

linux-appimage/Dockerfile

@@ -1,55 +1,57 @@
-FROM debian:11
+FROM debian:bullseye-backports
 LABEL maintainer="citraemu"
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Create a user account citra (UID 1027) that the container will run as
-RUN useradd -m -u 1027 -s /bin/bash citra 
-RUN apt-get update && apt-get -y full-upgrade
-RUN apt-get install -y \
-    p7zip-full \
+RUN useradd -m -u 1027 -s /bin/bash citra
+
+# Update system and install packages for building Citra.
+RUN apt-get update && apt-get full-upgrade -y -t bullseye-backports
+RUN apt-get install -y -t bullseye-backports \
     build-essential \
-    software-properties-common \
     libsdl2-dev \
+    libssl-dev \
+# Qt 5
     qtbase5-dev \
     qtbase5-private-dev \
     libqt5opengl5-dev \
     qtmultimedia5-dev \
     qttools5-dev \
     qttools5-dev-tools \
+    qt5-gtk-platformtheme \
+    qt5ct \
+    qt5-style-plugins \
+    libqt5opengl5-dev \
+    libqt5multimedia5-plugins \
+# Qt 6
+    qt6-base-dev \
+    qt6-base-private-dev \
+    qt6-multimedia-dev \
+    qt6-l10n-tools \
+    qt6-tools-dev \
+    qt6-tools-dev-tools \
+    qt6-gtk-platformtheme \
+    qt6-wayland \
+# FFmpeg
+    ffmpeg \
     libavcodec-dev \
+    libavdevice-dev \
     libavfilter-dev \
     libavformat-dev \
+    libswresample-dev \
     libswscale-dev \
+# Tools
+    cmake \
+    p7zip-full \
     wget \
     git \
     ccache \
     ninja-build \
-    libssl-dev \
-    libqt5multimedia5-plugins \
-    ffmpeg \
-    libavdevice-dev \
     glslang-dev \
     glslang-tools \
-    qt5-gtk-platformtheme \
-    qt5ct \
-    qt5-style-plugins \
-    file \
-    && \
-# Install updated version of cmake and missing libfdk-aac-dev, qt6
-    apt-add-repository 'deb http://deb.debian.org/debian bullseye main contrib non-free' && \
-    apt-add-repository 'deb http://deb.debian.org/debian bullseye-backports main contrib non-free' && \
-    apt-get update -y && \
-    apt-get install -y \
-    libfdk-aac-dev \
-    cmake/bullseye-backports \
-    qt6-base-dev \
-    qt6-base-private-dev \
-    libqt6opengl6-dev \
-    qt6-multimedia-dev \
-    qt6-l10n-tools \
-    qt6-tools-dev \
-    qt6-tools-dev-tools
-# Downloading Tools for Building AppImages
+    file
+
+# Download tools for building AppImages
 RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
 RUN wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
 RUN chmod a+x linuxdeploy-x86_64.AppImage