Sebastiaan van Stijn
700f618410
Merge pull request #28486 from vdemeester/docs-service-templating
...
Add documentation about templating support on…
2016-11-22 00:50:45 +01:00
Sebastiaan van Stijn
da4a2f16a0
Merge pull request #28664 from thaJeztah/update-service-ps-reference
...
Update service ps reference for "--no-trunc"
2016-11-22 00:48:03 +01:00
Victor Vieux
99a7289632
Merge pull request #28328 from aaronlehmann/duration-opts
...
cli: Add valid suffixes for remaining duration options
2016-11-21 14:03:00 -08:00
Sebastiaan van Stijn
90993640f0
Update service ps reference for "--no-trunc"
...
The "--no-trunc" option toggles between showing/hiding
digests.
This updates the reference to show this difference.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-21 17:39:58 +01:00
Vincent Demeester
88cdfc512b
Update cli reference for docker {,stack} deploy
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-21 12:36:31 +01:00
Vincent Demeester
227af35a17
Merge pull request #28607 from mstanleyjones/28133_iptables_false
...
Clarify that ipmasq rules are not added when iptables is false
2016-11-20 17:35:31 +01:00
bbayani
db3f06fd97
Clarify that ipmasq rules are not added when iptables is false
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-18 14:25:24 -08:00
Sean McIntyre
2c38d43eb5
Add HostConfig.Tmpfs to docs for container creation remote API
...
Signed-off-by: Sean McIntyre <s.mcintyre@xverba.ca>
2016-11-18 15:00:07 -05:00
Aaron Lehmann
948e60691e
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-18 09:31:31 -08:00
Vincent Demeester
4571ad05db
Add documentation about templating support on…
...
… services creation/update.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-18 15:28:01 +01:00
Vincent Demeester
6c447f552c
Merge pull request #28354 from ripcurld00d/tag_creation
...
Change the docker-tag usage text to be clearer
2016-11-18 13:02:40 +01:00
Boaz Shuster
039aca05c2
Change the docker-tag usage text to be clearer
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2016-11-18 10:34:02 +02:00
Sebastiaan van Stijn
c6d69ea9e9
Merge pull request #28477 from vdemeester/update-reference-filter-cli-reference
...
Update `images` cli reference with reference filter
2016-11-18 01:34:48 +01:00
Stephen J Day
1d90d76048
api/server/httputils: service unavailable for disable swarm
...
When swarm-mode is disabled, we need to return an error indicating this.
406 was chosen for the "Not Acceptable" verbiage, but this code has
specific semantics in relation to the `Accept` header, which aren't
applicable here.
We now use a 503 for this case. While it is not a perfect match, it does
make it clear that the particular "service" (read: API endpoint) is not
available. The body of the message provides the user with enough
information to take action on it by enabling swarm-mode and ensuring the
service is available.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-11-17 11:43:45 -08:00
Vincent Demeester
a0d7b34d9c
Update images
cli reference with reference filter
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-17 15:34:17 +01:00
Sebastiaan van Stijn
3f9dc02135
Merge pull request #28322 from Microsoft/jjh/api1.26
...
Bump API to v1.26
2016-11-17 00:01:46 +01:00
Vincent Demeester
673c5ee559
Merge pull request #27631 from allencloud/get-node-brefore-update
...
allow node update API to receive node name and id prefix
2016-11-16 17:47:31 +01:00
Vincent Demeester
947464e2f1
Update stats cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-16 15:26:29 +01:00
Sebastiaan van Stijn
297f2fd445
Merge pull request #28346 from yongtang/11122016-docs-api-version
...
Fix missing versions in example requests of api docs
2016-11-16 12:15:05 +01:00
Vincent Demeester
cd2d52b5f6
Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs
...
Update docs for `docker info` for most recent changes.
2016-11-16 12:08:35 +01:00
allencloud
d075b83dd6
allow node update api receive node name and id prefix
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-16 10:18:19 +08:00
Sebastiaan van Stijn
d341bb1b6e
Revert reference docs for ambient capabilities
...
This feature was reverted for docker 1.13
in c5251f7116
,
so removing the documentation as well.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-15 21:59:21 +01:00
Vincent Demeester
101676a591
Merge pull request #28419 from yuexiao-wang/remove-stack-tasks
...
Remove inexistent link and add related links
2016-11-15 13:51:46 +01:00
Vincent Demeester
b6e1f11105
Merge pull request #28384 from bbayani/28295_live_restore_unsupported_win
...
Updated daemon documentation to clarify that live-restore is not supp…
2016-11-15 11:06:26 +01:00
bbayani
45bccaeacb
Updated daemon documentation to clarify that live-restore is not suppoted on windows
...
Review comment implementation
Signed-off-by: bbayani <bhumikabayani@gmail.com>
2016-11-15 07:07:43 +00:00
yuexiao-wang
985cc9fb05
Remove inexistent link and add related links
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-15 09:40:44 +08:00
Sebastiaan van Stijn
ccba7911c8
Merge pull request #28292 from lixiaobing10051267/masterDockerSwarm
...
fix the wrong title with docker swarm
2016-11-15 00:37:07 +01:00
John Howard
9182cf1a8d
Bump API to v1.26
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-14 14:24:02 -08:00
Anusha Ragunathan
d2bb29f87e
Add docs for plugin push
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-14 09:10:21 -08:00
Sebastiaan van Stijn
6cf3976041
Merge pull request #28280 from yuexiao-wang/remove-doc
...
Remove duplicated document
2016-11-14 17:34:47 +01:00
yuexiao-wang
5527202e41
Remove duplicated document
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-14 14:43:00 +08:00
Vincent Demeester
0f20d6f5ab
Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
...
judge manager before getting secret
2016-11-13 22:19:07 +01:00
allencloud
7bbbc8c7f1
fix typo in node update docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-14 00:07:52 +08:00
allencloud
1addb4817b
judge manager before getting secret
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-13 12:52:09 +08:00
Yong Tang
d725764083
Update docs for docker info
for most recent changes.
...
This fix updates docs for `docker info` for most recent changes.
It also made several chagnes:
1. Replace 0.12.0-dev to 0.13.0 for api docs v1.24.
2. Replace 0.13.0-dev to 0.13.0 for api docs v1.25
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-12 17:30:53 -08:00
Yong Tang
9dabde5b01
Fix missing versions in example requests of api docs
...
It is not required to have version prefix for all the remote
APIs. Though there are still quite a few example requests
in api docs that does not have the version prefix.
This fix update the remote api docs to address this issue.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-12 13:12:02 -08:00
Aaron Lehmann
32b12a28fc
cli: Add valid suffixes for remaining duration options
...
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-11 17:44:42 -08:00
John Howard
beccd3663f
Extra v1.25 in API docs
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-11 12:50:05 -08:00
Vincent Demeester
820b809e70
Add reference filter and deprecated filter param…
...
… for `docker images`.
This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:34:01 +01:00
lixiaobing10051267
f469021f88
fix the wrong title with docker swarm
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-11 17:44:00 +08:00
Victor Vieux
e68003142f
Merge pull request #28278 from yuexiao-wang/stack-deploy
...
Add --with-registry-auth for stack deploy
2016-11-10 21:28:40 -08:00
yuexiao-wang
8e04bc5572
Add --with-registry-auth for stack deploy
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-11 11:01:31 +08:00
Lei Jitang
891e03eb7d
Merge pull request #28231 from yuexiao-wang/container-exec
...
Remove redundant parameter and fix typos
2016-11-11 09:55:42 +08:00
Victor Vieux
acd6e0d9b2
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
2016-11-10 17:30:54 -08:00
Victor Vieux
bed96ce922
Merge pull request #28031 from yongtang/27902-extra-hosts
...
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
2016-11-10 16:55:29 -08:00
Victor Vieux
970b23db2e
update media_type
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
Victor Vieux
c410222e42
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
Andrea Luzzardi
5f9fe54b35
Merge pull request #28089 from aluzzardi/service-logs
...
service logs
2016-11-10 15:13:41 -08:00
Victor Vieux
0151fb7618
Merge pull request #28253 from aaronlehmann/arg-descriptions
...
cli: Change autolock flag description
2016-11-10 13:59:46 -08:00
Victor Vieux
a81385b0cb
Merge pull request #28192 from allencloud/fix-docs-issue-on-service-ls-api
...
change node ls and service ls api and docs
2016-11-10 13:46:35 -08:00