From 7d7e64fe5a6263aa54d87a22f3bb83b2349fe96d Mon Sep 17 00:00:00 2001 From: Jason Chua Date: Mon, 22 Jul 2024 20:36:42 -0700 Subject: [PATCH] Update docs+messages to reflect uidmaps/gidmaps code Signed-off-by: Jason Chua --- docs/Extensions.md | 4 ++-- podman_compose.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Extensions.md b/docs/Extensions.md index 0808d7d..d99467a 100644 --- a/docs/Extensions.md +++ b/docs/Extensions.md @@ -7,9 +7,9 @@ are generally specified under fields with "x-podman" prefix in the compose file. The following extension keys are available under container configuration: -* `x-podman.uidmap` - Run the container in a new user namespace using the supplied UID mapping. +* `x-podman.uidmaps` - Run the container in a new user namespace using the supplied UID mapping. -* `x-podman.gidmap` - Run the container in a new user namespace using the supplied GID mapping. +* `x-podman.gidmaps` - Run the container in a new user namespace using the supplied GID mapping. * `x-podman.rootfs` - Run the container without requiring any image management; the rootfs of the container is assumed to be managed externally. diff --git a/podman_compose.py b/podman_compose.py index 21ee58e..35c4aa5 100755 --- a/podman_compose.py +++ b/podman_compose.py @@ -1239,8 +1239,8 @@ async def container_to_args(compose, cnt, detached=True): # handle podman extension if 'x-podman' in cnt: raise ValueError( - 'Configuration under x-podman has been migrated to x-podman.uidmap and ' - 'x-podman.gidmap fields' + 'Configuration under x-podman has been migrated to x-podman.uidmaps and ' + 'x-podman.gidmaps fields' ) rootfs_mode = False