From 17f9f5abf4cdf72ce6b5f8f2f69e5a872c6a3b56 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Mon, 14 Nov 2016 15:07:05 -0500 Subject: [PATCH] Set expected response headers for Ping. Signed-off-by: Daniel Nephin --- api/swagger.yaml | 18 ++++++++++++------ api/types/container/container_changes.go | 2 +- api/types/container/container_top.go | 2 +- api/types/image/image_history.go | 2 +- api/types/types.go | 1 - 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index f7ab6cd199..3190099843 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -857,7 +857,7 @@ definitions: - Os - Size - VirtualSize - - GraphDrvier + - GraphDriver - RootFS properties: Id: @@ -4600,6 +4600,7 @@ paths: Created: "2015-09-10T08:30:53.26995814Z" GraphDriver: Name: "aufs" + Data: {} RepoDigests: - "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf" RepoTags: @@ -5218,8 +5219,7 @@ paths: summary: "Get version" description: "Returns the version of Docker that is running and various information about the system that Docker is running on." operationId: "SystemVersion" - produces: - - "application/json" + produces: ["application/json"] responses: 200: description: "no error" @@ -5268,14 +5268,20 @@ paths: summary: "Ping" description: "This is a dummy endpoint you can use to test if the server is accessible." operationId: "SystemPing" - produces: - - "text/plain" + produces: ["text/plain"] responses: 200: description: "no error" schema: type: "string" example: "OK" + headers: + API-Version: + type: "string" + description: "Max API Version the server supports" + Docker-Experimental: + type: "boolean" + description: "If the server is running with experimental mode enabled" 500: description: "server error" schema: @@ -7402,7 +7408,7 @@ paths: 200: description: "no error" schema: - $ref: "#/definitions/ImageDeleteResponse" + $ref: "#/definitions/ServiceUpdateResponse" 400: description: "bad parameter" schema: diff --git a/api/types/container/container_changes.go b/api/types/container/container_changes.go index 617d488d66..767945a532 100644 --- a/api/types/container/container_changes.go +++ b/api/types/container/container_changes.go @@ -4,7 +4,7 @@ package container // DO NOT EDIT THIS FILE // This file was generated by `swagger generate operation` // -// See hack/swagger-gen.sh +// See hack/generate-swagger-api.sh // ---------------------------------------------------------------------------- // ContainerChangeResponseItem container change response item diff --git a/api/types/container/container_top.go b/api/types/container/container_top.go index e1e7602842..78bc37ee5e 100644 --- a/api/types/container/container_top.go +++ b/api/types/container/container_top.go @@ -4,7 +4,7 @@ package container // DO NOT EDIT THIS FILE // This file was generated by `swagger generate operation` // -// See hack/swagger-gen.sh +// See hack/generate-swagger-api.sh // ---------------------------------------------------------------------------- // ContainerTopOKBody container top o k body diff --git a/api/types/image/image_history.go b/api/types/image/image_history.go index 6c56802488..0dd30c729a 100644 --- a/api/types/image/image_history.go +++ b/api/types/image/image_history.go @@ -4,7 +4,7 @@ package image // DO NOT EDIT THIS FILE // This file was generated by `swagger generate operation` // -// See hack/swagger-gen.sh +// See hack/generate-swagger-api.sh // ---------------------------------------------------------------------------- // HistoryResponseItem history response item diff --git a/api/types/types.go b/api/types/types.go index b4fc1c6408..520eb77b9d 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -93,7 +93,6 @@ type ContainerStats struct { OSType string `json:"ostype"` } - // Ping contains response of Engine API: // GET "/_ping" type Ping struct {