summaryrefslogtreecommitdiff
path: root/docs/sources/reference/api/docker_remote_api.rst
diff options
context:
space:
mode:
authorunclejack <unclejack@users.noreply.github.com>2014-04-09 01:56:01 +0300
committerunclejack <unclejack@users.noreply.github.com>2014-04-09 01:56:01 +0300
commite128a606e39fa63c6b4fd6e53a1d88cf00aad868 (patch)
tree199ee7eb6678ffecd2ddad95fce794c795ad5183 /docs/sources/reference/api/docker_remote_api.rst
parent143c9707a9fafc39e1d9747f528db97b2564f01e (diff)
parentdc9c28f51d669d6b09e81c2381f800f1a33bb659 (diff)
downloaddocker-release-0.10.tar.gz
Merge pull request #5079 from unclejack/bump_v0.10.0release-0.100.10.1-hotfixes
Bump version to v0.10.0
Diffstat (limited to 'docs/sources/reference/api/docker_remote_api.rst')
-rw-r--r--docs/sources/reference/api/docker_remote_api.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/sources/reference/api/docker_remote_api.rst b/docs/sources/reference/api/docker_remote_api.rst
index e1071bf085..7fa8468f3c 100644
--- a/docs/sources/reference/api/docker_remote_api.rst
+++ b/docs/sources/reference/api/docker_remote_api.rst
@@ -22,6 +22,8 @@ Docker Remote API
- Since API version 1.2, the auth configuration is now handled client
side, so the client has to send the authConfig as POST in
/images/(name)/push
+- authConfig, set as the ``X-Registry-Auth`` header, is currently a Base64 encoded (json) string with credentials:
+ ``{'username': string, 'password': string, 'email': string, 'serveraddress' : string}``
2. Versions
===========
@@ -50,6 +52,7 @@ What's new
**New!** You can now use the force parameter to force delete of an image, even if it's
tagged in multiple repositories.
+ **New!** You can now use the noprune parameter to prevent the deletion of parent images
.. http:delete:: /containers/(id)
@@ -203,7 +206,7 @@ What's new
.. http:get:: /images/viz
- This URI no longer exists. The ``images -viz`` output is now generated in
+ This URI no longer exists. The ``images --viz`` output is now generated in
the client, using the ``/images/json`` data.
v1.6