@@ -99,7 +99,6 @@ be found.

 + Add `Isolation` to the /info endpoint [#26255](https://github.com/docker/docker/pull/26255)

 + Add `userns` to the /info endpoint [#27840](https://github.com/docker/docker/pull/27840)

 - Do not allow more than one mode be requested at once in the services endpoint [#26643](https://github.com/docker/docker/pull/26643)

-+ Add `--mount` flag to `docker create` and `docker run` [#26825](https://github.com/docker/docker/pull/26825)[#28150](https://github.com/docker/docker/pull/28150)

 + Add capability to /containers/create API to specify mounts in a more granular and safer way [#22373](https://github.com/docker/docker/pull/22373)

 + Add `--format` flag to `network ls` and `volume ls` [#23475](https://github.com/docker/docker/pull/23475)

 * Allow the top-level `docker inspect` command to inspect any kind of resource [#23614](https://github.com/docker/docker/pull/23614)

@@ -18,6 +18,10 @@

 # ppc64le/golang is a debian:jessie based image with golang installed

 FROM ppc64le/golang:1.6.3

+# allow replacing httpredir or deb mirror

+ARG APT_MIRROR=deb.debian.org

+RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

+

 # Packaged dependencies

 RUN apt-get update && apt-get install -y \

 	apparmor \

@@ -144,4 +144,4 @@ swagger-gen:

 		-w /go/src/github.com/docker/docker \

 		--entrypoint hack/generate-swagger-api.sh \

 		-e GOPATH=/go \

-		quay.io/goswagger/swagger

+		quay.io/goswagger/swagger:0.7.4

@@ -383,6 +383,7 @@ func (sr *swarmRouter) removeSecret(ctx context.Context, w http.ResponseWriter,

 	if err := sr.backend.RemoveSecret(vars["id"]); err != nil {

 		return err

 	}

+	w.WriteHeader(http.StatusNoContent)

 	return nil

 }

@@ -1,3 +1,14 @@

+# A Swagger 2.0 (a.k.a. OpenAPI) definition of the Engine API.

+#

+# This is used for generating API documentation and the types used by the

+# client/server. See api/README.md for more information.

+#

+# Some style notes:

+# - This file is used by ReDoc, which allows GitHub Flavored Markdown in

+#   descriptions.

+# - There is no maximum line length, for ease of editing and pretty diffs.

+# - operationIds are in the format "NounVerb", with a singular noun.

+

 swagger: "2.0"

 schemes:

   - "http"

@@ -45,13 +56,13 @@ info:

     Docker version  | API version | Changes

     ----------------|-------------|---------

-    1.12.x | [1.24](/engine/api/v1.24/) | [API changes](/engine/api/version-history/#v1-24-api-changes)

-    1.11.x | [1.23](/engine/api/v1.23/) | [API changes](/engine/api/version-history/#v1-23-api-changes)

-    1.10.x | [1.22](/engine/api/v1.22/) | [API changes](/engine/api/version-history/#v1-22-api-changes)

-    1.9.x | [1.21](/engine/api/v1.21/) | [API changes](/engine/api/version-history/#v1-21-api-changes)

-    1.8.x | [1.20](/engine/api/v1.20/) | [API changes](/engine/api/version-history/#v1-20-api-changes)

-    1.7.x | [1.19](/engine/api/v1.19/) | [API changes](/engine/api/version-history/#v1-19-api-changes)

-    1.6.x | [1.18](/engine/api/v1.18/) | [API changes](/engine/api/version-history/#v1-18-api-changes)

+    1.12.x | [1.24](https://docs.docker.com/engine/api/v1.24/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-24-api-changes)

+    1.11.x | [1.23](https://docs.docker.com/engine/api/v1.23/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-23-api-changes)

+    1.10.x | [1.22](https://docs.docker.com/engine/api/v1.22/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-22-api-changes)

+    1.9.x | [1.21](https://docs.docker.com/engine/api/v1.21/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-21-api-changes)

+    1.8.x | [1.20](https://docs.docker.com/engine/api/v1.20/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-20-api-changes)

+    1.7.x | [1.19](https://docs.docker.com/engine/api/v1.19/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-19-api-changes)

+    1.6.x | [1.18](https://docs.docker.com/engine/api/v1.18/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-18-api-changes)

     # Authentication

@@ -68,7 +79,7 @@ info:

     The `serveraddress` is a domain/IP without a protocol. Throughout this structure, double quotes are required.

-    If you have already got an identity token from the [`/auth` endpoint](#operation/checkAuthentication), you can just pass this instead of credentials:

+    If you have already got an identity token from the [`/auth` endpoint](#operation/SystemAuth), you can just pass this instead of credentials:

     ```

     {

@@ -76,6 +87,48 @@ info:

     }

     ```

+# The tags on paths define the menu sections in the ReDoc documentation, so

+# the usage of tags must make sense for that:

+# - They should be singular, not plural.

+# - There should not be too many tags, or the menu becomes unwieldly. For

+#   example, it is preferable to add a path to the "System" tag instead of

+#   creating a tag with a single path in it.

+# - The order of tags in this list defines the order in the menu.

+tags:

+  # Primary objects

+  - name: "Container"

+    description: |

+      Create and manage containers.

+  - name: "Image"

+  - name: "Network"

+    description: |

+      Networks are user-defined networks that containers can be attached to. See the [networking documentation](https://docs.docker.com/engine/userguide/networking/) for more information.

+  - name: "Volume"

+    description: |

+      Create and manage persistent storage that can be attached to containers.

+  - name: "Exec"

+    description: |

+      Run new commands inside running containers. See the [command-line reference](https://docs.docker.com/engine/reference/commandline/exec/) for more information.

+

+      To exec a command in a container, you first need to create an exec instance, then start it. These two API endpoints are wrapped up in a single command-line command, `docker exec`.

+  - name: "Secret"

+  # Swarm things

+  - name: "Swarm"

+    description: |

+      Engines can be clustered together in a swarm. See [the swarm mode documentation](https://docs.docker.com/engine/swarm/) for more information.

+  - name: "Node"

+    description: |

+      Nodes are instances of the Engine participating in a swarm. Swarm mode must be enabled for these endpoints to work.

+  - name: "Service"

+    description: |

+      Services are the definitions of tasks to run on a swarm. Swarm mode must be enabled for these endpoints to work.

+  - name: "Task"

+    description: |

+      A task is a container running on a swarm. It is the atomic scheduling unit of swarm. Swarm mode must be enabled for these endpoints to work.

+  # System things

+  - name: "Plugin"

+  - name: "System"

+

 definitions:

   Port:

     type: "object"

@@ -2387,7 +2440,7 @@ paths:

   /containers/json:

     get:

       summary: "List containers"

-      operationId: "GetContainerList"

+      operationId: "ContainerList"

       produces:

         - "application/json"

       parameters:

@@ -2565,8 +2618,7 @@ paths:

           description: "server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/create:

     post:

       summary: "Create a container"

@@ -2765,13 +2817,12 @@ paths:

           description: "server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/json:

     get:

       summary: "Inspect a container"

       description: "Return low-level information about a container."

-      operationId: "GetContainerInspect"

+      operationId: "ContainerInspect"

       produces:

         - "application/json"

       responses:

@@ -3042,13 +3093,12 @@ paths:

           type: "boolean"

           default: false

           description: "Return the size of container as fields `SizeRw` and `SizeRootFs`"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/top:

     get:

       summary: "List processes running inside a container"

       description: "On Unix systems, this is done by running the `ps` command. This endpoint is not supported on Windows."

-      operationId: "GetContainerTop"

+      operationId: "ContainerTop"

       responses:

         200:

           description: "no error"

@@ -3119,8 +3169,7 @@ paths:

           description: "The arguments to pass to `ps`. For example, `aux`"

           type: "string"

           default: "-ef"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/logs:

     get:

       summary: "Get container logs"

@@ -3128,7 +3177,7 @@ paths:

         Get `stdout` and `stderr` logs from a container.

         Note: This endpoint works only for containers with the `json-file` or `journald` logging driver.

-      operationId: "GetContainerLogs"

+      operationId: "ContainerLogs"

       responses:

         101:

           description: "logs returned as a stream"

@@ -3161,7 +3210,7 @@ paths:

           description: |

             Return the logs as a stream.

-            This will return a `101` HTTP response with a `Connection: upgrade` header, then hijack the HTTP connection to send raw output. For more information about hijacking and the stream format, [see the documentation for the attach endpoint](#operation/PostContainerAttach).

+            This will return a `101` HTTP response with a `Connection: upgrade` header, then hijack the HTTP connection to send raw output. For more information about hijacking and the stream format, [see the documentation for the attach endpoint](#operation/ContainerAttach).

           type: "boolean"

           default: false

         - name: "stdout"

@@ -3189,8 +3238,7 @@ paths:

           description: "Only return this number of log lines from the end of the logs. Specify as an integer or `all` to output all log lines."

           type: "string"

           default: "all"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/changes:

     get:

       summary: "Get changes on a container’s filesystem"

@@ -3200,7 +3248,7 @@ paths:

         - `0`: Modified

         - `1`: Added

         - `2`: Deleted

-      operationId: "GetContainerChanges"

+      operationId: "ContainerChanges"

       produces:

         - "application/json"

       responses:

@@ -3246,13 +3294,12 @@ paths:

           required: true

           description: "ID or name of the container"

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/export:

     get:

       summary: "Export a container"

       description: "Export the contents of a container as a tarball."

-      operationId: "GetContainerExport"

+      operationId: "ContainerExport"

       produces:

         - "application/octet-stream"

       responses:

@@ -3275,8 +3322,7 @@ paths:

           required: true

           description: "ID or name of the container"

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/stats:

     get:

       summary: "Get container stats based on resource usage"

@@ -3284,7 +3330,7 @@ paths:

         This endpoint returns a live stream of a container’s resource usage statistics.

         The `precpu_stats` is the CPU statistic of last read, which is used for calculating the CPU usage percentage. It is not the same as the `cpu_stats` field.

-      operationId: "GetContainerStats"

+      operationId: "ContainerStats"

       produces:

         - "application/json"

       responses:

@@ -3404,13 +3450,12 @@ paths:

           description: "Stream the output. If false, the stats will be output once and then it will disconnect."

           type: "boolean"

           default: true

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/resize:

     post:

       summary: "Resize a container TTY"

       description: "Resize the TTY for a container. You must restart the container for the resize to take effect."

-      operationId: "PostContainerResize"

+      operationId: "ContainerResize"

       consumes:

         - "application/octet-stream"

       produces:

@@ -3443,12 +3488,11 @@ paths:

           in: "query"

           description: "Width of the tty session in characters"

           type: "integer"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/start:

     post:

       summary: "Start a container"

-      operationId: "PostContainerStart"

+      operationId: "ContainerStart"

       responses:

         204:

           description: "no error"

@@ -3477,12 +3521,11 @@ paths:

           in: "query"

           description: "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`."

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/stop:

     post:

       summary: "Stop a container"

-      operationId: "PostContainerStop"

+      operationId: "ContainerStop"

       responses:

         204:

           description: "no error"

@@ -3511,12 +3554,11 @@ paths:

           in: "query"

           description: "Number of seconds to wait before killing the container"

           type: "integer"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/restart:

     post:

       summary: "Restart a container"

-      operationId: "PostContainerRestart"

+      operationId: "ContainerRestart"

       responses:

         204:

           description: "no error"

@@ -3541,13 +3583,12 @@ paths:

           in: "query"

           description: "Number of seconds to wait before killing the container"

           type: "integer"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/kill:

     post:

       summary: "Kill a container"

       description: "Send a POSIX signal to a container, defaulting to killing to the container."

-      operationId: "PostContainerKill"

+      operationId: "ContainerKill"

       responses:

         204:

           description: "no error"

@@ -3573,8 +3614,7 @@ paths:

           description: "Signal to send to the container as an integer or string (e.g. `SIGINT`)"

           type: "string"

           default: "SIGKILL"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/update:

     post:

       summary: "Update a container"

@@ -3635,12 +3675,11 @@ paths:

               RestartPolicy:

                 MaximumRetryCount: 4

                 Name: "on-failure"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/rename:

     post:

       summary: "Rename a container"

-      operationId: "PostContainerRename"

+      operationId: "ContainerRename"

       responses:

         204:

           description: "no error"

@@ -3670,8 +3709,7 @@ paths:

           required: true

           description: "New name for the container"

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/pause:

     post:

       summary: "Pause a container"

@@ -3679,7 +3717,7 @@ paths:

         Use the cgroups freezer to suspend all processes in a container.

         Traditionally, when suspending a process the `SIGSTOP` signal is used, which is observable by the process being suspended. With the cgroups freezer the process is unaware, and unable to capture, that it is being suspended, and subsequently resumed.

-      operationId: "PostContainerPause"

+      operationId: "ContainerPause"

       responses:

         204:

           description: "no error"

@@ -3700,13 +3738,12 @@ paths:

           required: true

           description: "ID or name of the container"

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/unpause:

     post:

       summary: "Unpause a container"

       description: "Resume a container which has been paused."

-      operationId: "PostContainerUnpause"

+      operationId: "ContainerUnpause"

       responses:

         204:

           description: "no error"

@@ -3727,8 +3764,7 @@ paths:

           required: true

           description: "ID or name of the container"

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/attach:

     post:

       summary: "Attach to a container"

@@ -3737,7 +3773,7 @@ paths:

         Either the `stream` or `logs` parameter must be `true` for this endpoint to do anything.

-        See [the documentation for the `docker attach` command](/engine/reference/commandline/attach/) for more details.

+        See [the documentation for the `docker attach` command](https://docs.docker.com/engine/reference/commandline/attach/) for more details.

         ### Hijacking

@@ -3777,7 +3813,7 @@ paths:

         ### Stream format

-        When the TTY setting is disabled in [`POST /containers/create`](#operation/PostContainerCreate), the stream over the hijacked connected is multiplexed to separate out `stdout` and `stderr`. The stream consists of a series of frames, each containing a header and a payload.

+        When the TTY setting is disabled in [`POST /containers/create`](#operation/ContainerCreate), the stream over the hijacked connected is multiplexed to separate out `stdout` and `stderr`. The stream consists of a series of frames, each containing a header and a payload.

         The header contains the information which the stream writes (`stdout` or `stderr`). It also contains the size of the associated frame encoded in the last four bytes (`uint32`).

@@ -3807,9 +3843,9 @@ paths:

         ### Stream format when using a TTY

-        When the TTY setting is enabled in [`POST /containers/create`](#operation/PostContainerCreate), the stream is not multiplexed. The data exchanged over the hijacked connection is simply the raw data from the process PTY and client's `stdin`.

+        When the TTY setting is enabled in [`POST /containers/create`](#operation/ContainerCreate), the stream is not multiplexed. The data exchanged over the hijacked connection is simply the raw data from the process PTY and client's `stdin`.

-      operationId: "PostContainerAttach"

+      operationId: "ContainerAttach"

       produces:

         - "application/vnd.docker.raw-stream"

       responses:

@@ -3872,12 +3908,11 @@ paths:

           description: "Attach to `stderr`"

           type: "boolean"

           default: false

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/attach/ws:

     get:

       summary: "Attach to a container via a websocket"

-      operationId: "PostContainerAttachWebsocket"

+      operationId: "ContainerAttachWebsocket"

       responses:

         101:

           description: "no error, hints proxy about hijacking"

@@ -3933,8 +3968,7 @@ paths:

           description: "Attach to `stderr`"

           type: "boolean"

           default: false

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/wait:

     post:

       summary: "Wait for a container"

@@ -3969,12 +4003,11 @@ paths:

           required: true

           description: "ID or name of the container"

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}:

     delete:

       summary: "Remove a container"

-      operationId: "DeleteContainer"

+      operationId: "ContainerDelete"

       responses:

         204:

           description: "no error"

@@ -4009,13 +4042,12 @@ paths:

           description: "If the container is running, kill it before removing it."

           type: "boolean"

           default: false

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/{id}/archive:

     head:

       summary: "Get information about files in a container"

       description: "A response header `X-Docker-Container-Path-Stat` is return containing a base64 - encoded JSON object with some filesystem header information about the path."

-      operationId: "HeadContainerArchive"

+      operationId: "ContainerArchiveHead"

       responses:

         200:

           description: "no error"

@@ -4056,12 +4088,11 @@ paths:

           required: true

           description: "Resource in the container’s filesystem to archive."

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

     get:

       summary: "Get an archive of a filesystem resource in a container"

       description: "Get an tar archive of a resource in the filesystem of container id."

-      operationId: "GetContainerArchive"

+      operationId: "ContainerGetArchive"

       produces:

         - "application/x-tar"

       responses:

@@ -4100,12 +4131,11 @@ paths:

           required: true

           description: "Resource in the container’s filesystem to archive."

           type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

     put:

       summary: "Extract an archive of files or folders to a directory in a container"

       description: "Upload a tar archive to be extracted to a path in the filesystem of container id."

-      operationId: "PutContainerArchive"

+      operationId: "ContainerPutArchive"

       consumes:

         - "application/x-tar"

         - "application/octet-stream"

@@ -4152,8 +4182,7 @@ paths:

           description: "The input stream must be a tar archive compressed with one of the following algorithms: identity (no compression), gzip, bzip2, xz."

           schema:

             type: "string"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /containers/prune:

     post:

       summary: "Delete stopped containers"

@@ -4181,13 +4210,12 @@ paths:

           description: "Server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Container"

+      tags: ["Container"]

   /images/json:

     get:

       summary: "List Images"

       description: "Returns a list of images on the server. Note that it uses a different, smaller representation of an image than inspecting a single image."

-      operationId: "GetImageList"

+      operationId: "ImageList"

       produces:

         - "application/json"

       responses:

@@ -4253,20 +4281,19 @@ paths:

           description: "Show digest information as a `RepoDigests` field on each image."

           type: "boolean"

           default: false

-      tags:

-        - "Image"

+      tags: ["Image"]

   /build:

     post:

       summary: "Build an image"

       description: |

         Build an image from a tar archive with a `Dockerfile` in it.

-        The `Dockerfile` specifies how the image is built from the tar archive. It is typically in the archive's root, but can be at a different path or have a different name by specifying the `dockerfile` parameter. [See the `Dockerfile` reference for more information](/engine/reference/builder/).

+        The `Dockerfile` specifies how the image is built from the tar archive. It is typically in the archive's root, but can be at a different path or have a different name by specifying the `dockerfile` parameter. [See the `Dockerfile` reference for more information](https://docs.docker.com/engine/reference/builder/).

         The Docker daemon performs a preliminary validation of the `Dockerfile` before starting the build, and returns an error if the syntax is incorrect. After that, each instruction is run one-by-one until the ID of the new image is output.

         The build is canceled if the client drops the connection by quitting or being killed.

-      operationId: "PostImageBuild"

+      operationId: "ImageBuild"

       consumes:

         - "application/octet-stream"

       produces:

@@ -4345,7 +4372,7 @@ paths:

           type: "integer"

         - name: "buildargs"

           in: "query"

-          description: "JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](/engine/reference/builder/#arg)"

+          description: "JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)"

           type: "integer"

         - name: "shmsize"

           in: "query"

@@ -4401,13 +4428,12 @@ paths:

           description: "server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/create:

     post:

       summary: "Create an image"

       description: "Create an image by either pulling it from a registry or importing it."

-      operationId: "PostImageCreate"

+      operationId: "ImageCreate"

       consumes:

         - "text/plain"

         - "application/octet-stream"

@@ -4447,13 +4473,12 @@ paths:

           in: "header"

           description: "A base64-encoded auth configuration. [See the authentication section for details.](#section/Authentication)"

           type: "string"

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/{name}/json:

     get:

       summary: "Inspect an image"

       description: "Return low-level information about an image."

-      operationId: "GetImageInspect"

+      operationId: "ImageInspect"

       produces:

         - "application/json"

       responses:

@@ -4554,13 +4579,12 @@ paths:

           description: "Image name or id"

           type: "string"

           required: true

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/{name}/history:

     get:

       summary: "Get the history of an image"

       description: "Return parent layers of an image."

-      operationId: "GetImageHistory"

+      operationId: "ImageHistory"

       produces:

         - "application/json"

       responses:

@@ -4625,8 +4649,7 @@ paths:

           description: "Image name or ID"

           type: "string"

           required: true

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/{name}/push:

     post:

       summary: "Push an image"

@@ -4636,7 +4659,7 @@ paths:

         If you wish to push an image on to a private registry, that image must already have a tag which references the registry. For example, `registry.example.com/myimage:latest`.

         The push is cancelled if the HTTP connection is closed.

-      operationId: "PostImagePush"

+      operationId: "ImagePush"

       consumes:

         - "application/octet-stream"

       responses:

@@ -4665,13 +4688,12 @@ paths:

           description: "A base64-encoded auth configuration. [See the authentication section for details.](#section/Authentication)"

           type: "string"

           required: true

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/{name}/tag:

     post:

       summary: "Tag an image"

       description: "Tag an image so that it becomes part of a repository."

-      operationId: "PostImageTag"

+      operationId: "ImageTag"

       responses:

         201:

           description: "No error"

@@ -4705,8 +4727,7 @@ paths:

           in: "query"

           description: "The name of the new tag."

           type: "string"

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/{name}:

     delete:

       summary: "Remove an image"

@@ -4714,7 +4735,7 @@ paths:

         Remove an image, along with any untagged parent images that were referenced by that image.

         Images can't be removed if they have descendant images, are being used by a running container or are being used by a build.

-      operationId: "DeleteImage"

+      operationId: "ImageDelete"

       produces:

         - "application/json"

       responses:

@@ -4757,13 +4778,12 @@ paths:

           description: "Do not delete untagged parent images"

           type: "boolean"

           default: false

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/search:

     get:

       summary: "Search images"

       description: "Search for an image on Docker Hub."

-      operationId: "GetImageSearch"

+      operationId: "ImageSearch"

       produces:

         - "application/json"

       responses:

@@ -4824,8 +4844,7 @@ paths:

             - `is-automated=(true|false)`

             - `is-official=(true|false)`

           type: "string"

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/prune:

     post:

       summary: "Delete unused images"

@@ -4863,13 +4882,12 @@ paths:

           description: "Server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Image"

+      tags: ["Image"]

   /auth:

     post:

       summary: "Check auth configuration"

       description: "Validate credentials for a registry and, if available, get an identity token for accessing the registry without password."

-      operationId: "Authenticate"

+      operationId: "SystemAuth"

       consumes: ["application/json"]

       produces: ["application/json"]

       responses:

@@ -4903,11 +4921,11 @@ paths:

           description: "Authentication to check"

           schema:

             $ref: "#/definitions/AuthConfig"

-      tags: ["Registry"]

+      tags: ["System"]

   /info:

     get:

       summary: "Get system information"

-      operationId: "getSystemInformation"

+      operationId: "SystemInfo"

       produces:

         - "application/json"

       responses:

@@ -5115,13 +5133,12 @@ paths:

           description: "Server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Misc"

+      tags: ["System"]

   /version:

     get:

       summary: "Get version"

       description: "Returns the version of Docker that is running and various information about the system that Docker is running on."

-      operationId: "getVersion"

+      operationId: "SystemVersion"

       produces:

         - "application/json"

       responses:

@@ -5166,13 +5183,12 @@ paths:

           description: "server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Misc"

+      tags: ["System"]

   /_ping:

     get:

       summary: "Ping"

       description: "This is a dummy endpoint you can use to test if the server is accessible."

-      operationId: "ping"

+      operationId: "SystemPing"

       produces:

         - "text/plain"

       responses:

@@ -5185,12 +5201,11 @@ paths:

           description: "server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Misc"

+      tags: ["System"]

   /commit:

     post:

       summary: "Create a new image from a container"

-      operationId: "PostImageCommit"

+      operationId: "ImageCommit"

       consumes:

         - "application/json"

       produces:

@@ -5246,8 +5261,7 @@ paths:

           in: "query"

           description: "`Dockerfile` instructions to apply while committing"

           type: "string"

-      tags:

-        - "Image"

+      tags: ["Image"]

   /events:

     get:

       summary: "Monitor events"

@@ -5266,7 +5280,7 @@ paths:

         The Docker daemon reports these events: `reload`

-      operationId: "getEvents"

+      operationId: "SystemEvents"

       produces:

         - "application/json"

       responses:

@@ -5337,11 +5351,11 @@ paths:

             - `network=<string>` network name or ID

             - `daemon=<string>` daemon name or ID

           type: "string"

-      tags:

-        - "Misc"

+      tags: ["System"]

   /system/df:

     get:

       summary: "Get data usage information"

+      operationId: "SystemDataUsage"

       responses:

         200:

           description: "no error"

@@ -5426,8 +5440,7 @@ paths:

           description: "server error"

           schema:

             $ref: "#/definitions/ErrorResponse"

-      tags:

-        - "Misc"

+      tags: ["System"]

   /images/{name}/get:

     get:

       summary: "Export an image"

@@ -5455,7 +5468,7 @@ paths:

           }

         }

         ```

-      operationId: "GetImage"

+      operationId: "ImageGet"

       produces:

         - "application/x-tar"

       responses:

@@ -5474,8 +5487,7 @@ paths:

           description: "Image name or ID"

           type: "string"

           required: true

-      tags:

-        - "Image"

+      tags: ["Image"]

   /images/get:

     get:

       summary: "Export several images"

@@ -5484,8 +5496,8 @@ paths:

         For each value of the `names` parameter: if it is a specific name and tag (e.g. `ubuntu:latest`), then only that image (and its parents) are returned; if it is an image ID, similarly only that image (and its parents) are returned and there would be no names referenced in the 'repositories' file for this image ID.

-        For details on the format, see [the export image endpoint](#operation/GetImage).

-      operationId: "GetImageSaveAll"

+        For details on the format, see [the export image endpoint](#operation/ImageGet).

+      operationId: "ImageGetAll"

       produces:

         - "application/x-tar"

       responses:

@@ -5505,16 +5517,15 @@ paths:

           type: "array"

           items:

             type: "string"