diff --git a/docs/reference/api/docker_remote_api.md b/docs/reference/api/docker_remote_api.md index 77b9559fb3..25bb790fb1 100644 --- a/docs/reference/api/docker_remote_api.md +++ b/docs/reference/api/docker_remote_api.md @@ -103,6 +103,9 @@ This section lists each version from latest to oldest. Each listing includes a consistent with other date/time values returned by the API. * `AuthConfig` now supports a `registrytoken` for token based authentication * `POST /containers/create` now has a 4M minimum value limit for `HostConfig.KernelMemory` +* Pushes initated with `POST /images/(name)/push` and pulls initiated with `POST /images/create` + will be cancelled if the HTTP connection making the API request is closed before + the push or pull completes. ### v1.21 API changes diff --git a/docs/reference/api/docker_remote_api_v1.22.md b/docs/reference/api/docker_remote_api_v1.22.md index cf6c2f3c0c..7abcdd031a 100644 --- a/docs/reference/api/docker_remote_api_v1.22.md +++ b/docs/reference/api/docker_remote_api_v1.22.md @@ -1530,6 +1530,7 @@ Query Parameters: - **fromImage** – Name of the image to pull. The name may include a tag or digest. This parameter may only be used when pulling an image. + The pull is cancelled if the HTTP connection is closed. - **fromSrc** – Source to import. The value may be a URL from which the image can be retrieved or `-` to read the image from the request body. This parameter may only be used when importing an image. @@ -1755,6 +1756,8 @@ If you wish to push an image on to a private registry, that image must already h into a repository which references that registry `hostname` and `port`. This repository name should then be used in the URL. This duplicates the command line's flow. +The push is cancelled if the HTTP connection is closed. + **Example request**: POST /images/registry.acme.com:5000/test/push HTTP/1.1 diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index 5118acd1b4..88e57dce54 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -98,12 +98,9 @@ adding a `.dockerignore` file to that directory as well. For information on creating one, see the [.dockerignore file](../builder.md#dockerignore-file). If the Docker client loses connection to the daemon, the build is canceled. -This happens if you interrupt the Docker client with `ctrl-c` or if the Docker -client is killed for any reason. - -> **Note:** -> Currently only the "run" phase of the build can be canceled until pull -> cancellation is implemented). +This happens if you interrupt the Docker client with `CTRL-c` or if the Docker +client is killed for any reason. If the build initiated a pull which is still +running at the time the build is cancelled, the pull is cancelled as well. ## Return code diff --git a/docs/reference/commandline/pull.md b/docs/reference/commandline/pull.md index efcaed6125..460255ccd2 100644 --- a/docs/reference/commandline/pull.md +++ b/docs/reference/commandline/pull.md @@ -49,3 +49,6 @@ use `docker pull`: # manually specifies the path to the default Docker registry. This could # be replaced with the path to a local registry to pull from another source. # sudo docker pull myhub.com:8080/test-image + +Killing the `docker pull` process, for example by pressing `CTRL-c` while it is +running in a terminal, will terminate the pull operation. diff --git a/docs/reference/commandline/push.md b/docs/reference/commandline/push.md index cdc6ac2da8..c26169eb92 100644 --- a/docs/reference/commandline/push.md +++ b/docs/reference/commandline/push.md @@ -19,3 +19,6 @@ parent = "smn_cli" Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com) registry or to a self-hosted one. + +Killing the `docker push` process, for example by pressing `CTRL-c` while it is +running in a terminal, will terminate the push operation.