de6f433c3d
Merge pull request #30387 from coolljt0725/fix_typo
...
typo: fix typo in api documents
Upstream-commit: de1a403810e16aa5d069ea8ca5e407aa447594f9
Component: engine
2017-01-24 11:46:44 +01:00
cac1776108
Merge pull request #30371 from albers/completion-fix-plugin-ls
...
Fix bash completion for `docker plugin ls`
Upstream-commit: bb9f7cb280a98c14eb8ec338a1ee1f037c5a1645
Component: engine
2017-01-24 11:46:13 +01:00
c6a1cf9cb8
Merge pull request #29900 from yongtang/29226-network-format-created-at
...
Add `.CreatedAt` placeholder for `docker network ls --format`
Upstream-commit: 8820266c17beede7d08b6b077383978f3b7b239f
Component: engine
2017-01-24 11:01:37 +01:00
4593a8b426
Merge pull request #30385 from aaronlehmann/vendor-swarmkit-grpc-containerd
...
Vendor swarmkit, containerd, and related dependencies
Upstream-commit: ac30c4c06c9d797af0025d2454d20383abfaff76
Component: engine
2017-01-24 11:00:35 +01:00
9cbd4394d2
Improve the error print of image inspect
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: cc9ed0a31b0656c58ad7953f2c54d46258380443
Component: engine
2017-01-24 11:07:20 +08:00
2b0805b53f
typo: fix typo in api documents
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2f0d4946823019d2b41a0aac7eaa6b84f8e96e49
Component: engine
2017-01-23 22:05:44 -05:00
8cc16f0566
Merge pull request #30375 from albers/completion-service-ps--filter-node
...
Add bash completion for `docker service ps --filter node`
Upstream-commit: 929ae4a0b6f2be28512faa2d80d67b95774dea0f
Component: engine
2017-01-24 11:49:16 +09:00
682ce126f9
Merge pull request #30306 from AkihiroSuda/update-proxy
...
update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e
Upstream-commit: 5e46ad159d1939102812b33abfd86e248c40cccf
Component: engine
2017-01-23 21:07:25 -05:00
d93ce12d04
Vendor swarmkit, containerd, and related dependencies
...
Update swarmkit to 037b491.
As swarmkit switched to a newer gRPC version, this also involves
updating Docker's vendored gRPC, which in turn requires updating
containerd to a new version that has protobufs generated against this
gRPC version.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3e987e1732ee5c51e95934afabba3fedfd16c4af
Component: engine
2017-01-23 17:51:14 -08:00
060b9f6e35
Merge pull request #30262 from aaronlehmann/text-html
...
distribution: Add text/html and application/json as image mediatypes
Upstream-commit: f6337649133ceb300a18e604ae96ca8a30c42541
Component: engine
2017-01-24 01:13:35 +01:00
ff90a502e8
Merge pull request #30294 from tiborvass/plugin-rexray-docs
...
plugins: add example docs for a rexray plugin
Upstream-commit: 99d3b2634643c2a5b1546045054855895a54c1e7
Component: engine
2017-01-23 15:48:20 -08:00
b3bae22345
plugins: add example docs for a rexray plugin
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5f713cecc5f65ea61db5b5362f26f96de9427eb0
Component: engine
2017-01-23 15:41:35 -08:00
1540000352
Merge pull request #30211 from thaJeztah/fix-content-trust-flags
...
fix flag descriptions for content-trust
Upstream-commit: 7fed0830f398e704115c7583192f01c058703277
Component: engine
2017-01-23 23:52:11 +01:00
5f10f9f9d8
Merge pull request #29883 from dnephin/update-to-latest-schema
...
Update compose schema v3
Upstream-commit: eac3e4b5dda3c1d7d4c9031dcd8dc67562bcc0e7
Component: engine
2017-01-23 23:18:31 +01:00
57ab4be8fc
Merge pull request #30318 from sdurrheimer/zsh-completion-init
...
Add zsh completion for 'dockerd --init' and 'docker {create,run} --init'
Upstream-commit: b157b3c6489917f7633c93f730416b76513cadbf
Component: engine
2017-01-23 16:28:25 -05:00
471ffa89e7
Merge pull request #30139 from Microsoft/jjh/sequential
...
Windows: Use sequential file access
Upstream-commit: 062f2a3eae418c07a9a18661492a1c8beaaed60a
Component: engine
2017-01-23 12:46:06 -08:00
f61d5bb251
Windows: Use sequential file access
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c98e77c77c5b43bf50e8ae5296b02ce0b47ea188
Component: engine
2017-01-23 10:25:36 -08:00
3c793c2ca4
Add bash completion for docker service ps --filter node
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a39a2bb6c29405148df3e45216f46f54263cd5ea
Component: engine
2017-01-23 19:05:00 +01:00
8d31dfb88a
Fix bash completion for docker plugin ls
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 72bd2f8fd3ac456300cc2d3415667cb380faf184
Component: engine
2017-01-23 18:24:51 +01:00
4d4ab77f0f
Merge pull request #29088 from yongtang/28708-plugin-list-format
...
Add `--format` flag for `docker plugin ls`
Upstream-commit: 8bb8ac7f788b258ee17473d9f2779341506aed0a
Component: engine
2017-01-23 08:49:28 -08:00
ffebf75329
fix flag descriptions for content-trust
...
Commit ed13c3abfb242905ec012e8255dc6f26dcf122f6 added flags
for Docker Content Trust. Depending on the `verify` boolean,
the message is "Skip image verification", or "Skip image signing".
"Signing" is intended for `docker push` / `docker plugin push`.
During the migration to Cobra, this boolean got flipped for
`docker push` (9640e3a4514f96a890310757a09fd77a3c70e931),
causing `docker push` to show the incorrect flag description.
This patch changes the flags to use the correct description
for `docker push`, and `docker plugin push`.
To prevent this confusion in future, the boolean argument
is removed, and a `AddTrustSigningFlags()` function is added.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bb3c0b246617aecb8ecf9120f07efcf45b94ae09
Component: engine
2017-01-23 14:52:36 +01:00
369f49aace
Merge pull request #30351 from friism/patch-9
...
remove indent from .dockerignore example
Upstream-commit: 4f926b67f4ee2c1494332d7f1021e3fc45ef045a
Component: engine
2017-01-23 11:30:23 +01:00
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
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
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
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
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
