3 files changed, 30 insertions, 1 deletions
diff --git a/molecule/default/Dockerfile.ubuntu.j2 b/molecule/default/Dockerfile.ubuntu-noble.j2
index 63ceca0..63ceca0 100644
--- a/molecule/default/Dockerfile.ubuntu.j2
+++ b/molecule/default/Dockerfile.ubuntu-noble.j2
diff --git a/molecule/default/Dockerfile.ubuntu-resolute.j2 b/molecule/default/Dockerfile.ubuntu-resolute.j2
new file mode 100644
index 0000000..1e52cb3
--- /dev/null
+++ b/molecule/default/Dockerfile.ubuntu-resolute.j2
@@ -0,0 +1,27 @@
+# Based on the amazing work of geerlingguy <3
+# FROM docker.io/geerlingguy/docker-ubuntu2404-ansible
+FROM docker.io/library/ubuntu:resolute
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+ENV container docker
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        locales systemd python3 parted dosfstools \
+    && apt-get clean \
+    && rm -Rf /var/lib/apt/lists/* \
+    && rm -Rf /usr/share/doc \
+    && rm -Rf /usr/share/man
+
+# Fix potential UTF-8 errors with ansible-test.
+RUN locale-gen en_US.UTF-8
+
+# Remove unnecessary getty and udev targets that result in high CPU usage when using
+# multiple containers with Molecule (https://github.com/ansible/molecule/issues/1104)
+RUN rm -f /lib/systemd/system/systemd*udev* \
+  && rm -f /lib/systemd/system/getty.target
+
+VOLUME ["/sys/fs/cgroup", "/tmp", "/run", "/opt"]
+
+CMD ["/lib/systemd/systemd"]
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index 76b7787..6347834 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -8,7 +8,9 @@
         scenario_vars:
           archlinux:
             hostname: "desktop.local"
-          ubuntu:
+          ubuntu-noble:
+            hostname: "laptop.local"
+          ubuntu-resolute:
             hostname: "laptop.local"
           raspberrypi:
             hostname: "rpi5.local"