Merge pull request #12870 from rhatdan/userns1

Use PODMAN_USERNS environment variable when running as a service
This commit is contained in:
OpenShift Merge Robot
2022-01-18 06:08:06 -05:00
committed by GitHub
4 changed files with 58 additions and 3 deletions

View File

@ -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