Aaron Lehmann
ce4bab4518
Merge pull request #30206 from coolljt0725/fix_save_share_layers
...
Follow #28926 , fix docker save can't share layers in the tar archive.
Upstream-commit: 3c82a9bc27784654f5356cf16cb9e5df5a0339a6
Component: engine
2017-01-24 16:28:11 -08:00
Brian Goff
1245f22731
Merge pull request #30269 from sdurrheimer/zsh-completion-service-ps-multi
...
Add zsh completion for multiple service for 'docker service ps'
Upstream-commit: f07f54951fcf918423463d57c67d6fe04b82941b
Component: engine
2017-01-24 16:33:30 -05:00
Kenfe-Mickaël Laventure
86c166c49a
Merge pull request #30391 from andrewhsu/check-changelog-date
...
validate CHANGELOG.md dates are in descending order
Upstream-commit: 5e74dc11e3507c36aafae9909c1fa0ee4eee4003
Component: engine
2017-01-24 11:18:21 -08:00
Michael Crosby
dbe5a280c8
Merge pull request #30283 from albers/completion-run--init-path
...
Add bash completion and docs for `docker run|create --init-path`
Upstream-commit: b13ecbc7b530fa17e4c7a4509c8c7d9e1a6c1e90
Component: engine
2017-01-24 10:06:44 -08:00
Vincent Demeester
25403b5f1a
Merge pull request #30413 from thaJeztah/minor-godocs-fixup
...
Minor GoDoc fixup in integration-cli
Upstream-commit: f645ffca04abf2dd6c89ac9057a1eb7d2b0ac338
Component: engine
2017-01-24 18:08:27 +01:00
Sebastiaan van Stijn
f757a1d4b1
Minor GoDoc fixup in integration-cli
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 089e1c1c5b74dd794c4cb6db86240e175000edc0
Component: engine
2017-01-24 18:03:30 +01:00
Brian Goff
aca0d9b25a
Merge pull request #30268 from sdurrheimer/zsh-completion-plugin-install-alias
...
Add zsh completion for 'docker plugin install --alias'
Upstream-commit: 34d06190740d555b63cbe814028c207b13b4c2cc
Component: engine
2017-01-24 10:08:57 -05:00
Brian Goff
c26a6ba57a
Merge pull request #30399 from albers/completion-swarm-lock
...
Add bash completion for `docker swarm unlock|unlock-key`
Upstream-commit: aa180e5f31c78f2216fe664378828baac0954175
Component: engine
2017-01-24 09:43:07 -05:00
Brian Goff
648cda85d5
Merge pull request #30398 from albers/completion-swarm-init
...
Add missing options to bash completion for `docker swarm init|update`
Upstream-commit: 3bc021cdf371f539295e87d1b22ca9066eda6e87
Component: engine
2017-01-24 09:41:30 -05:00
Brian Goff
1c12016321
Merge pull request #30373 from albers/completion-fix-service-update
...
Fix bash completion for `docker service update`
Upstream-commit: 47da8175be65ac401348a7b03c321914d07a910a
Component: engine
2017-01-24 09:31:53 -05:00
Brian Goff
465587cda7
Merge pull request #30378 from mlaventure/fix-negative-size
...
Ensure proper value is used when computing reclaimable space
Upstream-commit: ee7682ebaedba6025f585c3ab6f0d61513e54e06
Component: engine
2017-01-24 09:24:53 -05:00
Vincent Demeester
bb6348df00
Merge pull request #30394 from aboch/nl
...
Vendor vishvananda/netlink @ebdfb74
Upstream-commit: 23341a41a5bada3e6ff151c8f38c5983ff524959
Component: engine
2017-01-24 15:24:07 +01:00
Vincent Demeester
f80b2ebc4e
Merge pull request #30248 from albers/completion-capabilities
...
Improve bash completion for `docker run --cap-{add,drop}`
Upstream-commit: d417dd7886f420bd369361a6f137364222998488
Component: engine
2017-01-24 12:10:14 +01:00
Sebastiaan van Stijn
5fc02e465e
Merge pull request #30370 from mikesir87/master
...
Fixed secret creation usage during service create in docs
Upstream-commit: d1f7798c60ef081f104cbe008a23af4e5e06b20f
Component: engine
2017-01-24 11:55:09 +01:00
Sebastiaan van Stijn
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Vincent Demeester
282bb14467
Merge pull request #29301 from miaoyq/improve-print-info-for-inspect
...
Improve the error print of image inspect
Upstream-commit: 0ca4995ca8127f64dd82a4b0d67ef17cf5bdb3db
Component: engine
2017-01-24 10:56:24 +01:00
Harald Albers
fa3a411dc8
Add bash completion for docker swarm unlock|unlock-key
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 07bd5152b3731c108e2dba57b1f51e6609b55ba3
Component: engine
2017-01-24 10:11:38 +01:00
Harald Albers
4626e249f0
Add missing options to bash completion for docker swarm init|update
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f93da79dc18a989a727978350cca8e941e9daeca
Component: engine
2017-01-24 10:00:18 +01:00
Alessandro Boch
7bd7e5b7ec
Vendor netlink @ebdfb74
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ed758b604a593b5d4b9d769461d6c44926d89d91
Component: engine
2017-01-23 22:47:37 -08:00
Andrew Hsu
d3601c28f5
validate changelog dates are in descending order
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 6cca6bf9429e21dc03086a5650e23879cf334a49
Component: engine
2017-01-23 19:19:35 -08:00
Yanqiang Miao
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
Lei Jitang
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
Akihiro Suda
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
Brian Goff
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
Aaron Lehmann
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
Sebastiaan van Stijn
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
Anusha Ragunathan
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
Tibor Vass
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Kenfe-Mickael Laventure
b5ccc2ae09
Ensure proper value is used when computing reclaimable space
...
When Size was reverted to be equal to VirtualSize, the df command
formatter was not correctly updated to account for the change.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: dcc1b4baf6d0eb068010d071bc44daf72b12cd4a
Component: engine
2017-01-23 13:57:20 -08:00
Brian Goff
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
Aaron Lehmann
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
John Howard
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
Harald Albers
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
Harald Albers
ac8ec79951
Fix bash completion for docker service update
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 01ac33ce165835a3ccde7d151d7d2905c8391461
Component: engine
2017-01-23 18:48:21 +01:00
Harald Albers
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
Michael Irwin
2d786dfacf
Fixed secret creation usage during service create in docs
...
Using source, the following error is made:
invalid field in secret request: src
Signed-off-by: Michael Irwin <mikesir87@gmail.com >
Upstream-commit: 9250117d58443a9db052b69457a135b88f97c322
Component: engine
2017-01-23 12:09:11 -05:00
Anusha Ragunathan
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Michael Friis
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
Anusha Ragunathan
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
Yong Tang
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
Tibor Vass
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
