From 842f5a9ee6e9b5f014232b7e29b0a242e5e59f85 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 11 Jul 2014 23:01:23 +0000 Subject: [PATCH 1/2] missing doc for 6896 Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) Upstream-commit: 01d16150019c9ffb12779d88bdfe3bc146d44408 Component: engine --- .../engine/docs/sources/reference/api/docker_remote_api.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/engine/docs/sources/reference/api/docker_remote_api.md b/components/engine/docs/sources/reference/api/docker_remote_api.md index c2916e5de0..65bb4f3870 100644 --- a/components/engine/docs/sources/reference/api/docker_remote_api.md +++ b/components/engine/docs/sources/reference/api/docker_remote_api.md @@ -49,6 +49,12 @@ You can now use the `kill` parameter to kill running containers before removal. The `hostConfig` option now accepts the field `CapAdd`, which specifies a list of capabilities to add, and the field `CapDrop`, which specifies a list of capabilities to drop. +`POST /images/create` + +**New!** +Parameters `fromImage` and `repo` can now embed the tag using the syntax `repo:tag`, +therefore the `tag` parameter is obsolete. + ## v1.13 ### Full Documentation From 3db76fe5b300f410d718a7e47e8a03d3db5cd8f7 Mon Sep 17 00:00:00 2001 From: SvenDowideit Date: Wed, 16 Jul 2014 11:02:44 +1000 Subject: [PATCH 2/2] re-write to put the emphasis on the format Docker-DCO-1.1-Signed-off-by: SvenDowideit (github: SvenDowideit) Upstream-commit: ed8b017ee085c26dadd6a976a89d63322a02738b Component: engine --- .../engine/docs/sources/reference/api/docker_remote_api.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/engine/docs/sources/reference/api/docker_remote_api.md b/components/engine/docs/sources/reference/api/docker_remote_api.md index 65bb4f3870..a5bf3d577b 100644 --- a/components/engine/docs/sources/reference/api/docker_remote_api.md +++ b/components/engine/docs/sources/reference/api/docker_remote_api.md @@ -52,8 +52,9 @@ to add, and the field `CapDrop`, which specifies a list of capabilities to drop. `POST /images/create` **New!** -Parameters `fromImage` and `repo` can now embed the tag using the syntax `repo:tag`, -therefore the `tag` parameter is obsolete. +The `fromImage` and `repo` parameters now supports the `repo:tag` format. +Consequently, the `tag` parameter is now obsolete. Using the new format and +the `tag` parameter at the same time will return an error. ## v1.13