ccb8041876
add port PublishMode to service inspect --pretty output
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: 5470312d236445b54bb6723f47c0966d3b057658
Component: engine
2017-01-09 10:30:28 -08:00
f34f548a3b
Merge pull request #29955 from vieux/improve_secret_Create
...
remove -f on secret create and unify usage with other commands
Upstream-commit: 3e298f46a2318c792dc476a178c3df34d1247fa4
Component: engine
2017-01-09 10:22:39 -08:00
701de0a381
Merge pull request #29226 from yongtang/28535-prune-until-follow-up
...
Add `--filter until=<timestamp>` for `docker container/image prune`
Upstream-commit: f1fdbeca2a39c7189b1ca8db4e4543fe77ff1150
Component: engine
2017-01-09 17:58:01 +01:00
31fc922f11
Merge pull request #29688 from tronicum/since-flag
...
explain since format and give examples
Upstream-commit: d0053a34bc979a49e6a9c11b8b5e0d25f43ea3ec
Component: engine
2017-01-09 09:27:30 -05:00
a4186cae43
Merge pull request #29874 from allencloud/fix-29872-volume-ls-filter
...
fix volume ls filter driver
Upstream-commit: e8e4546bc34ae3b84a9cbdd089f972f56695ece5
Component: engine
2017-01-09 13:06:17 +01:00
7f19873a05
explain since format and give examples
...
Signed-off-by: tronicum <tronicum@user.github.com >
Upstream-commit: 519c35889ebe6b232fa1181709e3464c22fb516a
Component: engine
2017-01-08 05:27:54 +01:00
589e081a09
remove -f on secret create and unify usage with other commands
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: db6652ca71c60c1ff3ac274968876c88eb7146ad
Component: engine
2017-01-06 14:07:48 -08:00
a6a7d0048a
Merge pull request #29741 from yuexiao-wang/update-option
...
keep network options consistent between network connect and run
Upstream-commit: ee9bb347a678640a5305314eca99870971c1fc65
Component: engine
2017-01-06 19:01:48 +01:00
0c3b3bfadc
Add --filter until=<timestamp> for docker container/image prune
...
This fix is a follow up for comment
https://github.com/docker/docker/pull/28535#issuecomment-263215225
This fix provides `--filter until=<timestamp>` for `docker container/image prune`.
This fix adds `--filter until=<timestamp>` to `docker container/image prune`
so that it is possible to specify a timestamp and prune those containers/images
that are earlier than the timestamp.
Related docs has been updated
Several integration tests have been added to cover changes.
This fix fixes #28497 .
This fix is related to #28535 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 58738cdee327f5de481dcf7d3d377374cbb5f13a
Component: engine
2017-01-04 14:16:42 -08:00
a6c6e5f892
fix volume ls filter driver
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0fdab496108e8d0945af3dd0130dd9deb09c9b26
Component: engine
2017-01-04 23:29:12 +08:00
85a740c504
Merge pull request #29650 from allencloud/support-registry-mirror-config-reload
...
support registry mirror config reload
Upstream-commit: d3f30d6a67577a52162b36a1af13eb4167e48c6b
Component: engine
2017-01-04 13:46:19 +01:00
47aebadce2
keep network option consistent between network connect and run
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 4f9b076e8eecb19083b3875b7cacbc3b660fde75
Component: engine
2017-01-04 19:54:03 +08:00
548c0ae5fe
Merge pull request #29697 from yuexiao-wang/fix-docker-daemon
...
Update docker daemon to dockerd
Upstream-commit: 6129e6ce3ebd1bd6c9db76e196248c613fda6e40
Component: engine
2017-01-04 11:55:38 +01:00
b452e40ef4
small secret doc update
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 91b739b55246a74f92e537c2c03ec94a50797184
Component: engine
2017-01-03 23:13:31 -08:00
966dc7a8d7
Merge pull request #29867 from Microsoft/jjh/isolationwording
...
Docs: Tidy --isolation wording
Upstream-commit: f0a13eb620762fd6a9627de8498b2746586da8bd
Component: engine
2017-01-04 19:32:49 +01:00
6fad25131b
Tidy --isolation wording
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3c32916141f7678e3f0a87fc4de5cb03535a816c
Component: engine
2017-01-04 09:14:10 -08:00
e7cd6e9e80
support registry mirror config reload
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5b9348c553d183bc62f6e7cc8f934766fac162bd
Component: engine
2017-01-04 11:04:00 +08:00
17d62dfc95
replace no-remove by sample-volume-plugin in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bcead9282e17f51b01c4edfa59221546f02aaa33
Component: engine
2017-01-03 16:03:48 -08:00
6a0d19c8f7
update plugins in docs and correct things in index.md
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6d3e1d2fd29cfd7446ab62ac2f3ccb2b3e277ef2
Component: engine
2017-01-03 22:34:32 +08:00
eb7043f1ff
Merge pull request #25234 from yongtang/25228-service-ps-multiple-ID
...
Support multiple service IDs on "docker service ps"
Upstream-commit: 18265591c2ae16b2fc831e9922fb27542f97fcf6
Component: engine
2017-01-03 12:40:24 +01:00
ea3cfbda7f
Merge pull request #29791 from yuexiao-wang/add-secret-stack
...
Update reference document for secret and stack
Upstream-commit: 1a6436510a9844be2eb77d7f4c278df49fef48f9
Component: engine
2017-01-03 10:54:28 +01:00
ca3b78dbe8
Update reference document for secret and stack
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7bb31f3168aa022a20c37b0b1cb1942fd553717f
Component: engine
2017-01-04 01:39:45 +08:00
8f0e0230a0
Fix usage message of plugin inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1b58d0bc51e2bfc9e268dab762d1d891c18890c9
Component: engine
2016-12-31 09:55:04 -08:00
7ecfbf4c71
document DOCKER_HIDE_LEGACY_COMMANDS env-var
...
The `DOCKER_HIDE_LEGACY_COMMANDS` environment
variable was added in a7c8bcac2ba60d6dd25a1157085d9245bed556ce
but not documented.
This adds the variable to the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2ef82fd23789c906acf9dd06b3be10568ca7191d
Component: engine
2016-12-31 14:17:34 +01:00
1b2be89310
Complete the document content
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 1ebb68053e17f9b88f1265390acdce20214f2afc
Component: engine
2016-12-30 08:47:08 +08:00
c23d186bee
Merge pull request #29744 from yuexiao-wang/update-docker-ps
...
Update the field 'CONTAINER ID' for docker ps
Upstream-commit: 01c62d6e54e49e2c954fb73881ede66ad6fa1b61
Component: engine
2016-12-28 11:46:06 +01:00
e1a6c1f1b2
Update the field 'CONTAINER ID' for docker ps
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b3faa7755a48eb09ba977502fd40e37ab98e1cf8
Component: engine
2016-12-29 02:00:31 +08:00
4d710d2209
fix some typos
...
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn >
try to pass test
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn >
try to pass the test
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn >
Upstream-commit: f1a19fa8c08a9b68d3a7014f9800cadf40fc150f
Component: engine
2016-12-28 09:43:27 +08:00
b279900e8a
Merge pull request #29701 from yuexiao-wang/add-field
...
Update 'ID' field for 'docker plugin ls'
Upstream-commit: 823718c3b4b65f966120543bac89ca240cb43f0a
Component: engine
2016-12-27 20:04:28 +01:00
e23a7bc09c
Merge pull request #29716 from yongtang/28885-docker-stack-ps-all
...
Remove `docker stack ps -a` to match removal of `docker service/node ps -a`
Upstream-commit: efbb23f3e6c585b64e7898a38b0088a0992ea883
Component: engine
2016-12-27 13:56:01 -05:00
a8c2e6aae2
Update the index of docker command line
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: f649f54c60aee1a88c40b5c8c635c381f324b5a7
Component: engine
2016-12-28 02:39:04 +08:00
8a1df96ade
Update docker daemon to dockerd
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 62cc802f6160b7fbb506f5307d96a564cbfb5f1f
Component: engine
2016-12-27 17:32:15 +08:00
98d0c42181
Remove docker stack ps -a to match removal of docker service/node ps -a
...
In #28507 and #28885 , `docker service/node ps -a` has been removed so that
information about slots are show up even without `-a` flag.
The output of `docker stack ps` reused the same output as `docker service/node ps`.
However, the `-a` was still there. It might make sense to remove `docker stack ps -a`
as well to bring consistency with `docker service/node ps`.
This fix is related to #28507 , #28885 , and #25983 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9155e14e77a8235791a6de752f6f43e83308e23d
Component: engine
2016-12-26 13:47:43 -08:00
c2f39444f3
Update 'ID' field for 'docker plugin ls'
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 1e6587ff280dc3dcac405a67af2ddfd83c78f983
Component: engine
2016-12-27 02:17:35 +08:00
aec6773f9f
Add 'volume prune' to the volume commands index
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 3d4ea98971d319e9dbbeefbd1e82a9c0feae8c70
Component: engine
2016-12-24 15:03:38 +08:00
478844dff8
Implement content addressability for plugins
...
Move plugins to shared distribution stack with images.
Create immutable plugin config that matches schema2 requirements.
Ensure data being pushed is same as pulled/created.
Store distribution artifacts in a blobstore.
Run init layer setup for every plugin start.
Fix breakouts from unsafe file accesses.
Add support for `docker plugin install --alias`
Uses normalized references for default names to avoid collisions when using default hosts/tags.
Some refactoring of the plugin manager to support the change, like removing the singleton manager and adding manager config struct.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 3d86b0c79b16334ce5836c0315e4c310b84c2e17
Component: engine
2016-12-23 13:29:58 -08:00
e6fc7a5576
Merge pull request #29599 from anusha-ragunathan/refcount
...
Enforce zero plugin refcount during disable, not remove.
Upstream-commit: d1dfc1a5ef95dc5621a07915f9786199442043c7
Component: engine
2016-12-22 15:38:54 -08:00
9eac558235
Enforce zero plugin refcount during disable.
...
When plugins have a positive refcount, they were not allowed to be
removed. However, plugins could still be disabled when volumes
referenced it and containers using them were running.
This change fixes that by enforcing plugin refcount during disable.
A "force" disable option is also added to ignore reference refcounting.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 8cb2229cd18c53bdbf36301f26db565a50027d6a
Component: engine
2016-12-22 13:26:53 -08:00
74f57538fd
Support multiple service IDs on "docker service ps"
...
This fix tries to address issue raised in 25228 to support
multiple service IDs on `docker service ps`.
Multiple IDs are allowed with `docker service ps ...`, and
related documentation has been updated.
A test has been added to cover the changes.
This fix fixes 25228.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 70942352d56779b6c428efa1c2d4cb8a45c1dfa1
Component: engine
2016-12-22 11:33:47 -08:00
5ef85a095b
Merge pull request #29500 from WeiZhang555/add-missing-flag
...
Add missing "--default-runtime" flag in manpage
Upstream-commit: a8bcef6fddb21e7edcf1050631dfd8e6491297ae
Component: engine
2016-12-22 16:22:53 +01:00
32a699cc17
Add missing "--default-runtime" flag in manpage
...
Add missing flag and more descriptions in manpage.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 977fd439857006ab34deebac384b621bf4dae7da
Component: engine
2016-12-22 23:00:40 +08:00
a961c58e58
Merge pull request #29603 from mstanleyjones/docker_diff_improvements
...
Clarify what docker diff shows
Upstream-commit: 0ca3e84227a04c0c6256f55b92e9205bd1ca9309
Component: engine
2016-12-22 15:15:01 +01:00
16e5c73977
Merge pull request #29532 from yuexiao-wang/add-link-swarm
...
Add the link for swarm reference document
Upstream-commit: b47cb6095dab3691d8838e46c92cc9ec22a75f05
Component: engine
2016-12-22 15:13:47 +01:00
194c3ebac2
Merge pull request #29565 from yuexiao-wang/fix-typo-tls
...
Change tls to TLS
Upstream-commit: 8f9a48ab5a57b33e99a5231a1ea966cd3910373e
Component: engine
2016-12-22 12:10:09 +01:00
4c53abe848
Clarify what docker diff shows
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 4497801c8a35ca2be9467419c5addff5166442d0
Component: engine
2016-12-20 17:03:11 -08:00
d224f4ec28
Merge pull request #29450 from yongtang/29291-no-default-replicas-output
...
Fix misleading defaults for service create/update
Upstream-commit: b1cb8979987c5a7ba4b8a30f0ba5147d76671c01
Component: engine
2016-12-20 17:11:05 +01:00
35814260ea
Merge pull request #29583 from liliVicky/my-feature2
...
correct some words
Upstream-commit: e6d06a5271cd176b38aac02d97163e65ece500a9
Component: engine
2016-12-20 15:37:59 +01:00
b5e0f7eb0f
Change tls to TLS
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 113cae5ba2a0edadadbdf8aea06a52ab6b5f0361
Component: engine
2016-12-20 22:08:07 +08:00
3f00f70bbf
field NAMES ommitted after docker ps in commit.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: f34ccd70c8c55946fe9d3b83b44bdac770858176
Component: engine
2016-12-20 20:34:09 +08:00
ecbc8d61e5
Add the link for swarm reference document
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: ee23a8e124ef4801bcd0d044578da8daf63cba6f
Component: engine
2016-12-20 18:09:21 +08:00
