fa90fa0714
Merge pull request #30272 from AkihiroSuda/fix-cli-json
...
Fix broken JSON support in cli/command/formatter
Upstream-commit: baecb6f499633b6df87d7e4a0631d9feb714358b
Component: engine
2017-01-23 11:03:18 +01:00
e1603a54f0
Merge pull request #30334 from mstanleyjones/master
...
Fixing formatting errors in Run refdoc
Upstream-commit: b319221c21228068c226b51e21ca767b348b423b
Component: engine
2017-01-22 23:02:59 +01:00
cbe273ba85
remove indent from .dockerignore example
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 0f5a98122f92d3fef520773ea619523129794fd7
Component: engine
2017-01-22 10:46:04 -08:00
95d98b384a
Add bash completion for newly added options to "docker plugin ls"
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 6d6a7fc70c91e2f10dd5b48725c3b583a724bc88
Component: engine
2017-01-20 15:59:44 -08:00
5fa515a0ff
Add --format flag for docker plugin ls
...
This fix tries to address the enhancement discussed in 28735 to add
`--format` for the output of `docker plugin ls`.
This fix
1. Add `--format` and `--quiet` flags to `docker plugin ls`
2. Convert the current implementation to use `formatter`, consistent with
other docker list commands.
3. Add `pluginsFormat` for config.json.
Related docs has been updated.
Several unit tests have been added to cover the changes.
This fix is related to 28708 and 28735.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1c0d37fa7f04ade13e65aff74ea0495bb846d782
Component: engine
2017-01-20 15:59:44 -08:00
6d01039fe4
Merge pull request #29959 from cpuguy83/master_fix_selinux_packaging
...
[master] Fix conflicts with newly updated selinux policies
Upstream-commit: 7a97705b52e7f5c65d31870579cb1dcc09506d89
Component: engine
2017-01-20 15:13:18 -08:00
05863e58e5
Merge pull request #30329 from johndmulhausen/patch-2
...
Fixing formatting errors in Run refdoc
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 74ed368e7a3a00b3fb24778763656d873293068d
Component: engine
2017-01-20 14:47:18 -08:00
d99ff4ff64
Merge pull request #30319 from vdemeester/integration-fix-testbuildcopywilcardinname
...
Run TestBuildCopyWilcardInName only on linux daemon and unix client
Upstream-commit: 0a08f7a1d4b3321154c03972bf34ecf603622830
Component: engine
2017-01-20 22:04:56 +00:00
58b37acff7
Merge pull request #30145 from anusha-ragunathan/ps-swarm
...
Pass plugingetter as part of swarm node config.
Upstream-commit: 2b89356c07b1824041985386d0c9485e49d9b987
Component: engine
2017-01-20 10:35:49 -08:00
f3a3b53a61
Merge pull request #30223 from mlaventure/fix-logwatcher-deadlock
...
Close logwatcher on context cancellation
Upstream-commit: 0566f3ffc46fbdf020e957fc30f56960152e057e
Component: engine
2017-01-20 10:14:37 -08:00
ec6f3b3f5b
Merge pull request #28454 from glensc/init-args
...
do not require custom build of tini
Upstream-commit: 50a72c7467ec92cb20b9ec72fd4de2d5e9761347
Component: engine
2017-01-20 10:03:58 -08:00
f1f3f030a1
Add missing network.internal.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 408fd20be25c309454503c0b1e1c31914cf87dad
Component: engine
2017-01-20 12:53:19 -05:00
22c718e439
Update Compose schema to match docker-compose.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: de1ffebf19595e061c85727a4c34ac02ad4e934d
Component: engine
2017-01-20 12:36:57 -05:00
4e1939a186
Merge pull request #30282 from sdurrheimer/zsh-completion-swarm-join-availability
...
Add zsh completion for 'docker swarm --availability'
Upstream-commit: ae99820357877c010ee76892fb64068f1212e7ae
Component: engine
2017-01-20 17:52:06 +01:00
ae952f464c
Merge pull request #30317 from sdurrheimer/zsh-completion-prune-filter
...
Add zsh completion for 'docker {container,image,network,system} prune --filter
Upstream-commit: 156d402133849f74b9e9ac1c57a574fd9e552aee
Component: engine
2017-01-20 16:25:42 +01:00
6421d00c6a
Run TestBuildCopyWilcardInName only on linux daemon and unix client
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e47c46c713afc42430de339c6324632ef8830894
Component: engine
2017-01-20 16:10:28 +01:00
ad6c5e2334
Add zsh completion for 'dockerd --init' and 'docker {create,run} --init'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cdf57782fd6323549e37aaccc3eeaef1b4aa91f3
Component: engine
2017-01-20 16:06:22 +01:00
1f960a59bb
Add zsh completion for 'docker {container,image,network,system} prune --filter'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 784ebccffaa8329aee9e88877e6039b5002ad8e3
Component: engine
2017-01-20 15:49:21 +01:00
f421a18923
Merge pull request #29147 from Microsoft/jjh/makeroot
...
Windows: make.ps1 calc root
Upstream-commit: ba4f8f06b3cab866c58945a9b7a7f3735c855b32
Component: engine
2017-01-20 15:01:58 +01:00
0bc9ac7339
Merge pull request #27510 from chipironcin/master
...
Improve error message
Upstream-commit: 5b16c4c8001fb6d047228ad27a9c39f2ac0e6f5b
Component: engine
2017-01-20 21:47:30 +09:00
1e67a25de5
update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 541aa27d032455b674784ab53970634761a90a06
Component: engine
2017-01-20 06:18:12 +00:00
142454692f
validate mount path for tmpfs
...
There was no validation for `docker run --tmpfs foo`.
In this PR, only two obvious rules are implemented:
- path must be absolute
- path must not be "/"
We should add more rules carefully.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 4a8799dc0a000a74eae49a01b054ae687bc18f73
Component: engine
2017-01-20 06:01:48 +00:00
b4573da32a
Vendor swarmkit
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: eb13865d4e43d3084b017bf2b1287cff5e060b77
Component: engine
2017-01-19 17:20:33 -08:00
b01d142fdf
Pass plugingetter as part of swarm node config.
...
This is necessary for swarmkit to support cluster wide plugins, such as
globally scoped network plugins.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: fa784951ba0a29d436c60b7465167b5ef188d084
Component: engine
2017-01-19 17:11:12 -08:00
027b11b8c3
Remove use of forked reference package for cli
...
Use resolving to repo info as the split point between the
legitimate reference package and forked reference package.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 0421f5173dbdcb4e4eade5267f274302bb6ab97c
Component: engine
2017-01-19 16:04:50 -08:00
35391cbe02
Vendor updated distribution
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 3dfb7590a180f3bbe8ea72b3a437f927ec43e9c4
Component: engine
2017-01-19 16:02:34 -08:00
310ff23136
Use a regex to match environment variables #27565
...
Signed-off-by: Joseph Rothrock <rothrock@rothrock.org >
Upstream-commit: 9758a2a72445eb767ea81b44a73aabb5a8005bab
Component: engine
2017-01-19 15:30:11 -08:00
03bf74bac4
Merge pull request #29988 from yongtang/29936-insecure-registries
...
Return error when insecure registry contains scheme
Upstream-commit: af90d50647094f8d7813584a90c7a534c2bb610e
Component: engine
2017-01-19 21:49:06 +01:00
c4cc189597
distribution: Add text/html and application/json as image mediatypes
...
As noted by #30083 , the new strict checking of mediatypes misses some
cases where earlier bugs caused nonstandard mediatypes to be stored in
manifests. Two of the known cases are text/html and application/json,
which were returned by certain registries and stored by earlier versions
of Docker. Add special cases for text/html and application/json.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a215e15cb1fbecc3b22d4f90e15638728ac7ac78
Component: engine
2017-01-19 11:16:28 -08:00
120ceec639
Merge pull request #29980 from allencloud/fix-29520-info-incorrectness
...
return error when listNode fails
Upstream-commit: a992ff9fec1ea89725c81ebba856f3b903f6ba1d
Component: engine
2017-01-19 10:41:02 -08:00
ea8da37d2a
Add docs for run|create --init|--init-path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d049ef2b0db4aebfba4f85f5d8294e9884a4b7e2
Component: engine
2017-01-19 08:47:01 -08:00
da2ad487f8
Add bash completion for run|create --init-path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 182048f18592259633d21ac55bd5b73903de50b9
Component: engine
2017-01-19 08:33:05 -08:00
d24367c4ff
Merge pull request #30165 from xulike666/fix-typo-6/36
...
[combined] fix typo
Upstream-commit: de0328560b818e86fd3eadc973f90341e5c33498
Component: engine
2017-01-19 17:21:22 +01:00
aa09155ed2
Add zsh completion for 'docker swarm --availability'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ee2ce82c61c11b1c14f9febf811fbbc19d69b750
Component: engine
2017-01-19 16:54:36 +01:00
bff0390b15
Merge pull request #30267 from WeiZhang555/fix-misspell
...
Fix some typos
Upstream-commit: a3dff7c3dbb949662be0037de0e51c00cfa68364
Component: engine
2017-01-19 15:06:08 +01:00
dbf5d89403
Merge pull request #30266 from albers/completion--init
...
Add bash completion for `dockerd --init` and `docker run|create --init`
Upstream-commit: ee54d8eb27037eb4232a144c7618f612f8a51cf6
Component: engine
2017-01-19 15:05:44 +01:00
2bccbd2e65
Merge pull request #30259 from nishanttotla/dynamically-update-hostname
...
Make Docker automatically update hostname for Swarm node
Upstream-commit: 5c808268801e90f95f1dd8bc4f70c3f0434d6cb4
Component: engine
2017-01-19 10:35:50 +00:00
9977ce25d8
Fix broken JSON support in cli/command/formatter
...
How to test (it should not print `{}`, and just returns JSON with the actual data):
$ docker images --format '{{json .}}'
$ docker container stats --format '{{json .}}'
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 26013fcdd64221c858022392a1430a6c43eaaa26
Component: engine
2017-01-19 09:51:13 +00:00
97ca330cd9
Add zsh completion for multiple service for 'docker service ps'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 82e62b15f39f2759a84123c1117b6bf85830c367
Component: engine
2017-01-19 09:04:51 +01:00
eff5310721
Add zsh completion for 'docker plugin install --alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 455b7bcbabd4eb7e440448b5834f626cb08c69e0
Component: engine
2017-01-19 08:58:44 +01:00
2db1bd6f28
fix typo
...
fix typo I found AMAP in integration-cli/*
fix typo mentioned by Allencloud
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn >
Upstream-commit: 40af5691648c5b9d07b1231e3ed3be29fd66521a
Component: engine
2017-01-19 15:52:28 +08:00
377b3251ff
Fix some typos
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 827bbe90a0fc53342a85d2653d96b8ba55658adf
Component: engine
2017-01-19 15:29:28 +08:00
56fef9c9c4
Add bash completion for dockerd --init and docker run|create --init
...
Fixes #30263
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 20762617572f2e02b8e397844343083506144e86
Component: engine
2017-01-19 08:22:14 +01:00
b0c7dd934b
return error when listNode fails
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 8e04e9902a9739a13e5e824339082cc3d361d097
Component: engine
2017-01-19 14:02:06 +08:00
d6bce40c8a
Merge pull request #30218 from kevinetc123/patch-typo
...
fix a typo error
Upstream-commit: 7d0041f9e5dce58366a3ce09e75d82ce307cf28a
Component: engine
2017-01-19 14:34:19 +09:00
0bc7b63417
correct all the formate to formatter
...
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn >
Upstream-commit: b8155bd5bead29bf116aeea9159563e1a6409c41
Component: engine
2017-01-19 11:26:49 +08:00
ce34ab60cd
Make Docker automatically update hostname for Swarm node
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 8de8b1d520d4d60ccc813121f0c718b98efdc220
Component: engine
2017-01-18 15:55:53 -08:00
047ed027d7
Windows: Remove GetPidsForContainer
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f47e417466532212534a18d510a9d76e2e8f9f61
Component: engine
2017-01-18 12:28:52 -08:00
608b828a8d
add suggestions in failure message in install script
...
Adds suggestions to where you can install docker in the case
that the install script fails to install because of the architecture
not being officially supported.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 5fd7ef2c4b742d19fcb48921b159e57a53fdd362
Component: engine
2017-01-18 15:11:20 -05:00
ae5b65a856
Merge pull request #30208 from justincormack/no-sqlite
...
Remove sqlite dependency
Upstream-commit: 0e8c7d72771847227df295471ac73180cbb3caa9
Component: engine
2017-01-18 13:15:38 -05:00
Vincent Demeester
Sebastiaan van Stijn
Michael Friis
Anusha Ragunathan
Yong Tang
Tibor Vass
Victor Vieux
Justin Cormack
Tõnis Tiigi
Alexander Morozov
Daniel Nephin
Steve Durrheimer
Akihiro Suda
Derek McGowan
Joseph Rothrock
Aaron Lehmann
Harald Albers
Aaron.L.Xu
Zhang Wei
allencloud
kaiwentan
Nishant Totla
John Howard
Christopher Jones
Brian Goff