diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-18 11:20:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-18 11:20:19 -0400 |
commit | e6b9b3ab227729e72f52ddab94c024174ab8a442 (patch) | |
tree | 1c1e6c9bd1c595410d179b3ebf9ea868cddb587e /pkg/api/handlers/libpod/containers.go | |
parent | 2e621aece054e9ba8cd2fb30254c8513e7caf1b6 (diff) | |
parent | b20619e5b0dfa6c63b25c3fd9a7ae6188bee2b4c (diff) | |
download | podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.tar.gz podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.tar.bz2 podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.zip |
Merge pull request #6656 from mheon/recursive_init
Allow recursive dependency start with Init()
Diffstat (limited to 'pkg/api/handlers/libpod/containers.go')
-rw-r--r-- | pkg/api/handlers/libpod/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go index 50f6b1a38..2556cdc2a 100644 --- a/pkg/api/handlers/libpod/containers.go +++ b/pkg/api/handlers/libpod/containers.go @@ -294,7 +294,7 @@ func InitContainer(w http.ResponseWriter, r *http.Request) { utils.ContainerNotFound(w, name, err) return } - err = ctr.Init(r.Context()) + err = ctr.Init(r.Context(), ctr.PodID() != "") if errors.Cause(err) == define.ErrCtrStateInvalid { utils.Error(w, "container already initialized", http.StatusNotModified, err) return |