summaryrefslogtreecommitdiff
path: root/pkg/specgen
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-12-22 12:09:56 +0100
committerGitHub <noreply@github.com>2021-12-22 12:09:56 +0100
commit85f21fb2bd39d76300ab61a1fb1207405e05f9d2 (patch)
tree342fb99e4c547e9818805bad80b8ccf58427c340 /pkg/specgen
parentd2fcfef8b07532dc7418079160f0d6b989143c25 (diff)
parent20ce6e5c6031bd4180514ec412760a294f8a83a2 (diff)
downloadpodman-85f21fb2bd39d76300ab61a1fb1207405e05f9d2.tar.gz
podman-85f21fb2bd39d76300ab61a1fb1207405e05f9d2.tar.bz2
podman-85f21fb2bd39d76300ab61a1fb1207405e05f9d2.zip
Merge pull request #12664 from cdoern/noManagePasswd
Podman run --passwd
Diffstat (limited to 'pkg/specgen')
-rw-r--r--pkg/specgen/generate/container_create.go3
-rw-r--r--pkg/specgen/specgen.go2
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 577a67bbe..1debf6c0e 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -489,5 +489,8 @@ func createContainerOptions(ctx context.Context, rt *libpod.Runtime, s *specgen.
if s.PidFile != "" {
options = append(options, libpod.WithPidFile(s.PidFile))
}
+
+ options = append(options, libpod.WithSelectedPasswordManagement(s.Passwd))
+
return options, nil
}
diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go
index e650c1966..5a1cc1144 100644
--- a/pkg/specgen/specgen.go
+++ b/pkg/specgen/specgen.go
@@ -201,6 +201,8 @@ type ContainerBasicConfig struct {
// UnsetEnvAll unsets all default environment variables from the image or from buildin
// Optional.
UnsetEnvAll bool `json:"unsetenvall,omitempty"`
+ // Passwd is a container run option that determines if we are validating users/groups before running the container
+ Passwd *bool `json:"manage_password,omitempty"`
}
// ContainerStorageConfig contains information on the storage configuration of a