aboutsummaryrefslogtreecommitdiff
path: root/pkg/api
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/api
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/api')
-rw-r--r--pkg/api/handlers/libpod/containers_create.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go
index 77bfe7b50..d1841769a 100644
--- a/pkg/api/handlers/libpod/containers_create.go
+++ b/pkg/api/handlers/libpod/containers_create.go
@@ -19,11 +19,15 @@ import (
func CreateContainer(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime)
var sg specgen.SpecGenerator
+
if err := json.NewDecoder(r.Body).Decode(&sg); err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "Decode()"))
return
}
-
+ if sg.Passwd == nil {
+ t := true
+ sg.Passwd = &t
+ }
warn, err := generate.CompleteSpec(r.Context(), runtime, &sg)
if err != nil {
utils.InternalServerError(w, err)