Add support for Debian Trixie

cisagov · Oct 18, 2023 · 6442bac · 6442bac
1 parent 1666745
commit 6442bac
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git 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-no-systemd.yml b/molecule/default/molecule-no-systemd.yml
@@ -23,6 +23,9 @@ platforms:
   - image: debian:bookworm-slim
     name: debian12
     platform: amd64
+  - image: debian:trixie-slim
+    name: debian13
+    platform: amd64
   - image: kalilinux/kali-rolling
     name: kali
     platform: amd64

diff --git a/molecule/default/molecule-with-systemd.yml b/molecule/default/molecule-with-systemd.yml
@@ -39,13 +39,22 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
-    image: cisagov/docker-debian12-ansible:latest
+    image: geerlingguy/docker-debian12-ansible:latest
     name: debian12-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: 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: cisagov/docker-kali-ansible:latest

diff --git a/molecule/systemd_enabled/molecule.yml b/molecule/systemd_enabled/molecule.yml
@@ -39,13 +39,22 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
-    image: cisagov/docker-debian12-ansible:latest
+    image: geerlingguy/docker-debian12-ansible:latest
     name: debian12-systemd
     platform: amd64
     pre_build_image: yes
     privileged: yes
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
+  - cgroupns_mode: host
+    command: /lib/systemd/systemd
+    image: cisagov/docker-debian13-ansible:latest
+    name: debian13-systemd
+    platform: amd64
+    pre_build_image: yes
+    privileged: yes
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
   - cgroupns_mode: host
     command: /lib/systemd/systemd
     image: cisagov/docker-kali-ansible:latest