Skip to content

Commit 9b045b2

Browse files
Fix cgroupv2 issue in Molecule
1 parent b3ebf93 commit 9b045b2

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

molecule/custom_env/molecule.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ driver:
1818
platforms:
1919
- name: "${os:-ubuntu20}-${tag:-latest}"
2020
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
21-
command: ${MOLECULE_DOCKER_COMMAND:-""}
2221
volumes:
23-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
24-
cgroupns_mode: host
22+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
23+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
2524
privileged: true
2625
pre_build_image: true
2726
verifier:

molecule/default/molecule.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ driver:
1818
platforms:
1919
- name: "${os:-ubuntu20}-${tag:-latest}"
2020
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
21-
command: ${MOLECULE_DOCKER_COMMAND:-""}
2221
volumes:
23-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
24-
cgroupns_mode: host
22+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
23+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
2524
privileged: true
2625
pre_build_image: true
2726
verifier:

molecule/org/molecule.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ driver:
1515
platforms:
1616
- name: "${os:-ubuntu20}-${tag:-latest}"
1717
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
18-
command: ${MOLECULE_DOCKER_COMMAND:-""}
1918
volumes:
20-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21-
cgroupns_mode: host
19+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
20+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
2221
privileged: true
2322
pre_build_image: true
2423
verifier:

molecule/repo/molecule.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ driver:
1515
platforms:
1616
- name: "${os:-ubuntu20}-${tag:-latest}"
1717
image: "${namespace:-monolithprojects}/systemd-${os:-ubuntu20}:${tag:-latest}"
18-
command: ${MOLECULE_DOCKER_COMMAND:-""}
1918
volumes:
20-
- /sys/fs/cgroup:/sys/fs/cgroup:rw
21-
cgroupns_mode: host
19+
- "/sys/fs/cgroup:/sys/fs/cgroup:${MOLECULE_DOCKER_VOLUMES:-ro}" # Use "ro" for cgroup v1 and "rw" for cgroup v2
20+
cgroupns_mode: ${MOLECULE_DOCKER_CGROUPS_MODE:-"private"} # Use "private" for cgroup v1 and "host" for cgroup v2
2221
privileged: true
2322
pre_build_image: true
2423
verifier:

0 commit comments

Comments
 (0)