From 953c1d3c03ac6b7e6baa638f1c8d675cf54bd78e Mon Sep 17 00:00:00 2001
From: Jimmy Thrasibule <dev@jimmy.lt>
Date: Sun, 31 May 2026 11:25:21 +0200
Subject: [PATCH] containers: Install dbus-broker

dbus-broker is a drop-in replacement for the traditional D-Bus message daemon
that is optimized specifically for modern Linux and systemd.

In the Ubuntu containers, the `dbus-broker` package depends on the
`systemd-sysv` packages which installs `/sbin/init`. To avoid later
confusion, the `systemd-sysv` package is made an explicit dependency.

Signed-off-by: Jimmy Thrasibule <dev@jimmy.lt>
---
 containers/fedora/44/Containerfile    | 3 +++
 containers/ubuntu/24.04/Containerfile | 3 ++-
 containers/ubuntu/26.04/Containerfile | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/containers/fedora/44/Containerfile b/containers/fedora/44/Containerfile
index 1266705..4b0fa23 100644
--- a/containers/fedora/44/Containerfile
+++ b/containers/fedora/44/Containerfile
@@ -4,6 +4,7 @@ RUN dnf -y upgrade && \
     dnf -y --setopt=install_weak_deps=false install \
     acl \
     bzip2 \
+    dbus-broker \
     file \
     findutils \
     gcc \
@@ -54,6 +55,8 @@ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == system
     rm -f /lib/systemd/system/basic.target.wants/*; \
     rm -f /lib/systemd/system/anaconda.target.wants/*;
 
+RUN systemctl enable dbus.socket
+
 RUN ssh-keygen -A
 RUN localedef --quiet -c -i en_US -f UTF-8 en_US.UTF-8
 RUN systemctl enable sshd.service
diff --git a/containers/ubuntu/24.04/Containerfile b/containers/ubuntu/24.04/Containerfile
index 53d809a..cc224b9 100644
--- a/containers/ubuntu/24.04/Containerfile
+++ b/containers/ubuntu/24.04/Containerfile
@@ -6,6 +6,7 @@ RUN apt-get update -y && \
     acl \
     bzip2 \
     curl \
+    dbus-broker \
     debhelper \
     debianutils \
     devscripts \
@@ -46,6 +47,7 @@ RUN apt-get update -y && \
     sshpass \
     sudo \
     systemd \
+    systemd-sysv \
     tzdata \
     unzip \
     virtualenv \
@@ -56,7 +58,6 @@ RUN apt-get update -y && \
     && \
     rm -rf /var/lib/apt/lists/*
 
-RUN ln -s /lib/systemd/systemd /sbin/init
 RUN rm /etc/apt/apt.conf.d/docker-clean
 RUN locale-gen en_US.UTF-8
 
diff --git a/containers/ubuntu/26.04/Containerfile b/containers/ubuntu/26.04/Containerfile
index 5361e12..75e1179 100644
--- a/containers/ubuntu/26.04/Containerfile
+++ b/containers/ubuntu/26.04/Containerfile
@@ -6,6 +6,7 @@ RUN apt-get update -y && \
     acl \
     bzip2 \
     curl \
+    dbus-broker \
     debhelper \
     debianutils \
     devscripts \
@@ -46,6 +47,7 @@ RUN apt-get update -y && \
     sshpass \
     sudo-rs \
     systemd \
+    systemd-sysv \
     tzdata \
     unzip \
     virtualenv \
@@ -56,7 +58,6 @@ RUN apt-get update -y && \
     && \
     rm -rf /var/lib/apt/lists/*
 
-RUN ln -s /lib/systemd/systemd /sbin/init
 RUN rm /etc/apt/apt.conf.d/docker-clean
 RUN locale-gen en_US.UTF-8