opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8584 from jwhonce/jira/RUN-1106-containers

Browse Source 
Jira RUN-1106 Container handlers updates
This commit is contained in:
OpenShift Merge Robot
2020-12-04 11:15:27 -05:00
committed by GitHub
parent ec0411aecd 767afe01db
commit a2d536e597
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/api/handlers/compat/containers.go
View File

@ -17,6 +17,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/gorilla/mux"
"github.com/gorilla/schema" "github.com/gorilla/schema"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -73,7 +74,7 @@ func RemoveContainer(w http.ResponseWriter, r *http.Request) {
utils.InternalServerError(w, err) utils.InternalServerError(w, err)
return return
} }
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, nil)
} }
func ListContainers(w http.ResponseWriter, r *http.Request) { func ListContainers(w http.ResponseWriter, r *http.Request) {
@ -207,7 +208,7 @@ func KillContainer(w http.ResponseWriter, r *http.Request) {
} }
} }
// Success // Success
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, nil)
} }
func WaitContainer(w http.ResponseWriter, r *http.Request) { func WaitContainer(w http.ResponseWriter, r *http.Request) {
@ -215,8 +216,10 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) {
// /{version}/containers/(name)/wait // /{version}/containers/(name)/wait
exitCode, err := utils.WaitContainer(w, r) exitCode, err := utils.WaitContainer(w, r)
if err != nil { if err != nil {
logrus.Warnf("failed to wait on container %q: %v", mux.Vars(r)["name"], err)
return return
} }
utils.WriteResponse(w, http.StatusOK, handlers.ContainerWaitOKBody{ utils.WriteResponse(w, http.StatusOK, handlers.ContainerWaitOKBody{
StatusCode: int(exitCode), StatusCode: int(exitCode),
Error: struct { Error: struct {

2
pkg/api/handlers/compat/containers_pause.go
View File

@ -24,5 +24,5 @@ func PauseContainer(w http.ResponseWriter, r *http.Request) {
return return
} }
// Success // Success
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, nil)
} }

2
pkg/api/handlers/compat/containers_restart.go
View File

@ -41,5 +41,5 @@ func RestartContainer(w http.ResponseWriter, r *http.Request) {
} }
// Success // Success
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, nil)
} }

4
pkg/api/handlers/compat/containers_start.go
View File

@ -39,12 +39,12 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
return return
} }
if state == define.ContainerStateRunning { if state == define.ContainerStateRunning {
utils.WriteResponse(w, http.StatusNotModified, "") utils.WriteResponse(w, http.StatusNotModified, nil)
return return
} }
if err := con.Start(r.Context(), len(con.PodID()) > 0); err != nil { if err := con.Start(r.Context(), len(con.PodID()) > 0); err != nil {
utils.InternalServerError(w, err) utils.InternalServerError(w, err)
return return
} }
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, nil)
} }

4
pkg/api/handlers/compat/containers_stop.go
View File

@ -40,7 +40,7 @@ func StopContainer(w http.ResponseWriter, r *http.Request) {
} }
// If the Container is stopped already, send a 304 // If the Container is stopped already, send a 304
if state == define.ContainerStateStopped || state == define.ContainerStateExited { if state == define.ContainerStateStopped || state == define.ContainerStateExited {
utils.WriteResponse(w, http.StatusNotModified, "") utils.WriteResponse(w, http.StatusNotModified, nil)
return return
} }
@ -56,5 +56,5 @@ func StopContainer(w http.ResponseWriter, r *http.Request) {
} }
// Success // Success
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, nil)
} }

2
pkg/api/handlers/compat/containers_unpause.go
View File

@ -24,5 +24,5 @@ func UnpauseContainer(w http.ResponseWriter, r *http.Request) {
} }
// Success // Success
utils.WriteResponse(w, http.StatusNoContent, "") utils.WriteResponse(w, http.StatusNoContent, nil)
} }