diff --git a/Dockerfile b/Dockerfile
index 53d8cde86a..407bb1c342 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,26 +81,14 @@ FROM distribution/distribution:$REGISTRY_VERSION AS registry
 RUN mkdir /build && mv /bin/registry /build/registry
 
 # go-swagger
-FROM base AS swagger-src
-WORKDIR /usr/src/swagger
-# Currently uses a fork from https://github.com/kolyshkin/go-swagger/tree/golang-1.13-fix
-# TODO: move to under moby/ or fix upstream go-swagger to work for us.
-RUN git init . && git remote add origin "https://github.com/kolyshkin/go-swagger.git"
-# GO_SWAGGER_COMMIT specifies the version of the go-swagger binary to build and
-# install. Go-swagger is used in CI for validating swagger.yaml in hack/validate/swagger-gen
-ARG GO_SWAGGER_COMMIT=c56166c036004ba7a3a321e5951ba472b9ae298c
-RUN git fetch -q --depth 1 origin "${GO_SWAGGER_COMMIT}" && git checkout -q FETCH_HEAD
-
 FROM base AS swagger
 WORKDIR /go/src/github.com/go-swagger/go-swagger
 ARG TARGETPLATFORM
-ENV GO111MODULE=off
-RUN --mount=from=swagger-src,src=/usr/src/swagger,rw \
-    --mount=type=cache,target=/root/.cache/go-build,id=swagger-build-$TARGETPLATFORM \
+RUN --mount=type=cache,target=/root/.cache/go-build,id=swagger-build-$TARGETPLATFORM \
     --mount=type=cache,target=/go/pkg/mod \
     --mount=type=tmpfs,target=/go/src/ <<EOT
   set -e
-  xx-go build -o /build/swagger ./cmd/swagger
+  GOBIN=/build xx-go install github.com/go-swagger/go-swagger/cmd/swagger@v0.32.3
   xx-verify /build/swagger
 EOT
 
diff --git a/api/templates/schema.gotmpl b/api/templates/schema.gotmpl
new file mode 100644
index 0000000000..71b94b094c
--- /dev/null
+++ b/api/templates/schema.gotmpl
@@ -0,0 +1,133 @@
+{{- if and .IsBaseType .IsExported (not .IsSuperAlias) }}
+  {{- template "schemaPolymorphic" . }}
+{{- else if .IsSuperAlias }}
+  type {{ pascalize .Name }} {{ template "typeSchemaType" . }}{{/* For types declared as $ref on some other type, just declare the type as a golang _aliased_ type, e.g. type A = B. No method shall be redeclared.  */}}
+  {{- if .IsBaseType }}
+    {{ template "baseTypeSerializer" . }}{{/* When the alias redeclares a polymorphic type, define factory methods with this alias. */}}
+  {{- end }}
+{{- else if .IsEmbedded }}
+  {{- template "schemaEmbedded" . }}
+{{- else }}
+  {{- if or .IsComplexObject .IsTuple .IsAdditionalProperties }}{{/* TODO(fred): handle case of subtype inheriting from base type with AdditionalProperties, issue #2220 */}}
+      {{ if .Name }}type {{ if not .IsExported }}{{ .Name }}{{ else }}{{ pascalize .Name }}{{ end }}{{ end }} {{ template "schemaBody" . }}
+    {{- range .Properties }}
+      {{- if .IsBaseType }}
+        // {{ pascalize .Name}} gets the {{ humanize .Name }} of this base type{{/* all properties which are of a base type propagate its interface */}}
+        func ({{ $.ReceiverName}} *{{ pascalize $.Name}}) {{ pascalize .Name}}() {{ template "schemaType" . }}{
+          {{- if eq $.DiscriminatorField .Name }}
+            return {{ printf "%q" $.DiscriminatorValue }}
+          {{- else }}
+            return {{ $.ReceiverName }}.{{camelize .Name}}Field
+          {{- end }}
+        }
+
+        // Set{{ pascalize .Name}} sets the {{ humanize .Name }} of this base type
+        func ({{ $.ReceiverName}} *{{ pascalize $.Name}}) Set{{ pascalize .Name}}(val {{ template "schemaType" . }}) {
+          {{- if ne $.DiscriminatorField .Name }}
+            {{ $.ReceiverName }}.{{camelize .Name}}Field = val
+          {{- end }}
+        }
+      {{- end }}
+    {{- end }}
+    {{- if .Default }}{{/* TODO(fred) - issue #2189 */}}
+      func ({{.ReceiverName}} *{{ pascalize .Name }}) UnmarshalJSON(b []byte) error {
+        type {{ pascalize .Name }}Alias {{ pascalize .Name }}
+        var t {{ pascalize .Name }}Alias
+        if err := json.Unmarshal([]byte({{printf "%q" (json .Default)}}), &t); err != nil {
+          return err
+        }
+        if err := json.Unmarshal(b, &t); err != nil {
+          return err
+        }
+        *{{.ReceiverName}} = {{ pascalize .Name }}(t)
+        return nil
+      }
+    {{- end }}
+  {{- else }}
+    type {{ pascalize .Name }} {{ template "typeSchemaType" . }}
+  {{- end }}
+  {{- if (and .IsPrimitive .IsAliased .IsCustomFormatter (not (stringContains .Zero "(\""))) }}
+    {{ template "aliasedSerializer" . }}
+  {{- end }}
+  {{- if .IsSubType }}
+    {{ range .AllOf }}
+      {{ range .Properties }}
+        {{- if .IsBaseType }}
+
+        // {{ pascalize .Name}} gets the {{ humanize .Name }} of this subtype
+        func ({{$.ReceiverName}} *{{ pascalize $.Name}}) {{ pascalize .Name}}() {{ template "schemaType" . }}{
+          {{- if eq $.DiscriminatorField .Name }}
+            return {{ printf "%q" $.DiscriminatorValue }}
+          {{- else }}
+            return {{ $.ReceiverName }}.{{camelize .Name}}Field
+          {{- end }}
+        }
+
+        // Set{{ pascalize .Name}} sets the {{ humanize .Name }} of this subtype
+        func ({{$.ReceiverName}} *{{ pascalize $.Name}}) Set{{ pascalize .Name}}(val {{ template "schemaType" . }}) {
+          {{- if ne $.DiscriminatorField .Name }}
+            {{ $.ReceiverName }}.{{camelize .Name}}Field = val
+          {{- end }}
+        }
+        {{- end }}
+      {{- end }}{{/* TODO(fred): handle AdditionalProperties in base type */}}
+    {{- end }}
+    {{ template "mapOrSliceGetter" . }}
+  {{- end }}
+  {{ template "schemaSerializer" . }}
+{{- end }}
+{{- if and .IncludeValidator (not .IsSuperAlias) (not .IsEmbedded) }}{{/* aliased types type A = B do not redefine methods */}}
+  {{- if and (not (or .IsInterface .IsStream)) (or .Required .HasValidations .HasBaseType) }}
+    {{- if (eq .SwaggerType "string") }}{{/* Enum factory for enums for which we generate const (atm, only strings)*/}}
+      {{- if .Enum }}
+
+func New{{ pascalize .Name }}(value {{ .GoType }}) *{{ .GoType }} {
+  return &value
+}
+
+// Pointer returns a pointer to a freshly-allocated {{ .GoType }}.
+func ({{ .ReceiverName }} {{ .GoType }}) Pointer() *{{ .GoType }} {
+  return &{{ .ReceiverName }}
+}
+      {{- end }}
+    {{- end }}
+    {{ if false }}{{ template "schemavalidator" . }}{{ end }}
+  {{- else if and false not (or .IsInterface .IsStream) }}
+// Validate validates this {{ humanize .Name }}{{/* this schema implements the runtime.Validatable interface but has no validations to check */}}
+func ({{.ReceiverName}} {{ if or .IsTuple .IsComplexObject .IsAdditionalProperties }}*{{ end }}{{ if or (not .IsExported) .Discriminates }}{{ camelize .Name }}{{ else }}{{ pascalize .Name }}{{ end }}) Validate(formats strfmt.Registry) error {
+  return nil
+}
+  {{- else }}{{/* {{ .Name }} does not implement the runtime.Validatable interface: noop */}}
+  {{- end }}
+{{- if false }}
+  {{- if and (not (or .IsInterface .IsStream)) (or .HasContextValidations) }}
+    {{ template "schemacontextvalidator" . }}
+  {{- else if not (or .IsInterface .IsStream) }}
+// ContextValidate validates this {{ humanize .Name }} based on context it is used {{/* this schema implements the runtime.ContextValidatable interface but has no validations to check */}}
+func ({{.ReceiverName}} {{ if or .IsTuple .IsComplexObject .IsAdditionalProperties }}*{{ end }}{{ if or (not .IsExported) .Discriminates }}{{ camelize .Name }}{{ else }}{{ pascalize .Name }}{{ end }}) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+  return nil
+}
+  {{- else }}{{/* {{ .Name }} does not implement the runtime.Validatable interface: noop */}}
+  {{- end }}
+{{- end }}
+{{- if .WantsMarshalBinary }}
+  {{ template "marshalBinarySerializer" . }}
+{{- end }}
+{{- end }}
+{{- define "mapOrSliceGetter" }}{{/* signature for AdditionalProperties and AdditionalItems getter funcs */}}
+  {{- if not .IsBaseType }}
+    {{- if .HasAdditionalProperties }}
+      {{- with .AdditionalProperties }}
+        // {{- template "docstring" . }}{{- template "propertyValidationDocString" . }}
+        {{ pascalize .Name }}() map[string]{{ template "schemaType" . }}
+      {{- end }}
+    {{- end }}
+    {{- with .AdditionalItems }}
+      // {{- template "docstring" . }}{{- template "propertyValidationDocString" . }}
+      {{ pascalize .Name }}() []{{ template "schemaType" . }}
+    {{- end }}
+  {{- else }}
+  // AdditionalProperties in base type shoud be handled just like regular properties{{/* TODO(fred): add full support for AdditionalProperties in base type */}}
+  // At this moment, the base type property is pushed down to the subtype
+  {{- end }}
+{{- end }}
diff --git a/api/templates/serializers/marshalbinaryserializer.gotmpl b/api/templates/serializers/marshalbinaryserializer.gotmpl
new file mode 100644
index 0000000000..fd5b8dcd09
--- /dev/null
+++ b/api/templates/serializers/marshalbinaryserializer.gotmpl
@@ -0,0 +1 @@
+{{ define "marshalBinarySerializer" }}{{ end }}
diff --git a/api/templates/server/operation.gotmpl b/api/templates/server/operation.gotmpl
index a4b2cdf879..3eb8194690 100644
--- a/api/templates/server/operation.gotmpl
+++ b/api/templates/server/operation.gotmpl
@@ -18,6 +18,7 @@ import (
 
 {{ range .ExtraSchemas }}
 // {{ .Name }} {{ comment .Description }}
+//
 // swagger:model {{ .Name }}
-{{ template "schema" . }}
-{{ end }}
+  {{- template "schema" . }}
+{{- end }}
diff --git a/api/types/common/id_response.go b/api/types/common/id_response.go
index 22e8c60a48..7dfe4bf12b 100644
--- a/api/types/common/id_response.go
+++ b/api/types/common/id_response.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package common
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // IDResponse Response to an API call that returns just an Id
+//
 // swagger:model IDResponse
 type IDResponse struct {
 
diff --git a/api/types/container/change_type.go b/api/types/container/change_type.go
index fe8d6d3696..52fc99235b 100644
--- a/api/types/container/change_type.go
+++ b/api/types/container/change_type.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
diff --git a/api/types/container/create_response.go b/api/types/container/create_response.go
index aa0e7f7d07..39d761aa96 100644
--- a/api/types/container/create_response.go
+++ b/api/types/container/create_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -5,15 +7,18 @@ package container
 
 // CreateResponse ContainerCreateResponse
 //
-// OK response to ContainerCreate operation
+// # OK response to ContainerCreate operation
+//
 // swagger:model CreateResponse
 type CreateResponse struct {
 
 	// The ID of the created container
+	// Example: ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743
 	// Required: true
 	ID string `json:"Id"`
 
 	// Warnings encountered when creating the container
+	// Example: []
 	// Required: true
 	Warnings []string `json:"Warnings"`
 }
diff --git a/api/types/container/filesystem_change.go b/api/types/container/filesystem_change.go
index 9e9c2ad1d5..b9ec83e521 100644
--- a/api/types/container/filesystem_change.go
+++ b/api/types/container/filesystem_change.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
diff --git a/api/types/container/port.go b/api/types/container/port.go
index 895043cfe9..bbaa317fdb 100644
--- a/api/types/container/port.go
+++ b/api/types/container/port.go
@@ -1,9 +1,13 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // Port An open port on a container
+// Example: {"PrivatePort":8080,"PublicPort":80,"Type":"tcp"}
+//
 // swagger:model Port
 type Port struct {
 
@@ -19,5 +23,6 @@ type Port struct {
 
 	// type
 	// Required: true
+	// Enum: ["tcp","udp","sctp"]
 	Type string `json:"Type"`
 }
diff --git a/api/types/container/top_response.go b/api/types/container/top_response.go
index b4bae5ef03..966603617f 100644
--- a/api/types/container/top_response.go
+++ b/api/types/container/top_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -6,13 +8,16 @@ package container
 // TopResponse ContainerTopResponse
 //
 // Container "top" response.
+//
 // swagger:model TopResponse
 type TopResponse struct {
 
 	// Each process running in the container, where each process
 	// is an array of values corresponding to the titles.
+	// Example: {"Processes":[["root","13642","882","0","17:03","pts/0","00:00:00","/bin/bash"],["root","13735","13642","0","17:06","pts/0","00:00:00","sleep 10"]]}
 	Processes [][]string `json:"Processes"`
 
 	// The ps column titles
+	// Example: {"Titles":["UID","PID","PPID","C","STIME","TTY","TIME","CMD"]}
 	Titles []string `json:"Titles"`
 }
diff --git a/api/types/container/update_response.go b/api/types/container/update_response.go
index e2b5bf5ac0..2f7263b141 100644
--- a/api/types/container/update_response.go
+++ b/api/types/container/update_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -6,9 +8,11 @@ package container
 // UpdateResponse ContainerUpdateResponse
 //
 // Response for a successful container-update.
+//
 // swagger:model UpdateResponse
 type UpdateResponse struct {
 
 	// Warnings encountered when updating the container.
+	// Example: ["Published ports are discarded when using host network mode"]
 	Warnings []string `json:"Warnings"`
 }
diff --git a/api/types/container/wait_exit_error.go b/api/types/container/wait_exit_error.go
index ab56d4eed8..96a7770c34 100644
--- a/api/types/container/wait_exit_error.go
+++ b/api/types/container/wait_exit_error.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // WaitExitError container waiting error, if any
+//
 // swagger:model WaitExitError
 type WaitExitError struct {
 
diff --git a/api/types/container/wait_response.go b/api/types/container/wait_response.go
index 84fc6afddc..68d3c38724 100644
--- a/api/types/container/wait_response.go
+++ b/api/types/container/wait_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -5,7 +7,8 @@ package container
 
 // WaitResponse ContainerWaitResponse
 //
-// OK response to ContainerWait operation
+// # OK response to ContainerWait operation
+//
 // swagger:model WaitResponse
 type WaitResponse struct {
 
diff --git a/api/types/error_response.go b/api/types/error_response.go
index dc942d9d9e..0013435dbc 100644
--- a/api/types/error_response.go
+++ b/api/types/error_response.go
@@ -1,9 +1,13 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // ErrorResponse Represents an error.
+// Example: {"message":"Something went wrong."}
+//
 // swagger:model ErrorResponse
 type ErrorResponse struct {
 
diff --git a/api/types/image/delete_response.go b/api/types/image/delete_response.go
index 998620dc6a..b19119a381 100644
--- a/api/types/image/delete_response.go
+++ b/api/types/image/delete_response.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package image
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // DeleteResponse delete response
+//
 // swagger:model DeleteResponse
 type DeleteResponse struct {
 
diff --git a/api/types/image/image_history.go b/api/types/image/image_history.go
index a6cdab84d8..40aa962585 100644
--- a/api/types/image/image_history.go
+++ b/api/types/image/image_history.go
@@ -7,6 +7,7 @@ package image
 // ----------------------------------------------------------------------------
 
 // HistoryResponseItem individual image layer information in response to ImageHistory operation
+//
 // swagger:model HistoryResponseItem
 type HistoryResponseItem struct {
 
diff --git a/api/types/network/create_response.go b/api/types/network/create_response.go
index c32b35bff5..1997059912 100644
--- a/api/types/network/create_response.go
+++ b/api/types/network/create_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package network
 
 // This file was generated by the swagger tool.
@@ -5,11 +7,13 @@ package network
 
 // CreateResponse NetworkCreateResponse
 //
-// OK response to NetworkCreate operation
+// # OK response to NetworkCreate operation
+//
 // swagger:model CreateResponse
 type CreateResponse struct {
 
 	// The ID of the created network.
+	// Example: b5c4fc71e8022147cd25de22b22173de4e3b170134117172eb595cb91b4e7e5d
 	// Required: true
 	ID string `json:"Id"`
 
diff --git a/api/types/plugin.go b/api/types/plugin.go
index abae48b9ab..7fbb52218a 100644
--- a/api/types/plugin.go
+++ b/api/types/plugin.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // Plugin A plugin for the Engine API
+//
 // swagger:model Plugin
 type Plugin struct {
 
@@ -12,17 +15,21 @@ type Plugin struct {
 	Config PluginConfig `json:"Config"`
 
 	// True if the plugin is running. False if the plugin is not running, only installed.
+	// Example: true
 	// Required: true
 	Enabled bool `json:"Enabled"`
 
 	// Id
+	// Example: 5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078
 	ID string `json:"Id,omitempty"`
 
 	// name
+	// Example: tiborvass/sample-volume-plugin
 	// Required: true
 	Name string `json:"Name"`
 
 	// plugin remote reference used to push/pull the plugin
+	// Example: localhost:5000/tiborvass/sample-volume-plugin:latest
 	PluginReference string `json:"PluginReference,omitempty"`
 
 	// settings
@@ -31,6 +38,7 @@ type Plugin struct {
 }
 
 // PluginConfig The config of a plugin.
+//
 // swagger:model PluginConfig
 type PluginConfig struct {
 
@@ -39,21 +47,26 @@ type PluginConfig struct {
 	Args PluginConfigArgs `json:"Args"`
 
 	// description
+	// Example: A sample volume plugin for Docker
 	// Required: true
 	Description string `json:"Description"`
 
 	// Docker Version used to create the plugin
+	// Example: 17.06.0-ce
 	DockerVersion string `json:"DockerVersion,omitempty"`
 
 	// documentation
+	// Example: https://docs.docker.com/engine/extend/plugins/
 	// Required: true
 	Documentation string `json:"Documentation"`
 
 	// entrypoint
+	// Example: ["/usr/bin/sample-volume-plugin","/data"]
 	// Required: true
 	Entrypoint []string `json:"Entrypoint"`
 
 	// env
+	// Example: [{"Description":"If set, prints debug messages","Name":"DEBUG","Settable":null,"Value":"0"}]
 	// Required: true
 	Env []PluginEnv `json:"Env"`
 
@@ -62,6 +75,7 @@ type PluginConfig struct {
 	Interface PluginConfigInterface `json:"Interface"`
 
 	// ipc host
+	// Example: false
 	// Required: true
 	IpcHost bool `json:"IpcHost"`
 
@@ -78,10 +92,12 @@ type PluginConfig struct {
 	Network PluginConfigNetwork `json:"Network"`
 
 	// pid host
+	// Example: false
 	// Required: true
 	PidHost bool `json:"PidHost"`
 
 	// propagated mount
+	// Example: /mnt/volumes
 	// Required: true
 	PropagatedMount string `json:"PropagatedMount"`
 
@@ -89,6 +105,7 @@ type PluginConfig struct {
 	User PluginConfigUser `json:"User,omitempty"`
 
 	// work dir
+	// Example: /bin/
 	// Required: true
 	WorkDir string `json:"WorkDir"`
 
@@ -97,14 +114,17 @@ type PluginConfig struct {
 }
 
 // PluginConfigArgs plugin config args
+//
 // swagger:model PluginConfigArgs
 type PluginConfigArgs struct {
 
 	// description
+	// Example: command line arguments
 	// Required: true
 	Description string `json:"Description"`
 
 	// name
+	// Example: args
 	// Required: true
 	Name string `json:"Name"`
 
@@ -118,30 +138,38 @@ type PluginConfigArgs struct {
 }
 
 // PluginConfigInterface The interface between Docker and the plugin
+//
 // swagger:model PluginConfigInterface
 type PluginConfigInterface struct {
 
 	// Protocol to use for clients connecting to the plugin.
+	// Example: some.protocol/v1.0
+	// Enum: ["","moby.plugins.http/v1"]
 	ProtocolScheme string `json:"ProtocolScheme,omitempty"`
 
 	// socket
+	// Example: plugins.sock
 	// Required: true
 	Socket string `json:"Socket"`
 
 	// types
+	// Example: ["docker.volumedriver/1.0"]
 	// Required: true
 	Types []PluginInterfaceType `json:"Types"`
 }
 
 // PluginConfigLinux plugin config linux
+//
 // swagger:model PluginConfigLinux
 type PluginConfigLinux struct {
 
 	// allow all devices
+	// Example: false
 	// Required: true
 	AllowAllDevices bool `json:"AllowAllDevices"`
 
 	// capabilities
+	// Example: ["CAP_SYS_ADMIN","CAP_SYSLOG"]
 	// Required: true
 	Capabilities []string `json:"Capabilities"`
 
@@ -151,37 +179,46 @@ type PluginConfigLinux struct {
 }
 
 // PluginConfigNetwork plugin config network
+//
 // swagger:model PluginConfigNetwork
 type PluginConfigNetwork struct {
 
 	// type
+	// Example: host
 	// Required: true
 	Type string `json:"Type"`
 }
 
 // PluginConfigRootfs plugin config rootfs
+//
 // swagger:model PluginConfigRootfs
 type PluginConfigRootfs struct {
 
 	// diff ids
+	// Example: ["sha256:675532206fbf3030b8458f88d6e26d4eb1577688a25efec97154c94e8b6b4887","sha256:e216a057b1cb1efc11f8a268f37ef62083e70b1b38323ba252e25ac88904a7e8"]
 	DiffIds []string `json:"diff_ids"`
 
 	// type
+	// Example: layers
 	Type string `json:"type,omitempty"`
 }
 
 // PluginConfigUser plugin config user
+//
 // swagger:model PluginConfigUser
 type PluginConfigUser struct {
 
 	// g ID
+	// Example: 1000
 	GID uint32 `json:"GID,omitempty"`
 
 	// UID
+	// Example: 1000
 	UID uint32 `json:"UID,omitempty"`
 }
 
 // PluginSettings Settings that can be modified by users.
+//
 // swagger:model PluginSettings
 type PluginSettings struct {
 
@@ -194,6 +231,7 @@ type PluginSettings struct {
 	Devices []PluginDevice `json:"Devices"`
 
 	// env
+	// Example: ["DEBUG=0"]
 	// Required: true
 	Env []string `json:"Env"`
 
diff --git a/api/types/plugin_device.go b/api/types/plugin_device.go
index 5699010675..d02aee63ad 100644
--- a/api/types/plugin_device.go
+++ b/api/types/plugin_device.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginDevice plugin device
+//
 // swagger:model PluginDevice
 type PluginDevice struct {
 
@@ -16,6 +19,7 @@ type PluginDevice struct {
 	Name string `json:"Name"`
 
 	// path
+	// Example: /dev/fuse
 	// Required: true
 	Path *string `json:"Path"`
 
diff --git a/api/types/plugin_env.go b/api/types/plugin_env.go
index 32962dc2eb..061cf74e70 100644
--- a/api/types/plugin_env.go
+++ b/api/types/plugin_env.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginEnv plugin env
+//
 // swagger:model PluginEnv
 type PluginEnv struct {
 
diff --git a/api/types/plugin_interface_type.go b/api/types/plugin_interface_type.go
index c82f204e87..f9d3be2f8d 100644
--- a/api/types/plugin_interface_type.go
+++ b/api/types/plugin_interface_type.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginInterfaceType plugin interface type
+//
 // swagger:model PluginInterfaceType
 type PluginInterfaceType struct {
 
diff --git a/api/types/plugin_mount.go b/api/types/plugin_mount.go
index 5c031cf8b5..8853444b2d 100644
--- a/api/types/plugin_mount.go
+++ b/api/types/plugin_mount.go
@@ -1,25 +1,32 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginMount plugin mount
+//
 // swagger:model PluginMount
 type PluginMount struct {
 
 	// description
+	// Example: This is a mount that's used by the plugin.
 	// Required: true
 	Description string `json:"Description"`
 
 	// destination
+	// Example: /mnt/state
 	// Required: true
 	Destination string `json:"Destination"`
 
 	// name
+	// Example: some-mount
 	// Required: true
 	Name string `json:"Name"`
 
 	// options
+	// Example: ["rbind","rw"]
 	// Required: true
 	Options []string `json:"Options"`
 
@@ -28,10 +35,12 @@ type PluginMount struct {
 	Settable []string `json:"Settable"`
 
 	// source
+	// Example: /var/lib/docker/plugins/
 	// Required: true
 	Source *string `json:"Source"`
 
 	// type
+	// Example: bind
 	// Required: true
 	Type string `json:"Type"`
 }
diff --git a/api/types/storage/driver_data.go b/api/types/storage/driver_data.go
index 009e213095..65d5b4c20e 100644
--- a/api/types/storage/driver_data.go
+++ b/api/types/storage/driver_data.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package storage
 
 // This file was generated by the swagger tool.
@@ -14,10 +16,12 @@ type DriverData struct {
 	// This information is driver-specific, and depends on the storage-driver
 	// in use, and should be used for informational purposes only.
 	//
+	// Example: {"MergedDir":"/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/merged","UpperDir":"/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/diff","WorkDir":"/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/work"}
 	// Required: true
 	Data map[string]string `json:"Data"`
 
 	// Name of the storage driver.
+	// Example: overlay2
 	// Required: true
 	Name string `json:"Name"`
 }
diff --git a/api/types/swarm/service_create_response.go b/api/types/swarm/service_create_response.go
index 9a268ff1b9..ebbc097d90 100644
--- a/api/types/swarm/service_create_response.go
+++ b/api/types/swarm/service_create_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package swarm
 
 // This file was generated by the swagger tool.
@@ -10,11 +12,13 @@ package swarm
 type ServiceCreateResponse struct {
 
 	// The ID of the created service.
+	// Example: ak7w3gjqoa3kuz8xcpnyy0pvl
 	ID string `json:"ID,omitempty"`
 
 	// Optional warning message.
 	//
 	// FIXME(thaJeztah): this should have "omitempty" in the generated type.
 	//
+	// Example: ["unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"]
 	Warnings []string `json:"Warnings"`
 }
diff --git a/api/types/swarm/service_update_response.go b/api/types/swarm/service_update_response.go
index 0417467dae..b7649096a0 100644
--- a/api/types/swarm/service_update_response.go
+++ b/api/types/swarm/service_update_response.go
@@ -1,9 +1,13 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package swarm
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // ServiceUpdateResponse service update response
+// Example: {"Warnings":["unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"]}
+//
 // swagger:model ServiceUpdateResponse
 type ServiceUpdateResponse struct {
 
diff --git a/api/types/volume/create_options.go b/api/types/volume/create_options.go
index 37c41a6096..c7b18a6d48 100644
--- a/api/types/volume/create_options.go
+++ b/api/types/volume/create_options.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package volume
 
 // This file was generated by the swagger tool.
@@ -5,7 +7,8 @@ package volume
 
 // CreateOptions VolumeConfig
 //
-// Volume configuration
+// # Volume configuration
+//
 // swagger:model CreateOptions
 type CreateOptions struct {
 
@@ -13,17 +16,21 @@ type CreateOptions struct {
 	ClusterVolumeSpec *ClusterVolumeSpec `json:"ClusterVolumeSpec,omitempty"`
 
 	// Name of the volume driver to use.
+	// Example: custom
 	Driver string `json:"Driver,omitempty"`
 
 	// A mapping of driver options and values. These options are
 	// passed directly to the driver and are driver specific.
 	//
+	// Example: {"device":"tmpfs","o":"size=100m,uid=1000","type":"tmpfs"}
 	DriverOpts map[string]string `json:"DriverOpts,omitempty"`
 
 	// User-defined key/value metadata.
+	// Example: {"com.example.some-label":"some-value","com.example.some-other-label":"some-other-value"}
 	Labels map[string]string `json:"Labels,omitempty"`
 
 	// The new volume's name. If not specified, Docker generates a name.
 	//
+	// Example: tardis
 	Name string `json:"Name,omitempty"`
 }
diff --git a/api/types/volume/list_response.go b/api/types/volume/list_response.go
index ca5192a2a9..b725b6f121 100644
--- a/api/types/volume/list_response.go
+++ b/api/types/volume/list_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package volume
 
 // This file was generated by the swagger tool.
@@ -5,7 +7,8 @@ package volume
 
 // ListResponse VolumeListResponse
 //
-// Volume list response
+// # Volume list response
+//
 // swagger:model ListResponse
 type ListResponse struct {
 
@@ -14,5 +17,6 @@ type ListResponse struct {
 
 	// Warnings that occurred when fetching the list of volumes.
 	//
+	// Example: []
 	Warnings []string `json:"Warnings"`
 }
diff --git a/api/types/volume/volume.go b/api/types/volume/volume.go
index ea7d555e5b..7c199ed1e7 100644
--- a/api/types/volume/volume.go
+++ b/api/types/volume/volume.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package volume
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // Volume volume
+//
 // swagger:model Volume
 type Volume struct {
 
@@ -11,33 +14,41 @@ type Volume struct {
 	ClusterVolume *ClusterVolume `json:"ClusterVolume,omitempty"`
 
 	// Date/Time the volume was created.
+	// Example: 2016-06-07T20:31:11.853781916Z
 	CreatedAt string `json:"CreatedAt,omitempty"`
 
 	// Name of the volume driver used by the volume.
+	// Example: custom
 	// Required: true
 	Driver string `json:"Driver"`
 
 	// User-defined key/value metadata.
+	// Example: {"com.example.some-label":"some-value","com.example.some-other-label":"some-other-value"}
 	// Required: true
 	Labels map[string]string `json:"Labels"`
 
 	// Mount path of the volume on the host.
+	// Example: /var/lib/docker/volumes/tardis
 	// Required: true
 	Mountpoint string `json:"Mountpoint"`
 
 	// Name of the volume.
+	// Example: tardis
 	// Required: true
 	Name string `json:"Name"`
 
 	// The driver specific options used when creating the volume.
 	//
+	// Example: {"device":"tmpfs","o":"size=100m,uid=1000","type":"tmpfs"}
 	// Required: true
 	Options map[string]string `json:"Options"`
 
 	// The level at which the volume exists. Either `global` for cluster-wide,
 	// or `local` for machine level.
 	//
+	// Example: local
 	// Required: true
+	// Enum: ["local","global"]
 	Scope string `json:"Scope"`
 
 	// Low-level details about the volume, provided by the volume driver.
@@ -47,6 +58,7 @@ type Volume struct {
 	// The `Status` field is optional, and is omitted if the volume driver
 	// does not support this feature.
 	//
+	// Example: {"hello":"world"}
 	Status map[string]interface{} `json:"Status,omitempty"`
 
 	// usage data
diff --git a/hack/generate-swagger-api.sh b/hack/generate-swagger-api.sh
index 1397830121..b139fa6e35 100755
--- a/hack/generate-swagger-api.sh
+++ b/hack/generate-swagger-api.sh
@@ -2,7 +2,8 @@
 set -eu
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n ErrorResponse \
 	-n Plugin \
 	-n PluginDevice \
@@ -11,15 +12,18 @@ swagger generate model -f api/swagger.yaml \
 	-n PluginInterfaceType
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types/common --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types/common -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n IDResponse
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types/storage --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types/storage -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n DriverData
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types/container --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types/container -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n ContainerCreateResponse \
 	-n ContainerUpdateResponse \
 	-n ContainerTopResponse \
@@ -30,28 +34,33 @@ swagger generate model -f api/swagger.yaml \
 	-n Port
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types/image --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types/image -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n ImageDeleteResponseItem
 #-n ImageSummary TODO: Restore when go-swagger is updated
 # See https://github.com/moby/moby/pull/47526#discussion_r1551800022
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types/network --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types/network -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n NetworkCreateResponse
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types/volume --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types/volume -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n Volume \
 	-n VolumeCreateOptions \
 	-n VolumeListResponse
 
 swagger generate operation -f api/swagger.yaml \
 	-t api -a types -m types -C api/swagger-gen.yaml \
-	-T api/templates --skip-responses --skip-parameters --skip-validator \
+	-T api/templates --allow-template-override \
+	--skip-responses --skip-parameters \
 	-n Authenticate \
 	-n ImageHistory
 
 swagger generate model -f api/swagger.yaml \
-	-t api -m types/swarm --skip-validator -C api/swagger-gen.yaml \
+	-t api -m types/swarm -C api/swagger-gen.yaml \
+	-T api/templates --allow-template-override \
 	-n ServiceCreateResponse \
 	-n ServiceUpdateResponse
diff --git a/vendor/github.com/moby/moby/api/types/common/id_response.go b/vendor/github.com/moby/moby/api/types/common/id_response.go
index 22e8c60a48..7dfe4bf12b 100644
--- a/vendor/github.com/moby/moby/api/types/common/id_response.go
+++ b/vendor/github.com/moby/moby/api/types/common/id_response.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package common
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // IDResponse Response to an API call that returns just an Id
+//
 // swagger:model IDResponse
 type IDResponse struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/container/change_type.go b/vendor/github.com/moby/moby/api/types/container/change_type.go
index fe8d6d3696..52fc99235b 100644
--- a/vendor/github.com/moby/moby/api/types/container/change_type.go
+++ b/vendor/github.com/moby/moby/api/types/container/change_type.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
diff --git a/vendor/github.com/moby/moby/api/types/container/create_response.go b/vendor/github.com/moby/moby/api/types/container/create_response.go
index aa0e7f7d07..39d761aa96 100644
--- a/vendor/github.com/moby/moby/api/types/container/create_response.go
+++ b/vendor/github.com/moby/moby/api/types/container/create_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -5,15 +7,18 @@ package container
 
 // CreateResponse ContainerCreateResponse
 //
-// OK response to ContainerCreate operation
+// # OK response to ContainerCreate operation
+//
 // swagger:model CreateResponse
 type CreateResponse struct {
 
 	// The ID of the created container
+	// Example: ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743
 	// Required: true
 	ID string `json:"Id"`
 
 	// Warnings encountered when creating the container
+	// Example: []
 	// Required: true
 	Warnings []string `json:"Warnings"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/container/filesystem_change.go b/vendor/github.com/moby/moby/api/types/container/filesystem_change.go
index 9e9c2ad1d5..b9ec83e521 100644
--- a/vendor/github.com/moby/moby/api/types/container/filesystem_change.go
+++ b/vendor/github.com/moby/moby/api/types/container/filesystem_change.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
diff --git a/vendor/github.com/moby/moby/api/types/container/port.go b/vendor/github.com/moby/moby/api/types/container/port.go
index 895043cfe9..bbaa317fdb 100644
--- a/vendor/github.com/moby/moby/api/types/container/port.go
+++ b/vendor/github.com/moby/moby/api/types/container/port.go
@@ -1,9 +1,13 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // Port An open port on a container
+// Example: {"PrivatePort":8080,"PublicPort":80,"Type":"tcp"}
+//
 // swagger:model Port
 type Port struct {
 
@@ -19,5 +23,6 @@ type Port struct {
 
 	// type
 	// Required: true
+	// Enum: ["tcp","udp","sctp"]
 	Type string `json:"Type"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/container/top_response.go b/vendor/github.com/moby/moby/api/types/container/top_response.go
index b4bae5ef03..966603617f 100644
--- a/vendor/github.com/moby/moby/api/types/container/top_response.go
+++ b/vendor/github.com/moby/moby/api/types/container/top_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -6,13 +8,16 @@ package container
 // TopResponse ContainerTopResponse
 //
 // Container "top" response.
+//
 // swagger:model TopResponse
 type TopResponse struct {
 
 	// Each process running in the container, where each process
 	// is an array of values corresponding to the titles.
+	// Example: {"Processes":[["root","13642","882","0","17:03","pts/0","00:00:00","/bin/bash"],["root","13735","13642","0","17:06","pts/0","00:00:00","sleep 10"]]}
 	Processes [][]string `json:"Processes"`
 
 	// The ps column titles
+	// Example: {"Titles":["UID","PID","PPID","C","STIME","TTY","TIME","CMD"]}
 	Titles []string `json:"Titles"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/container/update_response.go b/vendor/github.com/moby/moby/api/types/container/update_response.go
index e2b5bf5ac0..2f7263b141 100644
--- a/vendor/github.com/moby/moby/api/types/container/update_response.go
+++ b/vendor/github.com/moby/moby/api/types/container/update_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -6,9 +8,11 @@ package container
 // UpdateResponse ContainerUpdateResponse
 //
 // Response for a successful container-update.
+//
 // swagger:model UpdateResponse
 type UpdateResponse struct {
 
 	// Warnings encountered when updating the container.
+	// Example: ["Published ports are discarded when using host network mode"]
 	Warnings []string `json:"Warnings"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/container/wait_exit_error.go b/vendor/github.com/moby/moby/api/types/container/wait_exit_error.go
index ab56d4eed8..96a7770c34 100644
--- a/vendor/github.com/moby/moby/api/types/container/wait_exit_error.go
+++ b/vendor/github.com/moby/moby/api/types/container/wait_exit_error.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // WaitExitError container waiting error, if any
+//
 // swagger:model WaitExitError
 type WaitExitError struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/container/wait_response.go b/vendor/github.com/moby/moby/api/types/container/wait_response.go
index 84fc6afddc..68d3c38724 100644
--- a/vendor/github.com/moby/moby/api/types/container/wait_response.go
+++ b/vendor/github.com/moby/moby/api/types/container/wait_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package container
 
 // This file was generated by the swagger tool.
@@ -5,7 +7,8 @@ package container
 
 // WaitResponse ContainerWaitResponse
 //
-// OK response to ContainerWait operation
+// # OK response to ContainerWait operation
+//
 // swagger:model WaitResponse
 type WaitResponse struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/error_response.go b/vendor/github.com/moby/moby/api/types/error_response.go
index dc942d9d9e..0013435dbc 100644
--- a/vendor/github.com/moby/moby/api/types/error_response.go
+++ b/vendor/github.com/moby/moby/api/types/error_response.go
@@ -1,9 +1,13 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // ErrorResponse Represents an error.
+// Example: {"message":"Something went wrong."}
+//
 // swagger:model ErrorResponse
 type ErrorResponse struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/image/delete_response.go b/vendor/github.com/moby/moby/api/types/image/delete_response.go
index 998620dc6a..b19119a381 100644
--- a/vendor/github.com/moby/moby/api/types/image/delete_response.go
+++ b/vendor/github.com/moby/moby/api/types/image/delete_response.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package image
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // DeleteResponse delete response
+//
 // swagger:model DeleteResponse
 type DeleteResponse struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/image/image_history.go b/vendor/github.com/moby/moby/api/types/image/image_history.go
index a6cdab84d8..40aa962585 100644
--- a/vendor/github.com/moby/moby/api/types/image/image_history.go
+++ b/vendor/github.com/moby/moby/api/types/image/image_history.go
@@ -7,6 +7,7 @@ package image
 // ----------------------------------------------------------------------------
 
 // HistoryResponseItem individual image layer information in response to ImageHistory operation
+//
 // swagger:model HistoryResponseItem
 type HistoryResponseItem struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/network/create_response.go b/vendor/github.com/moby/moby/api/types/network/create_response.go
index c32b35bff5..1997059912 100644
--- a/vendor/github.com/moby/moby/api/types/network/create_response.go
+++ b/vendor/github.com/moby/moby/api/types/network/create_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package network
 
 // This file was generated by the swagger tool.
@@ -5,11 +7,13 @@ package network
 
 // CreateResponse NetworkCreateResponse
 //
-// OK response to NetworkCreate operation
+// # OK response to NetworkCreate operation
+//
 // swagger:model CreateResponse
 type CreateResponse struct {
 
 	// The ID of the created network.
+	// Example: b5c4fc71e8022147cd25de22b22173de4e3b170134117172eb595cb91b4e7e5d
 	// Required: true
 	ID string `json:"Id"`
 
diff --git a/vendor/github.com/moby/moby/api/types/plugin.go b/vendor/github.com/moby/moby/api/types/plugin.go
index abae48b9ab..7fbb52218a 100644
--- a/vendor/github.com/moby/moby/api/types/plugin.go
+++ b/vendor/github.com/moby/moby/api/types/plugin.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // Plugin A plugin for the Engine API
+//
 // swagger:model Plugin
 type Plugin struct {
 
@@ -12,17 +15,21 @@ type Plugin struct {
 	Config PluginConfig `json:"Config"`
 
 	// True if the plugin is running. False if the plugin is not running, only installed.
+	// Example: true
 	// Required: true
 	Enabled bool `json:"Enabled"`
 
 	// Id
+	// Example: 5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078
 	ID string `json:"Id,omitempty"`
 
 	// name
+	// Example: tiborvass/sample-volume-plugin
 	// Required: true
 	Name string `json:"Name"`
 
 	// plugin remote reference used to push/pull the plugin
+	// Example: localhost:5000/tiborvass/sample-volume-plugin:latest
 	PluginReference string `json:"PluginReference,omitempty"`
 
 	// settings
@@ -31,6 +38,7 @@ type Plugin struct {
 }
 
 // PluginConfig The config of a plugin.
+//
 // swagger:model PluginConfig
 type PluginConfig struct {
 
@@ -39,21 +47,26 @@ type PluginConfig struct {
 	Args PluginConfigArgs `json:"Args"`
 
 	// description
+	// Example: A sample volume plugin for Docker
 	// Required: true
 	Description string `json:"Description"`
 
 	// Docker Version used to create the plugin
+	// Example: 17.06.0-ce
 	DockerVersion string `json:"DockerVersion,omitempty"`
 
 	// documentation
+	// Example: https://docs.docker.com/engine/extend/plugins/
 	// Required: true
 	Documentation string `json:"Documentation"`
 
 	// entrypoint
+	// Example: ["/usr/bin/sample-volume-plugin","/data"]
 	// Required: true
 	Entrypoint []string `json:"Entrypoint"`
 
 	// env
+	// Example: [{"Description":"If set, prints debug messages","Name":"DEBUG","Settable":null,"Value":"0"}]
 	// Required: true
 	Env []PluginEnv `json:"Env"`
 
@@ -62,6 +75,7 @@ type PluginConfig struct {
 	Interface PluginConfigInterface `json:"Interface"`
 
 	// ipc host
+	// Example: false
 	// Required: true
 	IpcHost bool `json:"IpcHost"`
 
@@ -78,10 +92,12 @@ type PluginConfig struct {
 	Network PluginConfigNetwork `json:"Network"`
 
 	// pid host
+	// Example: false
 	// Required: true
 	PidHost bool `json:"PidHost"`
 
 	// propagated mount
+	// Example: /mnt/volumes
 	// Required: true
 	PropagatedMount string `json:"PropagatedMount"`
 
@@ -89,6 +105,7 @@ type PluginConfig struct {
 	User PluginConfigUser `json:"User,omitempty"`
 
 	// work dir
+	// Example: /bin/
 	// Required: true
 	WorkDir string `json:"WorkDir"`
 
@@ -97,14 +114,17 @@ type PluginConfig struct {
 }
 
 // PluginConfigArgs plugin config args
+//
 // swagger:model PluginConfigArgs
 type PluginConfigArgs struct {
 
 	// description
+	// Example: command line arguments
 	// Required: true
 	Description string `json:"Description"`
 
 	// name
+	// Example: args
 	// Required: true
 	Name string `json:"Name"`
 
@@ -118,30 +138,38 @@ type PluginConfigArgs struct {
 }
 
 // PluginConfigInterface The interface between Docker and the plugin
+//
 // swagger:model PluginConfigInterface
 type PluginConfigInterface struct {
 
 	// Protocol to use for clients connecting to the plugin.
+	// Example: some.protocol/v1.0
+	// Enum: ["","moby.plugins.http/v1"]
 	ProtocolScheme string `json:"ProtocolScheme,omitempty"`
 
 	// socket
+	// Example: plugins.sock
 	// Required: true
 	Socket string `json:"Socket"`
 
 	// types
+	// Example: ["docker.volumedriver/1.0"]
 	// Required: true
 	Types []PluginInterfaceType `json:"Types"`
 }
 
 // PluginConfigLinux plugin config linux
+//
 // swagger:model PluginConfigLinux
 type PluginConfigLinux struct {
 
 	// allow all devices
+	// Example: false
 	// Required: true
 	AllowAllDevices bool `json:"AllowAllDevices"`
 
 	// capabilities
+	// Example: ["CAP_SYS_ADMIN","CAP_SYSLOG"]
 	// Required: true
 	Capabilities []string `json:"Capabilities"`
 
@@ -151,37 +179,46 @@ type PluginConfigLinux struct {
 }
 
 // PluginConfigNetwork plugin config network
+//
 // swagger:model PluginConfigNetwork
 type PluginConfigNetwork struct {
 
 	// type
+	// Example: host
 	// Required: true
 	Type string `json:"Type"`
 }
 
 // PluginConfigRootfs plugin config rootfs
+//
 // swagger:model PluginConfigRootfs
 type PluginConfigRootfs struct {
 
 	// diff ids
+	// Example: ["sha256:675532206fbf3030b8458f88d6e26d4eb1577688a25efec97154c94e8b6b4887","sha256:e216a057b1cb1efc11f8a268f37ef62083e70b1b38323ba252e25ac88904a7e8"]
 	DiffIds []string `json:"diff_ids"`
 
 	// type
+	// Example: layers
 	Type string `json:"type,omitempty"`
 }
 
 // PluginConfigUser plugin config user
+//
 // swagger:model PluginConfigUser
 type PluginConfigUser struct {
 
 	// g ID
+	// Example: 1000
 	GID uint32 `json:"GID,omitempty"`
 
 	// UID
+	// Example: 1000
 	UID uint32 `json:"UID,omitempty"`
 }
 
 // PluginSettings Settings that can be modified by users.
+//
 // swagger:model PluginSettings
 type PluginSettings struct {
 
@@ -194,6 +231,7 @@ type PluginSettings struct {
 	Devices []PluginDevice `json:"Devices"`
 
 	// env
+	// Example: ["DEBUG=0"]
 	// Required: true
 	Env []string `json:"Env"`
 
diff --git a/vendor/github.com/moby/moby/api/types/plugin_device.go b/vendor/github.com/moby/moby/api/types/plugin_device.go
index 5699010675..d02aee63ad 100644
--- a/vendor/github.com/moby/moby/api/types/plugin_device.go
+++ b/vendor/github.com/moby/moby/api/types/plugin_device.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginDevice plugin device
+//
 // swagger:model PluginDevice
 type PluginDevice struct {
 
@@ -16,6 +19,7 @@ type PluginDevice struct {
 	Name string `json:"Name"`
 
 	// path
+	// Example: /dev/fuse
 	// Required: true
 	Path *string `json:"Path"`
 
diff --git a/vendor/github.com/moby/moby/api/types/plugin_env.go b/vendor/github.com/moby/moby/api/types/plugin_env.go
index 32962dc2eb..061cf74e70 100644
--- a/vendor/github.com/moby/moby/api/types/plugin_env.go
+++ b/vendor/github.com/moby/moby/api/types/plugin_env.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginEnv plugin env
+//
 // swagger:model PluginEnv
 type PluginEnv struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/plugin_interface_type.go b/vendor/github.com/moby/moby/api/types/plugin_interface_type.go
index c82f204e87..f9d3be2f8d 100644
--- a/vendor/github.com/moby/moby/api/types/plugin_interface_type.go
+++ b/vendor/github.com/moby/moby/api/types/plugin_interface_type.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginInterfaceType plugin interface type
+//
 // swagger:model PluginInterfaceType
 type PluginInterfaceType struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/plugin_mount.go b/vendor/github.com/moby/moby/api/types/plugin_mount.go
index 5c031cf8b5..8853444b2d 100644
--- a/vendor/github.com/moby/moby/api/types/plugin_mount.go
+++ b/vendor/github.com/moby/moby/api/types/plugin_mount.go
@@ -1,25 +1,32 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package types
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // PluginMount plugin mount
+//
 // swagger:model PluginMount
 type PluginMount struct {
 
 	// description
+	// Example: This is a mount that's used by the plugin.
 	// Required: true
 	Description string `json:"Description"`
 
 	// destination
+	// Example: /mnt/state
 	// Required: true
 	Destination string `json:"Destination"`
 
 	// name
+	// Example: some-mount
 	// Required: true
 	Name string `json:"Name"`
 
 	// options
+	// Example: ["rbind","rw"]
 	// Required: true
 	Options []string `json:"Options"`
 
@@ -28,10 +35,12 @@ type PluginMount struct {
 	Settable []string `json:"Settable"`
 
 	// source
+	// Example: /var/lib/docker/plugins/
 	// Required: true
 	Source *string `json:"Source"`
 
 	// type
+	// Example: bind
 	// Required: true
 	Type string `json:"Type"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/storage/driver_data.go b/vendor/github.com/moby/moby/api/types/storage/driver_data.go
index 009e213095..65d5b4c20e 100644
--- a/vendor/github.com/moby/moby/api/types/storage/driver_data.go
+++ b/vendor/github.com/moby/moby/api/types/storage/driver_data.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package storage
 
 // This file was generated by the swagger tool.
@@ -14,10 +16,12 @@ type DriverData struct {
 	// This information is driver-specific, and depends on the storage-driver
 	// in use, and should be used for informational purposes only.
 	//
+	// Example: {"MergedDir":"/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/merged","UpperDir":"/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/diff","WorkDir":"/var/lib/docker/overlay2/ef749362d13333e65fc95c572eb525abbe0052e16e086cb64bc3b98ae9aa6d74/work"}
 	// Required: true
 	Data map[string]string `json:"Data"`
 
 	// Name of the storage driver.
+	// Example: overlay2
 	// Required: true
 	Name string `json:"Name"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/swarm/service_create_response.go b/vendor/github.com/moby/moby/api/types/swarm/service_create_response.go
index 9a268ff1b9..ebbc097d90 100644
--- a/vendor/github.com/moby/moby/api/types/swarm/service_create_response.go
+++ b/vendor/github.com/moby/moby/api/types/swarm/service_create_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package swarm
 
 // This file was generated by the swagger tool.
@@ -10,11 +12,13 @@ package swarm
 type ServiceCreateResponse struct {
 
 	// The ID of the created service.
+	// Example: ak7w3gjqoa3kuz8xcpnyy0pvl
 	ID string `json:"ID,omitempty"`
 
 	// Optional warning message.
 	//
 	// FIXME(thaJeztah): this should have "omitempty" in the generated type.
 	//
+	// Example: ["unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"]
 	Warnings []string `json:"Warnings"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/swarm/service_update_response.go b/vendor/github.com/moby/moby/api/types/swarm/service_update_response.go
index 0417467dae..b7649096a0 100644
--- a/vendor/github.com/moby/moby/api/types/swarm/service_update_response.go
+++ b/vendor/github.com/moby/moby/api/types/swarm/service_update_response.go
@@ -1,9 +1,13 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package swarm
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // ServiceUpdateResponse service update response
+// Example: {"Warnings":["unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"]}
+//
 // swagger:model ServiceUpdateResponse
 type ServiceUpdateResponse struct {
 
diff --git a/vendor/github.com/moby/moby/api/types/volume/create_options.go b/vendor/github.com/moby/moby/api/types/volume/create_options.go
index 37c41a6096..c7b18a6d48 100644
--- a/vendor/github.com/moby/moby/api/types/volume/create_options.go
+++ b/vendor/github.com/moby/moby/api/types/volume/create_options.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package volume
 
 // This file was generated by the swagger tool.
@@ -5,7 +7,8 @@ package volume
 
 // CreateOptions VolumeConfig
 //
-// Volume configuration
+// # Volume configuration
+//
 // swagger:model CreateOptions
 type CreateOptions struct {
 
@@ -13,17 +16,21 @@ type CreateOptions struct {
 	ClusterVolumeSpec *ClusterVolumeSpec `json:"ClusterVolumeSpec,omitempty"`
 
 	// Name of the volume driver to use.
+	// Example: custom
 	Driver string `json:"Driver,omitempty"`
 
 	// A mapping of driver options and values. These options are
 	// passed directly to the driver and are driver specific.
 	//
+	// Example: {"device":"tmpfs","o":"size=100m,uid=1000","type":"tmpfs"}
 	DriverOpts map[string]string `json:"DriverOpts,omitempty"`
 
 	// User-defined key/value metadata.
+	// Example: {"com.example.some-label":"some-value","com.example.some-other-label":"some-other-value"}
 	Labels map[string]string `json:"Labels,omitempty"`
 
 	// The new volume's name. If not specified, Docker generates a name.
 	//
+	// Example: tardis
 	Name string `json:"Name,omitempty"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/volume/list_response.go b/vendor/github.com/moby/moby/api/types/volume/list_response.go
index ca5192a2a9..b725b6f121 100644
--- a/vendor/github.com/moby/moby/api/types/volume/list_response.go
+++ b/vendor/github.com/moby/moby/api/types/volume/list_response.go
@@ -1,3 +1,5 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package volume
 
 // This file was generated by the swagger tool.
@@ -5,7 +7,8 @@ package volume
 
 // ListResponse VolumeListResponse
 //
-// Volume list response
+// # Volume list response
+//
 // swagger:model ListResponse
 type ListResponse struct {
 
@@ -14,5 +17,6 @@ type ListResponse struct {
 
 	// Warnings that occurred when fetching the list of volumes.
 	//
+	// Example: []
 	Warnings []string `json:"Warnings"`
 }
diff --git a/vendor/github.com/moby/moby/api/types/volume/volume.go b/vendor/github.com/moby/moby/api/types/volume/volume.go
index ea7d555e5b..7c199ed1e7 100644
--- a/vendor/github.com/moby/moby/api/types/volume/volume.go
+++ b/vendor/github.com/moby/moby/api/types/volume/volume.go
@@ -1,9 +1,12 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
 package volume
 
 // This file was generated by the swagger tool.
 // Editing this file might prove futile when you re-run the swagger generate command
 
 // Volume volume
+//
 // swagger:model Volume
 type Volume struct {
 
@@ -11,33 +14,41 @@ type Volume struct {
 	ClusterVolume *ClusterVolume `json:"ClusterVolume,omitempty"`
 
 	// Date/Time the volume was created.
+	// Example: 2016-06-07T20:31:11.853781916Z
 	CreatedAt string `json:"CreatedAt,omitempty"`
 
 	// Name of the volume driver used by the volume.
+	// Example: custom
 	// Required: true
 	Driver string `json:"Driver"`
 
 	// User-defined key/value metadata.
+	// Example: {"com.example.some-label":"some-value","com.example.some-other-label":"some-other-value"}
 	// Required: true
 	Labels map[string]string `json:"Labels"`
 
 	// Mount path of the volume on the host.
+	// Example: /var/lib/docker/volumes/tardis
 	// Required: true
 	Mountpoint string `json:"Mountpoint"`
 
 	// Name of the volume.
+	// Example: tardis
 	// Required: true
 	Name string `json:"Name"`
 
 	// The driver specific options used when creating the volume.
 	//
+	// Example: {"device":"tmpfs","o":"size=100m,uid=1000","type":"tmpfs"}
 	// Required: true
 	Options map[string]string `json:"Options"`
 
 	// The level at which the volume exists. Either `global` for cluster-wide,
 	// or `local` for machine level.
 	//
+	// Example: local
 	// Required: true
+	// Enum: ["local","global"]
 	Scope string `json:"Scope"`
 
 	// Low-level details about the volume, provided by the volume driver.
@@ -47,6 +58,7 @@ type Volume struct {
 	// The `Status` field is optional, and is omitted if the volume driver
 	// does not support this feature.
 	//
+	// Example: {"hello":"world"}
 	Status map[string]interface{} `json:"Status,omitempty"`
 
 	// usage data