Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions newsfragments/cgroup-service-field.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add support for the Compose `cgroup` service field, passing `host` and `private` modes to Podman as `--cgroupns`.
6 changes: 6 additions & 0 deletions podman_compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,12 @@ async def container_to_args(
if userns_mode is not None:
podman_args.extend(["--userns", userns_mode])

cgroup = cnt.get("cgroup")
if cgroup is not None:
if cgroup not in ("host", "private"):
raise ValueError(f"invalid cgroup mode [{cgroup}]")
podman_args.extend(["--cgroupns", cgroup])

user = cnt.get("user")
if user is not None:
podman_args.extend(["-u", user])
Expand Down
33 changes: 33 additions & 0 deletions tests/unit/test_container_to_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,39 @@ async def test_ipc_simple_modes(self, ipc_mode: str) -> None:
],
)

@parameterized.expand(["host", "private"])
async def test_cgroup_modes(self, cgroup_mode: str) -> None:
"""Pass the cgroup namespace mode on as --cgroupns parameter"""

c = create_compose_mock()

cnt = get_minimal_container()
cnt["cgroup"] = cgroup_mode

args = await container_to_args(c, cnt)
self.assertEqual(
args,
[
"--name=project_name_service_name1",
"-d",
"--network=bridge:alias=service_name",
"--cgroupns",
cgroup_mode,
"busybox",
],
)

async def test_cgroup_invalid_mode(self) -> None:
"""Throw ValueError on invalid cgroup mode"""

c = create_compose_mock()

cnt = get_minimal_container()
cnt["cgroup"] = "invalid"

with self.assertRaisesRegex(ValueError, r"invalid cgroup mode"):
await container_to_args(c, cnt)

@parameterized.expand(["invalid", (["a list", "is invalid too"],)])
async def test_ipc_invalid_mode(self, ipc_mode: Any) -> None:
"""Throw ValueError on invalid ipc mode"""
Expand Down