From 9949fc8b7330295c37c8cd99ac6aa421ddef7e91 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 13 Oct 2023 11:05:44 -0400 Subject: [PATCH 1/2] Add support for Debian Trixie --- meta/main.yml | 1 + molecule/default/molecule.yml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index a4323bb..0321430 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -28,6 +28,7 @@ galaxy_info: - buster - bullseye - bookworm + - trixie - name: Fedora versions: - "37" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 12ec2cc..b7a2ab4 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -40,6 +40,15 @@ platforms: privileged: true volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw + - cgroupns_mode: host + command: /lib/systemd/systemd + image: docker.io/cisagov/docker-debian13-ansible:latest + name: debian13-systemd + platform: amd64 + pre_build_image: true + privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host command: /lib/systemd/systemd image: docker.io/cisagov/docker-kali-ansible:latest From fb16c799691171f97dbd242d92c4746b874bb09d Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Wed, 27 Mar 2024 04:52:04 -0400 Subject: [PATCH 2/2] Use a different image for Debian Bookworm testing Now that geerlingguy/docker-debian12-ansible is available we can switch to it instead of using ours. --- molecule/default/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index b7a2ab4..6a0d945 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -33,7 +33,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host command: /lib/systemd/systemd - image: docker.io/cisagov/docker-debian12-ansible:latest + image: docker.io/geerlingguy/docker-debian12-ansible:latest name: debian12-systemd platform: amd64 pre_build_image: true