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
95fdcb0f29
added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc
Component: engine
2016-09-27 14:21:17 -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
0b8cdf7c7b
Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs
...
move macvlan out of experimental docs
Upstream-commit: 64fca3486082cfd59aac32d2cfd9e07b6f62a112
Component: engine
2016-09-27 18:45:00 +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
8cdfc4f743
Merge pull request #26902 from yuexiao-wang/add-index
...
Add menu for How PKI works
Upstream-commit: afd22d27c3674d24458dbc530edd609e41b0f7ab
Component: engine
2016-09-26 21:20:30 +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
2e2fa7e352
Merge pull request #26907 from yuexiao-wang/fix-typo
...
Fix typo for how pki works
Upstream-commit: 2a8b556ea50d080878dc42a25c9b1a4356d840a5
Component: engine
2016-09-26 11:58:19 +02:00
959565e943
Merge pull request #26908 from yuexiao-wang/fix-link
...
Fix the broken link
Upstream-commit: 7a6b99aef6c135899d4a74915caaa66e378bfce2
Component: engine
2016-09-26 11:54:36 +02: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
dee86cf062
Fix the broken link
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cfb07e642d23622412c5455ca70c42140268f9fe
Component: engine
2016-09-26 15:03:56 +08:00
d3c94f4001
Fix typo for how pki works
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bf9c6d3115dd388cf379ec1a80d29104521a7b42
Component: engine
2016-09-26 14:28:31 +08: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
92623de9dd
Add menu for How PKI works
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c228931384c7a0eb143cba3a4a4804daa6f79eee
Component: engine
2016-09-26 14:17:47 +08: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
1c6164038a
Merge pull request #26834 from thaJeztah/deprecate-docker-daemon
...
Deprecate "daemon" subcommand
Upstream-commit: 57f0164fd2aff893364d4544f8778b0925ac287a
Component: engine
2016-09-23 08:51:18 -04: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
a045d7b33b
the network id is not consistant with the real id created
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 392aae44fd8ea5755305104e1c2a1c85f39d4a07
Component: engine
2016-09-23 17:40:55 +08: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
1534d985c8
Merge pull request #26813 from Starefossen/patch-2
...
docs: add missing 'on' in Oracle installation guide
Upstream-commit: 7a789c52059e2ebb9f03a9ba7f7af47ff315a23e
Component: engine
2016-09-23 09:14:59 +02:00
3c8d35d9dd
Deprecate "daemon" subcommand
...
The daemon is in a separate (dockerd) binary
since docker 1.12, so should no longer be
used.
This marks the command as deprecated, and
adds it to the deprecated features list.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bf58dd82c31bb3a71916eec743d0560e360c6e08
Component: engine
2016-09-23 00:26:27 +02: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
15482db5bf
docs: add missing 'on' in Oracle installation guide
...
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com >
Upstream-commit: 838fe65e5332dd79f5cf8551d70906d9801f79fb
Component: engine
2016-09-22 14:34:25 +02: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
50d424be1a
Merge pull request #26260 from mstanleyjones/26125_swarm_leave_force
...
Clarify usage of --force when used on a swarm manager
Upstream-commit: ca1b8b30cf569cd0fb4860ec023a8328edc0a769
Component: engine
2016-09-22 00:11:32 +02:00
1f178ade70
Restructure content about Docker object labels
...
A few points of work:
- Took the topic out of the left-hand nav and made it
reachable from the User guide intro
- Condensed the topic's contents, presenting only conceptual
info and pointing instead to the command-line references
for each type of object
- Added brief information about the `LABELS` keyword to the
Dockerfile reference
A big part of the point is to establish a pattern of
thinking and use around how Docker uses labels and what they
mean in different contexts.
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 5c4c062ffcdb8d7b8c104fd667571279c51d2ffd
Component: engine
2016-09-21 13:20:32 -07: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
fadc0c5e00
Add Portworx Volume Plugin Description
...
Signed-off-by: Jeff Silberman <jsilberm@gmail.com >
Upstream-commit: da2159ea1c366ac64b0f498a8aca0ee595dae558
Component: engine
2016-09-21 09:24:32 -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
