diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-18 06:08:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 06:08:06 -0500 |
| commit | d0eb24bae0023848447568d024acdaadb632edfe (patch) | |
| tree | 43461089256941739fc91e525229e670b26697d6 /libpod/define | |
| parent | 02502e2c14efe99b8179ca23f3341254c9f39351 (diff) | |
| parent | 10d969ff1a15e8f53eb5a2fa7eb8cfb321609b55 (diff) | |
| download | podman-d0eb24bae0023848447568d024acdaadb632edfe.tar.gz podman-d0eb24bae0023848447568d024acdaadb632edfe.tar.bz2 podman-d0eb24bae0023848447568d024acdaadb632edfe.zip | |
Merge pull request #12870 from rhatdan/userns1
Use PODMAN_USERNS environment variable when running as a service
Diffstat (limited to 'libpod/define')
| -rw-r--r-- | libpod/define/container_inspect.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 6db1b025e..804b2b143 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -6,6 +6,11 @@ import ( "github.com/containers/image/v5/manifest" ) +type InspectIDMappings struct { + UIDMap []string `json:"UidMap"` + GIDMap []string `json:"GidMap"` +} + // InspectContainerConfig holds further data about how a container was initially // configured. type InspectContainerConfig struct { @@ -401,7 +406,10 @@ type InspectContainerHostConfig struct { // TODO Rootless has an additional 'keep-id' option, presently not // reflected here. UsernsMode string `json:"UsernsMode"` + // IDMappings is the UIDMapping and GIDMapping used within the container + IDMappings *InspectIDMappings `json:"IDMappings,omitempty"` // ShmSize is the size of the container's SHM device. + ShmSize int64 `json:"ShmSize"` // Runtime is provided purely for Docker compatibility. // It is set unconditionally to "oci" as Podman does not presently |