Skip to content

Commit fc200bc

Browse files
authored
Merge pull request #175 from cisagov/improvement/always-use-systemd-enabled-images
Always use systemd-enabled Docker images
2 parents 680a61f + 02e1530 commit fc200bc

File tree

13 files changed

+91
-248
lines changed

13 files changed

+91
-248
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ jobs:
176176
matrix:
177177
scenario:
178178
- default
179-
- systemd_enabled
180179
steps:
181180
- id: harden-runner
182181
name: Harden the runner

molecule/default/molecule-no-systemd.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

molecule/default/molecule-with-systemd.yml

Lines changed: 0 additions & 97 deletions
This file was deleted.

molecule/default/molecule.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/default/molecule.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
---
2+
dependency:
3+
name: galaxy
4+
driver:
5+
name: docker
6+
platforms:
7+
- cgroupns_mode: host
8+
command: /lib/systemd/systemd
9+
image: geerlingguy/docker-amazonlinux2023-ansible:latest
10+
name: amazonlinux2023-systemd
11+
platform: amd64
12+
pre_build_image: true
13+
privileged: true
14+
volumes:
15+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
16+
- cgroupns_mode: host
17+
command: /lib/systemd/systemd
18+
image: geerlingguy/docker-debian10-ansible:latest
19+
name: debian10-systemd
20+
platform: amd64
21+
pre_build_image: true
22+
privileged: true
23+
volumes:
24+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
25+
- cgroupns_mode: host
26+
command: /lib/systemd/systemd
27+
image: geerlingguy/docker-debian11-ansible:latest
28+
name: debian11-systemd
29+
platform: amd64
30+
pre_build_image: true
31+
privileged: true
32+
volumes:
33+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
34+
- cgroupns_mode: host
35+
command: /lib/systemd/systemd
36+
image: cisagov/docker-debian12-ansible:latest
37+
name: debian12-systemd
38+
platform: amd64
39+
pre_build_image: true
40+
privileged: true
41+
volumes:
42+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
43+
- cgroupns_mode: host
44+
command: /lib/systemd/systemd
45+
image: cisagov/docker-kali-ansible:latest
46+
name: kali-systemd
47+
platform: amd64
48+
pre_build_image: true
49+
privileged: true
50+
volumes:
51+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
52+
- cgroupns_mode: host
53+
command: /lib/systemd/systemd
54+
image: geerlingguy/docker-fedora37-ansible:latest
55+
name: fedora37-systemd
56+
platform: amd64
57+
pre_build_image: true
58+
privileged: true
59+
volumes:
60+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
61+
- cgroupns_mode: host
62+
command: /lib/systemd/systemd
63+
image: geerlingguy/docker-fedora38-ansible:latest
64+
name: fedora38-systemd
65+
platform: amd64
66+
pre_build_image: true
67+
privileged: true
68+
volumes:
69+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
70+
- cgroupns_mode: host
71+
command: /lib/systemd/systemd
72+
image: geerlingguy/docker-ubuntu2004-ansible:latest
73+
name: ubuntu-20-systemd
74+
platform: amd64
75+
pre_build_image: true
76+
privileged: true
77+
volumes:
78+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
79+
- cgroupns_mode: host
80+
command: /lib/systemd/systemd
81+
image: geerlingguy/docker-ubuntu2204-ansible:latest
82+
name: ubuntu-22-systemd
83+
platform: amd64
84+
pre_build_image: true
85+
privileged: true
86+
volumes:
87+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
88+
scenario:
89+
name: default
90+
verifier:
91+
name: testinfra

molecule/systemd_enabled/INSTALL.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/systemd_enabled/converge.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/systemd_enabled/molecule-no-systemd.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/systemd_enabled/molecule-with-systemd.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

molecule/systemd_enabled/molecule.yml

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)