8a19fb43a4
Merge pull request #26941 from runcom/docker-init-path-1
...
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
2016-09-28 13:12:59 +02:00
f6b8936533
Merge pull request #24850 from yongtang/24270-service-tasks-filter
...
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
d295583beb
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 >
Upstream-commit: 880a5f565fb33b445977bb2ded0fc375edee0c40
Component: engine
2016-09-27 19:12:48 -07:00
048d1e7728
Merge pull request #26931 from thaJeztah/fix-aux-address-example
...
Fix incorrect aux-address examples and test
Upstream-commit: bab64af2ad0d6f5e7c1e9d54b2f6d93096f7b99f
Component: engine
2016-09-27 17:06:01 -07:00
be83d1256c
Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
...
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
2016-09-27 18:48:03 +02:00
4ab44ced86
Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
...
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
2016-09-27 18:46:51 +02:00
cc821d1b32
Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
...
add endpoint mode in service pretty
Upstream-commit: c505486bb195a3a413bacff7cfdee8d6931d529f
Component: engine
2016-09-27 18:28:43 +02:00
195692ee1c
configure docker-init binary path
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 6a12685bb7eaa5744c5a115ffe12f3a4d80093bb
Component: engine
2016-09-27 14:49:17 +02:00
99ee0aae26
add endpoint mode in service pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 70bb832060ae1a0525a34145f85e68e0da78fcb9
Component: engine
2016-09-27 18:41:19 +08:00
672761b64e
make client side know container removal in progress
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
2016-09-27 18:06:54 +08:00
6b1c398ebc
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 >
Upstream-commit: fd7161bb3061e2e2f56faed1a4ba1f7a887627bf
Component: engine
2016-09-27 01:12:29 +02:00
6352e3e776
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 >
Upstream-commit: 6ad4bf0a533f8851b0ddccb56fe3b457819f6146
Component: engine
2016-09-26 21:44:34 +02:00
f2233e9c75
Merge pull request #23886 from AkihiroSuda/stackcli
...
add `docker stack ls`
Upstream-commit: a4dd51a6601f7cb07b23a55134dc18a12d2814ee
Component: engine
2016-09-26 21:19:04 +02:00
356aff7cd8
Merge pull request #26839 from tonistiigi/build-cache
...
Implement build cache based on history array
Upstream-commit: 7944480dd0dfb00323f960d37c31d0ddad5f6cf2
Component: engine
2016-09-26 17:31:49 +00:00
1b0bbf5fcf
Merge pull request #26892 from ripcurld00d/stats_format_docs
...
Add documentation for docker stats --format
Upstream-commit: c8a19aee09756867d68ae8c70c2134a0193866ac
Component: engine
2016-09-26 10:52:01 +02:00
f2acf43e07
Add documentation for docker stats --format
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 9c7b3040cc97dae0a4fc20f999ca51adce353944
Component: engine
2016-09-26 09:26:48 +03:00
a034d841ce
Add isolation to info
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c4e169727474f24cb0eddea15b94aaa2bfbb3281
Component: engine
2016-09-23 12:13:29 -07:00
cc3c0d322a
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 >
Upstream-commit: 690882c2e79c3f3742c709cf158584e61594ba00
Component: engine
2016-09-23 11:30:06 -07:00
a0b2adc110
Merge pull request #26516 from yongtang/26453-build-bad-syntax
...
Check bad syntax on dockerfile before building.
Upstream-commit: 72f556a9ff1043a4188e8eeef892d8a0ba4fe34f
Component: engine
2016-09-23 12:24:20 +02:00
89f68050aa
Merge pull request #26850 from YuPengZTE/devDot
...
Del the extra dot
Upstream-commit: a70e6dfe80c8b224b1df4510a3729c9a2c1d249e
Component: engine
2016-09-23 10:10:11 +02:00
69f06771c4
Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
...
support docker node ps multiNodes
Upstream-commit: c03c80b1b03f3a061072af07d6d1fb811f29a9e3
Component: engine
2016-09-23 09:50:24 +02:00
d9ba2cf275
Del the extra dot
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 73770c00fc322929215108a44049e51f1d89cae5
Component: engine
2016-09-23 15:22:52 +08:00
b4a97d150a
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 >
Upstream-commit: c53efdf4c1f0b2e7f1fe04294d9d64401b8b09b8
Component: engine
2016-09-22 23:40:05 +02:00
9e4c8c252a
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 >
Upstream-commit: e33dea5b40a52c5dcda682a1a292584ae6bff00d
Component: engine
2016-09-22 14:33:37 -07:00
0d2c33693e
add docker stack ls
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5ce08ddfcae5ded73ef0c93c9daba7c916c21ae5
Component: engine
2016-09-22 19:31:39 +00:00
6b6c0bf977
Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
...
Remove engine-api leftovers
Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb
Component: engine
2016-09-22 09:39:27 +02:00
ad119a9fca
Merge pull request #26413 from lixiaobing10051267/masterLabel
...
Labels info ommitted while inspecting self-defined network
Upstream-commit: c5f4a1ab1947d4c9084e1849db77594886b8fe95
Component: engine
2016-09-22 02:07:53 +02:00
0eb9a616d1
Clarify usage of --force when used on a swarm manager
...
Fixes #26125
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 7b5c3d935a7a99b282f0f859101c887894a0b00e
Component: engine
2016-09-21 13:05:33 -07:00
7c1d86c305
Removed engine-api leftovers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 45818d6fc49e6da0369a33f015967fff7417df1c
Component: engine
2016-09-21 12:36:52 +02:00
f3d4887540
Update API docs for "HostConfig.Binds"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 708892c4037e9eef6f6c25b5a3551f7779fb8868
Component: engine
2016-09-20 17:41:59 +02:00
3e855af466
Merge pull request #26741 from thaJeztah/fix-api-docs
...
Fix incorrectly named API options
Upstream-commit: 5fa94084ac049d455603565f517ada00117bc4d4
Component: engine
2016-09-20 09:14:08 -04:00
2b811c42ec
Merge pull request #25025 from cpuguy83/service_inspect_formatter
...
Add formatter for service inspect
Upstream-commit: 00615efced8c8bd27c61ebd1dfc704bcf870cbaf
Component: engine
2016-09-20 14:49:45 +02:00
a262e6d191
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 >
Upstream-commit: 36a25bdbe4d973aef308fa11b450264dae1bc0b4
Component: engine
2016-09-20 13:51:55 +02:00
1504a332aa
Merge pull request #26732 from yuexiao-wang/update-index
...
Update on index reference documentation
Upstream-commit: 374ae5ce13a91dc7db74485aa99bfe9a361c4719
Component: engine
2016-09-20 11:42:17 +02:00
dadce77b75
Update on index refernce documentation
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 0483d776130aa6b7add845bdab3d1d8ee67f7480
Component: engine
2016-09-20 16:37:52 +08:00
37aff3fb80
Merge pull request #26482 from yuexiao-wang/add-option
...
Update the options for docker client
Upstream-commit: a43691d645e085ad532fdd87a63e9143ba24420a
Component: engine
2016-09-20 09:51:57 +02:00
8ee0f56810
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 >
Upstream-commit: ee3ac3aa66bfb27b7c21dfb253fdaa113baedd4e
Component: engine
2016-09-19 17:33:50 -07:00
1b60c220e3
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 >
Upstream-commit: 54ba82beab8ef8b71f5a6a2f7082ed7759b40df3
Component: engine
2016-09-19 16:28:19 -04:00
14f9dd10a3
Merge pull request #26268 from AkihiroSuda/eventsjsonl
...
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
2016-09-19 17:30:27 +02:00
4d3a9b605f
Fix Markdown formatting and missing prompt in service create
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 533b00da8bed8336debf99a03f2fd2a0692fac6e
Component: engine
2016-09-19 13:57:39 +02:00
dd0606cd40
Misty's edits and additions
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
(cherry picked from commit 3de7d725137ee1620ae2050e65ace4990a3af87e)
Upstream-commit: 5880d629533d9b8ad9889500fe841cb2e31a71c8
Component: engine
2016-09-19 12:12:54 +02:00
e605090acb
Add --mount syntax documentation to CLI reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: eb3a01eb432473beae968a0c9f3817af8b7a7d53
Component: engine
2016-09-19 11:56:59 +02:00
c4eabb777e
fix typo for docs reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 0f0b0db842e53c81191385395d6d040574eeb0d9
Component: engine
2016-09-18 11:00:19 +08:00
5049c43226
Merge pull request #25737 from Microsoft/jjh-statistics
...
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
2016-09-17 09:31:24 -07:00
029442b3b0
Merge pull request #26634 from thaJeztah/fix-api-docs-for-services
...
Fix service and tasks API documentation
Upstream-commit: 788a8a3cac67b72d3c52bd3bc8b09fcc0ee438a8
Component: engine
2016-09-17 16:13:15 +02:00
613c0e8111
Merge pull request #26654 from thaJeztah/sync-api-docs
...
Synchronize API docs
Upstream-commit: 1fb556bb7ebed206ebacf13148f912f7347d5489
Component: engine
2016-09-17 16:11:42 +02:00
665d5fc5bb
Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version
...
Move HostConfig.Mounts to correct API version
Upstream-commit: 2f5b37919286f272b591ab428fee13cb6b5d0014
Component: engine
2016-09-17 13:53:37 +02:00
6c1fbaf344
Merge pull request #26289 from aboch/doc
...
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
2016-09-17 03:32:23 +02:00
0a2b85a132
Synchronize API docs
...
This synchronizes changes between API versions, and:
- applies e0a552504e64192946c86d3bdd517ae7b3af348f to
older versions of the documentation
- applies a2a0a03e2b801545b2e3fb9e8476c76370da9175 to
API version 1.25
- syncs some minor differences
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5
Component: engine
2016-09-17 03:02:12 +02:00
7bce42c737
Move HostConfig.Mounts to correct API version
...
This was added in fc7b904dced4d18d49c8a6c47ae3f415d16d0c43,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd73ceffd84d6d3af695a70485ca0d7899d0475a
Component: engine
2016-09-17 02:36:07 +02:00
