diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-20 22:44:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 22:44:12 +0200 |
| commit | e8e5a5f96e0b5d915baeeb0915cc0ca788b70e64 (patch) | |
| tree | 9349b08665d92ec051f70fd35f1a60bbafa9a253 /pkg | |
| parent | 46ca450436b592b2ae0fdeb6f05746af124cc514 (diff) | |
| parent | fed4ef09ce606194dab4052c47b85476654e91e3 (diff) | |
| download | podman-e8e5a5f96e0b5d915baeeb0915cc0ca788b70e64.tar.gz podman-e8e5a5f96e0b5d915baeeb0915cc0ca788b70e64.tar.bz2 podman-e8e5a5f96e0b5d915baeeb0915cc0ca788b70e64.zip | |
Merge pull request #6305 from baude/v2podcreatetest
enable pod_create remote integration tests
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/containers_start.go | 3 | ||||
| -rw-r--r-- | pkg/api/handlers/compat/containers_stop.go (renamed from pkg/api/handlers/compat/container_start.go) | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go index 9cb1492fb..cdbc8ff76 100644 --- a/pkg/api/handlers/compat/containers_start.go +++ b/pkg/api/handlers/compat/containers_start.go @@ -33,7 +33,6 @@ func StartContainer(w http.ResponseWriter, r *http.Request) { utils.ContainerNotFound(w, name, err) return } - state, err := con.State() if err != nil { utils.InternalServerError(w, err) @@ -43,7 +42,7 @@ func StartContainer(w http.ResponseWriter, r *http.Request) { utils.WriteResponse(w, http.StatusNotModified, "") return } - if err := con.Start(r.Context(), false); err != nil { + if err := con.Start(r.Context(), len(con.PodID()) > 0); err != nil { utils.InternalServerError(w, err) return } diff --git a/pkg/api/handlers/compat/container_start.go b/pkg/api/handlers/compat/containers_stop.go index d26ef2c82..d26ef2c82 100644 --- a/pkg/api/handlers/compat/container_start.go +++ b/pkg/api/handlers/compat/containers_stop.go |