Use Ubuntu session on Ubuntu

.github/workflows/common.yml

@@ -52,13 +52,13 @@ jobs:
             dockerfile: debian.dockerfile
 
           - image: ubuntu-22.04
-            dockerfile: debian.dockerfile
+            dockerfile: ubuntu.dockerfile
 
           - image: ubuntu-24.04
-            dockerfile: debian.dockerfile
+            dockerfile: ubuntu.dockerfile
 
           - image: ubuntu-24.10
-            dockerfile: debian.dockerfile
+            dockerfile: ubuntu.dockerfile
 
           - image: archlinux
             dockerfile: archlinux.dockerfile

debian.dockerfile

@@ -1,10 +1,7 @@
-ARG base_image=ubuntu-24.04
+ARG base_image=debian-12
 
 FROM docker.io/library/debian:12@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS debian-12
 FROM docker.io/library/debian:trixie@sha256:64ed8475618aa290b777fcc3f5d6231f4b7669dcf484229b4c387f31d8456d74 AS debian-13
-FROM docker.io/library/ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS ubuntu-22.04
-FROM docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab AS ubuntu-24.04
-FROM docker.io/library/ubuntu:24.10@sha256:102bc1874fdb136fc2d218473f03cf84135cb7496fefdb9c026c0f553cfe1b6d AS ubuntu-24.10
 
 FROM ${base_image}
 ARG base_image
@@ -16,7 +13,7 @@ RUN apt-get update -y && \
         dbus-user-session \
         gdm3 \
         gir1.2-vte-2.91 \
-        $(if [ $base_image != ubuntu-22.04 ]; then echo gir1.2-vte-3.91; fi) \
+        gir1.2-vte-3.91 \
         xvfb \
         wl-clipboard \
         gir1.2-handy-1

ubuntu.dockerfile

@@ -0,0 +1,29 @@
+ARG base_image=ubuntu-24.04
+
+FROM docker.io/library/ubuntu:22.04@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97 AS ubuntu-22.04
+FROM docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab AS ubuntu-24.04
+FROM docker.io/library/ubuntu:24.10@sha256:102bc1874fdb136fc2d218473f03cf84135cb7496fefdb9c026c0f553cfe1b6d AS ubuntu-24.10
+
+FROM ${base_image}
+ARG base_image
+
+RUN apt-get update -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        ubuntu-desktop-minimal \
+        dbus-user-session \
+        gir1.2-vte-2.91 \
+        $(if [ $base_image != ubuntu-22.04 ]; then echo gir1.2-vte-3.91; fi) \
+        xvfb \
+        wl-clipboard \
+        gir1.2-handy-1
+
+COPY data /
+
+RUN systemctl set-default multi-user.target && \
+    systemctl mask systemd-oomd low-memory-monitor rtkit-daemon udisks2 && \
+    truncate --size 0 /etc/machine-id
+
+ENV GNOME_SHELL_SESSION_MODE=ubuntu
+ENV XDG_CURRENT_DESKTOP=ubuntu:GNOME
+
+CMD [ "/sbin/init" ]