diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-17 21:55:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-17 21:55:11 +0100 |
| commit | 3b6a843eb2942ec4093072f4a6468a57f19de5cb (patch) | |
| tree | 81de580baddb004e7cb18f1111f65577f13cdef8 /pkg/api | |
| parent | ab7e1a4c400f4bdb47ab49a2a0c8ef9508c68e02 (diff) | |
| parent | 9be6f30a42a8737f7e853dc3333b627242a962ab (diff) | |
| download | podman-3b6a843eb2942ec4093072f4a6468a57f19de5cb.tar.gz podman-3b6a843eb2942ec4093072f4a6468a57f19de5cb.tar.bz2 podman-3b6a843eb2942ec4093072f4a6468a57f19de5cb.zip | |
Merge pull request #4895 from cevich/swagpublish
[CI:DOCS] Post-process swagger yaml and publish
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/Makefile | 4 | ||||
| -rw-r--r-- | pkg/api/server/register_containers.go | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkg/api/Makefile b/pkg/api/Makefile index 5fb4e7da5..3d70376df 100644 --- a/pkg/api/Makefile +++ b/pkg/api/Makefile @@ -1,3 +1,5 @@ +SWAGGER_OUT ?= swagger.yaml + swagger: - swagger generate spec -o swagger.yaml -w ./ + swagger generate spec -o ${SWAGGER_OUT} -w ./ cat tags.yaml >> swagger.yaml diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index dbe194cd4..6f4222d8f 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -788,11 +788,13 @@ func (s *APIServer) RegisterContainersHandlers(r *mux.Router) error { // '500': // "$ref": "#/responses/InternalError" r.HandleFunc(VersionedPath("/libpod/containers/{name:..*}/stats"), APIHandler(s.Context, generic.StatsContainer)).Methods(http.MethodGet) - // swagger:operation GET /libpod/containers/{nameOrID}/top containers topContainer + // swagger:operation GET /libpod/containers/{nameOrID}/top libpod libpodTopContainer // // List processes running inside a container. Note // // --- + // tags: + // - containers // parameters: // - in: path // name: nameOrID @@ -810,7 +812,6 @@ func (s *APIServer) RegisterContainersHandlers(r *mux.Router) error { // - application/json // responses: // '200': - // description: no error // "ref": "#/responses/DockerTopResponse" // '404': // "$ref": "#/responses/NoSuchContainer" |