Add openSUSE Leap 15.5

ddterm · Jan 23, 2024 · d2fd8b7 · d2fd8b7
1 parent 06ee3f3
commit d2fd8b7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
@@ -48,6 +48,9 @@ jobs:
           - image: opensuse-tumbleweed
             dockerfile: suse.dockerfile
 
+          - image: opensuse-leap-15.5
+            dockerfile: suse.dockerfile
+
     timeout-minutes: 10
     env:
       IMAGE: ghcr.io/${{ github.repository }}/${{ matrix.image }}

diff --git a/common/etc/systemd/user/[email protected] b/common/etc/systemd/user/[email protected]
@@ -7,4 +7,4 @@ After=dbus-proxy@%i.socket
 
 [Service]
 Type=exec
-ExecStart=/lib/systemd/systemd-socket-proxyd %t/bus
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd %t/bus
diff --git a/suse.dockerfile b/suse.dockerfile
@@ -1,8 +1,13 @@
-FROM registry.opensuse.org/opensuse/tumbleweed:latest@sha256:315e8aa25f0f3443cf8655770a4234de31d14febeae279f86355e44c97ffe4e1
+ARG base_image=tumbleweed
+
+FROM registry.opensuse.org/opensuse/tumbleweed:latest@sha256:315e8aa25f0f3443cf8655770a4234de31d14febeae279f86355e44c97ffe4e1 AS opensuse-tumbleweed
+FROM registry.opensuse.org/opensuse/leap@sha256:7af460be8435e89419d9c72678bf2a01b2f5ed0a1ad14b7df34e41a0782544c4 AS opensuse-leap-15.5
+
+FROM ${base_image}
 
 RUN zypper --non-interactive install --no-recommends \
-        xorg-x11-server-Xvfb gjs gdm gnome-session-wayland gnome-extensions gtk3-metatheme-adwaita \
-        typelib-1_0-Vte-2_91 PackageKit typelib-1_0-PackageKitGlib-1_0 typelib-1_0-Handy-1_0 wl-clipboard && zypper clean --all
+        systemd-sysvinit xorg-x11-server-Xvfb gjs gdm gnome-session-wayland gnome-extensions gtk3-metatheme-adwaita \
+        typelib-1_0-Vte-2.91 PackageKit typelib-1_0-PackageKitGlib-1_0 typelib-1_0-Handy-1_0 wl-clipboard && zypper clean --all
 
 COPY common suse /
 
@@ -28,4 +33,4 @@ LABEL x11-port=6099 x11-display-number=99
 
 HEALTHCHECK CMD busctl --watch-bind=true status && systemctl is-system-running --wait
 
-CMD [ "/sbin/init", "systemd.unified_cgroup_hierarchy=0" ]
+CMD [ "/usr/sbin/init", "systemd.unified_cgroup_hierarchy=0" ]