Victor Vieux
bd99641466
Revert "fix API doc service delete"
...
This reverts commit a12120e78c
.
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-10-01 02:12:41 -07:00
Victor Vieux
a12120e78c
fix API doc service delete
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-30 22:31:40 -07:00
allencloud
ea07ef7a7c
make remove network return 204
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-01 19:50:40 +08:00
Arnaud Porterie
86de7c000f
Merge pull request #26108 from mlaventure/data-mngt
...
New Data Management commands
2016-10-01 03:17:18 +00:00
Kenfe-Mickael Laventure
913e5cb77b
Add documentation for container, volume, image and system prune subcommands
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-30 14:35:23 -07:00
Kenfe-Mickael Laventure
a860d5db45
Document new /system/df and /{containers,volumes,images}/prune API EndPoints
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-30 14:35:23 -07:00
Yong Tang
c326e0afe3
Update docs for node filter of docker service ps
...
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.
This fix updates the related docs for that.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-30 05:37:14 -07:00
Misty Stanley-Jones
23207def7c
Revert "Add direct link to event chart image"
...
This reverts commit 86de72fef2
.
The link seems malformed and is breaking the overall docs build.
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-29 10:16:41 -07:00
Vincent Demeester
b6ad6d98fd
Merge pull request #24411 from vdemeester/24393-ps-filter-managed
...
Add a new "is-task" ps filter
2016-09-29 18:54:15 +02:00
Misty Stanley-Jones
ca04f02d76
Fix link to non-existent file
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-28 20:34:26 -07:00
Sebastiaan van Stijn
9f0593990f
Merge pull request #26941 from runcom/docker-init-path-1
...
configure docker-init binary path
2016-09-28 13:12:59 +02:00
Vincent Demeester
5280ba83e5
Add a new "is-task" ps filter
...
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-09-28 12:45:30 +02:00
Vincent Demeester
b0e1b8fc79
Merge pull request #24850 from yongtang/24270-service-tasks-filter
...
Fix partial/full filter issue in `service tasks --filter`
2016-09-28 11:50:27 +02:00
Yong Tang
880a5f565f
Update docs for service ps
...
This fix updates docs for `service ps` as now the TASK ID part has been
removed.
Also, this fix fixes several incorrect sample output.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-27 19:12:48 -07:00
Misty Stanley-Jones
bab64af2ad
Merge pull request #26931 from thaJeztah/fix-aux-address-example
...
Fix incorrect aux-address examples and test
2016-09-27 17:06:01 -07:00
Vincent Demeester
97d4b9c465
Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
...
make client side know container removal in progress
2016-09-27 18:48:03 +02:00
Vincent Demeester
b881148385
Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
...
Add isolation to info - enables Hyper-V containers CI bring-up
2016-09-27 18:46:51 +02:00
Vincent Demeester
c505486bb1
Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
...
add endpoint mode in service pretty
2016-09-27 18:28:43 +02:00
Antonio Murdaca
6a12685bb7
configure docker-init binary path
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-27 14:49:17 +02:00
allencloud
70bb832060
add endpoint mode in service pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-27 18:41:19 +08:00
allencloud
9a58f298d1
make client side know container removal in progress
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-27 18:06:54 +08:00
Sebastiaan van Stijn
fd7161bb30
Fix incorrect aux-address examples and test
...
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.
Before this change, the example command
would send this API request;
{
"Attachable": false,
"CheckDuplicate": true,
"Driver": "overlay",
"EnableIPv6": false,
"IPAM": {
"Config": [
{
"Gateway": "192.168.0.100",
"IPRange": "192.168.1.0/24",
"Subnet": "192.168.0.0/16"
},
{
"AuxiliaryAddresses": {
"a": "192.170.1.5",
"b": "192.170.1.6"
},
"Gateway": "192.170.0.100",
"Subnet": "192.170.0.0/16"
}
],
"Driver": "default",
"Options": {
}
},
"Internal": false,
"Labels": {
},
"Name": "my-multihost-network",
"Options": {
}
}
After this change, the request looks
like this (all aux-addresses preserved);
{
"Attachable": false,
"CheckDuplicate": true,
"Driver": "overlay",
"EnableIPv6": false,
"IPAM": {
"Config": [
{
"AuxiliaryAddresses": {
"my-router": "192.168.1.5",
"my-switch": "192.168.1.6"
},
"Gateway": "192.168.0.100",
"IPRange": "192.168.1.0/24",
"Subnet": "192.168.0.0/16"
},
{
"AuxiliaryAddresses": {
"my-printer": "192.170.1.5",
"my-nas": "192.170.1.6"
},
"Gateway": "192.170.0.100",
"Subnet": "192.170.0.0/16"
}
],
"Driver": "default",
"Options": {
}
},
"Internal": false,
"Labels": {
},
"Name": "my-multihost-network",
"Options": {
}
}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-27 01:12:29 +02:00
Sebastiaan van Stijn
6ad4bf0a53
API return network-list if no network-name or id is provided
...
When calling the /networks/ endpoint with a trailing
slash, the default network was returned.
This changes the endpoint to return the list of networks
instead (same response as `/networks` without trailing
slash).
Also updated the description for GetNetworkByName to
explain that the "default" network is returned if
no name or id is provided.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-26 21:44:34 +02:00
Sebastiaan van Stijn
a4dd51a660
Merge pull request #23886 from AkihiroSuda/stackcli
...
add `docker stack ls`
2016-09-26 21:19:04 +02:00
Arnaud Porterie
7944480dd0
Merge pull request #26839 from tonistiigi/build-cache
...
Implement build cache based on history array
2016-09-26 17:31:49 +00:00
Sebastiaan van Stijn
c8a19aee09
Merge pull request #26892 from ripcurld00d/stats_format_docs
...
Add documentation for docker stats --format
2016-09-26 10:52:01 +02:00
Boaz Shuster
9c7b3040cc
Add documentation for docker stats --format
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2016-09-26 09:26:48 +03:00
John Howard
c4e1697274
Add isolation to info
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-23 12:13:29 -07:00
Tõnis Tiigi
690882c2e7
Implement build cache based on history array
...
Based on work by KJ Tsanaktsidis
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
2016-09-23 11:30:06 -07:00
Vincent Demeester
72f556a9ff
Merge pull request #26516 from yongtang/26453-build-bad-syntax
...
Check bad syntax on dockerfile before building.
2016-09-23 12:24:20 +02:00
Sebastiaan van Stijn
a70e6dfe80
Merge pull request #26850 from YuPengZTE/devDot
...
Del the extra dot
2016-09-23 10:10:11 +02:00
Vincent Demeester
c03c80b1b0
Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
...
support docker node ps multiNodes
2016-09-23 09:50:24 +02:00
YuPengZTE
73770c00fc
Del the extra dot
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-23 15:22:52 +08:00
Sebastiaan van Stijn
c53efdf4c1
Add missing API docs for "privileged" and "user" exec
...
The "user" feature was added in docker 1.7.0, and
"privileged" feature was added in docker 1.9.0
only contained CLI docs.
This adds the missing API docs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-22 23:40:05 +02:00
Yong Tang
e33dea5b40
Update documentation and change log to include the preliminary validation of dockerfile.
...
This commit updates documentation and change log to include
the preliminary validation of the dockerfile before instructions
in dockerfile is run one-by-one.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-22 14:33:37 -07:00
Akihiro Suda
5ce08ddfca
add docker stack ls
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-22 19:31:39 +00:00
Vincent Demeester
d9aec43a16
Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
...
Remove engine-api leftovers
2016-09-22 09:39:27 +02:00
Sebastiaan van Stijn
c5f4a1ab19
Merge pull request #26413 from lixiaobing10051267/masterLabel
...
Labels info ommitted while inspecting self-defined network
2016-09-22 02:07:53 +02:00
Misty Stanley-Jones
7b5c3d935a
Clarify usage of --force when used on a swarm manager
...
Fixes #26125
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-21 13:05:33 -07:00
Sebastiaan van Stijn
45818d6fc4
Removed engine-api leftovers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-21 12:36:52 +02:00
Sebastiaan van Stijn
708892c403
Update API docs for "HostConfig.Binds"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-20 17:41:59 +02:00
Brian Goff
5fa94084ac
Merge pull request #26741 from thaJeztah/fix-api-docs
...
Fix incorrectly named API options
2016-09-20 09:14:08 -04:00
Vincent Demeester
00615efced
Merge pull request #25025 from cpuguy83/service_inspect_formatter
...
Add formatter for service inspect
2016-09-20 14:49:45 +02:00
Sebastiaan van Stijn
36a25bdbe4
Fix incorrectly named API options
...
This renames `MaximumIOps` to `IOMaximumBandwidth`,
and `MaximumIOBps` to `IOMaximumIOps` to match
the actual code.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-20 13:51:55 +02:00
Sebastiaan van Stijn
374ae5ce13
Merge pull request #26732 from yuexiao-wang/update-index
...
Update on index reference documentation
2016-09-20 11:42:17 +02:00
yuexiao-wang
0483d77613
Update on index refernce documentation
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-20 16:37:52 +08:00
Vincent Demeester
a43691d645
Merge pull request #26482 from yuexiao-wang/add-option
...
Update the options for docker client
2016-09-20 09:51:57 +02:00
Michael Crosby
ee3ac3aa66
Add init process for zombie fighting
...
This adds a small C binary for fighting zombies. It is mounted under
`/dev/init` and is prepended to the args specified by the user. You
enable it via a daemon flag, `dockerd --init`, as it is disable by
default for backwards compat.
You can also override the daemon option or specify this on a per
container basis with `docker run --init=true|false`.
You can test this by running a process like this as the pid 1 in a
container and see the extra zombie that appears in the container as it
is running.
```c
int main(int argc, char ** argv) {
pid_t pid = fork();
if (pid == 0) {
pid = fork();
if (pid == 0) {
exit(0);
}
sleep(3);
exit(0);
}
printf("got pid %d and exited\n", pid);
sleep(20);
}
```
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-19 17:33:50 -07:00
Brian Goff
54ba82beab
Add formatter for service inspect
...
Allows the user to use `pretty` as the format string.
This enables users to put custom format options into their CLI config
just like is supported for `docker ps` and `docker images`
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-19 16:28:19 -04:00
Sebastiaan van Stijn
bb6fe56e88
Merge pull request #26268 from AkihiroSuda/eventsjsonl
...
add `docker events --format`
2016-09-19 17:30:27 +02:00