diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-16 10:52:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 10:52:58 -0700 |
| commit | 5def21140038fc34cee9707d3069bf52adc24577 (patch) | |
| tree | 2582da76814b9eb636f11070b00a2dbb596754a5 /pkg/api/handlers/libpod | |
| parent | 8c4d4b58eee5e6d759199c36560af738aadc521d (diff) | |
| parent | ba430bfe5ef65d5aa5ffa1fef0087da76aafcc35 (diff) | |
| download | podman-5def21140038fc34cee9707d3069bf52adc24577.tar.gz podman-5def21140038fc34cee9707d3069bf52adc24577.tar.bz2 podman-5def21140038fc34cee9707d3069bf52adc24577.zip | |
Merge pull request #5842 from baude/v2bloat2
podman v2 remove bloat v2
Diffstat (limited to 'pkg/api/handlers/libpod')
| -rw-r--r-- | pkg/api/handlers/libpod/containers_create.go | 4 | ||||
| -rw-r--r-- | pkg/api/handlers/libpod/pods.go | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index 38a341a89..f64132d55 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -4,6 +4,8 @@ import ( "encoding/json" "net/http" + "github.com/containers/libpod/pkg/domain/entities" + "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/api/handlers/utils" "github.com/containers/libpod/pkg/specgen" @@ -29,6 +31,6 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) { utils.InternalServerError(w, err) return } - response := utils.ContainerCreateResponse{ID: ctr.ID()} + response := entities.ContainerCreateResponse{ID: ctr.ID()} utils.WriteJSON(w, http.StatusCreated, response) } diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index 81cab1ede..92556bb61 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -74,8 +74,9 @@ func PodInspect(w http.ResponseWriter, r *http.Request) { utils.Error(w, "Something went wrong", http.StatusInternalServerError, err) return } + report := entities.PodInspectReport{ - PodInspect: podData, + InspectPodData: podData, } utils.WriteResponse(w, http.StatusOK, report) } |