Commit graph

30488 commits

Author SHA1 Message Date
Kenfe-Mickael Laventure
1756af6faf Allow adding rules to cgroup devices.allow on container create/run
This introduce a new `--device-cgroup-rule` flag that allow a user to
add one or more entry to the container cgroup device `devices.allow`

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-26 07:20:45 -08:00
Sebastiaan van Stijn
fe5f49685d Merge pull request #30111 from darrenstahlmsft/DependsConDrv
Windows: Add service dependency ConDrv
2017-01-26 12:49:05 +01:00
Sebastiaan van Stijn
bc18cfa3f3 Merge pull request #28921 from allencloud/remove-incorrect-url
update an incorrect url in docs
2017-01-26 10:29:12 +01:00
allencloud
5ae95d6245 update incorrect url in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-26 12:57:45 +08:00
Kenfe-Mickaël Laventure
db657a558e Merge pull request #30376 from albers/completion-fix-node-list
Fix bash completion for completing nodes
2017-01-25 11:52:13 -08:00
Alexander Morozov
a76572b846 Merge pull request #30330 from mlaventure/prune-named-untagged
Prune named but untagged images if danglingOnly=true
2017-01-25 08:38:15 -08:00
Aaron Lehmann
e9c0de0de6 Merge pull request #30043 from dmcgowan/distribution-reference-update-1
Distribution reference update
2017-01-24 20:38:20 -08:00
Sebastiaan van Stijn
d4cd4b2164 Merge pull request #30182 from AkihiroSuda/validate-tmpfs
validate mount path for tmpfs
2017-01-25 03:08:17 +01:00
Victor Vieux
42d25de1b7 Merge pull request #30291 from yongtang/30279-ps-format
Fix failure in `docker ps --format` when `.Label` has args
2017-01-24 17:55:52 -08:00
Sebastiaan van Stijn
9b2dabbf18 Merge pull request #30227 from thaJeztah/fix-ineffectual-assignments
fix some ineffectual assignments (and minor fixes)
2017-01-25 02:49:57 +01:00
Victor Vieux
113e9f07f4 Merge pull request #30408 from cpuguy83/fix_plugin_wait
Fix deadlock on v1 plugin with activate error
2017-01-24 17:29:56 -08:00
Victor Vieux
4726fd1203 Merge pull request #30325 from dnephin/add-internal-to-compose-network
Add network.internal to Compose schema
2017-01-24 17:16:08 -08:00
Aaron Lehmann
3c82a9bc27 Merge pull request #30206 from coolljt0725/fix_save_share_layers
Follow #28926, fix docker save can't share layers in the tar archive.
2017-01-24 16:28:11 -08:00
Brian Goff
f07f54951f Merge pull request #30269 from sdurrheimer/zsh-completion-service-ps-multi
Add zsh completion for multiple service for 'docker service ps'
2017-01-24 16:33:30 -05:00
Kenfe-Mickaël Laventure
5e74dc11e3 Merge pull request #30391 from andrewhsu/check-changelog-date
validate CHANGELOG.md dates are in descending order
2017-01-24 11:18:21 -08:00
Michael Crosby
b13ecbc7b5 Merge pull request #30283 from albers/completion-run--init-path
Add bash completion and docs for `docker run|create --init-path`
2017-01-24 10:06:44 -08:00
Vincent Demeester
f645ffca04 Merge pull request #30413 from thaJeztah/minor-godocs-fixup
Minor GoDoc fixup in integration-cli
2017-01-24 18:08:27 +01:00
Sebastiaan van Stijn
089e1c1c5b Minor GoDoc fixup in integration-cli
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 18:03:30 +01:00
Brian Goff
f2d384fca6 Fix deadlock on v1 plugin with activate error
When a plugin has an activation error, it was not being checked in the
`waitActive` loop. This means it will just wait forever for a manifest
to be populated even though it may never come.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-24 11:08:13 -05:00
Brian Goff
34d0619074 Merge pull request #30268 from sdurrheimer/zsh-completion-plugin-install-alias
Add zsh completion for 'docker plugin install --alias'
2017-01-24 10:08:57 -05:00
Brian Goff
aa180e5f31 Merge pull request #30399 from albers/completion-swarm-lock
Add bash completion for `docker swarm unlock|unlock-key`
2017-01-24 09:43:07 -05:00
Brian Goff
3bc021cdf3 Merge pull request #30398 from albers/completion-swarm-init
Add missing options to bash completion for `docker swarm init|update`
2017-01-24 09:41:30 -05:00
Brian Goff
47da8175be Merge pull request #30373 from albers/completion-fix-service-update
Fix bash completion for `docker service update`
2017-01-24 09:31:53 -05:00
Brian Goff
ee7682ebae Merge pull request #30378 from mlaventure/fix-negative-size
Ensure proper value is used when computing reclaimable space
2017-01-24 09:24:53 -05:00
Vincent Demeester
23341a41a5 Merge pull request #30394 from aboch/nl
Vendor vishvananda/netlink @ebdfb74
2017-01-24 15:24:07 +01:00
Vincent Demeester
d417dd7886 Merge pull request #30248 from albers/completion-capabilities
Improve bash completion for `docker run --cap-{add,drop}`
2017-01-24 12:10:14 +01:00
Sebastiaan van Stijn
d1f7798c60 Merge pull request #30370 from mikesir87/master
Fixed secret creation usage during service create in docs
2017-01-24 11:55:09 +01:00
Sebastiaan van Stijn
de1a403810 Merge pull request #30387 from coolljt0725/fix_typo
typo: fix typo in api documents
2017-01-24 11:46:44 +01:00
Vincent Demeester
bb9f7cb280 Merge pull request #30371 from albers/completion-fix-plugin-ls
Fix bash completion for `docker plugin ls`
2017-01-24 11:46:13 +01:00
Sebastiaan van Stijn
ba0afd70e8 fix some ineffectual assignments
to make goreportcard a bit happier
https://goreportcard.com/report/github.com/docker/docker

also found that `TestCpToErrDstParentNotExists()` was
partially broken, because a `runDockerCp()` was inadvertently
removed in f26a31e80c

`TestDaemonRestartSaveContainerExitCode()` didn't verify
the actual _Error_ message, so added that to the test,
and updated the test to take into account that the
"experimental" CI enables `--init` on containers.

`TestVolumeCLICreateOptionConflict()` only checked
for an error to occur, but didn't validate if the
error was due to conflicting options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 11:16:19 +01:00
Sebastiaan van Stijn
8820266c17 Merge pull request #29900 from yongtang/29226-network-format-created-at
Add `.CreatedAt` placeholder for `docker network ls --format`
2017-01-24 11:01:37 +01:00
Vincent Demeester
ac30c4c06c Merge pull request #30385 from aaronlehmann/vendor-swarmkit-grpc-containerd
Vendor swarmkit, containerd, and related dependencies
2017-01-24 11:00:35 +01:00
Vincent Demeester
0ca4995ca8 Merge pull request #29301 from miaoyq/improve-print-info-for-inspect
Improve the error print of image inspect
2017-01-24 10:56:24 +01:00
Harald Albers
07bd5152b3 Add bash completion for docker swarm unlock|unlock-key
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-24 10:11:38 +01:00
Harald Albers
f93da79dc1 Add missing options to bash completion for docker swarm init|update
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-24 10:00:18 +01:00
Harald Albers
550947e437 Fix bash completion for completing nodes
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-24 09:24:34 +01:00
Alessandro Boch
ed758b604a Vendor netlink @ebdfb74
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-01-23 22:47:37 -08:00
Andrew Hsu
6cca6bf942 validate changelog dates are in descending order
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-01-23 19:19:35 -08:00
Yanqiang Miao
cc9ed0a31b Improve the error print of image inspect
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-01-24 11:07:20 +08:00
Lei Jitang
2f0d494682 typo: fix typo in api documents
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-01-23 22:05:44 -05:00
Akihiro Suda
929ae4a0b6 Merge pull request #30375 from albers/completion-service-ps--filter-node
Add bash completion for `docker service ps --filter node`
2017-01-24 11:49:16 +09:00
Brian Goff
5e46ad159d Merge pull request #30306 from AkihiroSuda/update-proxy
update docker-proxy to 7b2b1feb1de4817d522cc372af149ff48d25028e
2017-01-23 21:07:25 -05:00
Aaron Lehmann
3e987e1732 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>
2017-01-23 17:51:14 -08:00
Sebastiaan van Stijn
f633764913 Merge pull request #30262 from aaronlehmann/text-html
distribution: Add text/html and application/json as image mediatypes
2017-01-24 01:13:35 +01:00
Anusha Ragunathan
99d3b26346 Merge pull request #30294 from tiborvass/plugin-rexray-docs
plugins: add example docs for a rexray plugin
2017-01-23 15:48:20 -08:00
Tibor Vass
5f713cecc5 plugins: add example docs for a rexray plugin
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-01-23 15:41:35 -08:00
Sebastiaan van Stijn
7fed0830f3 Merge pull request #30211 from thaJeztah/fix-content-trust-flags
fix flag descriptions for content-trust
2017-01-23 23:52:11 +01:00
Vincent Demeester
eac3e4b5dd Merge pull request #29883 from dnephin/update-to-latest-schema
Update compose schema v3
2017-01-23 23:18:31 +01:00
Kenfe-Mickael Laventure
dcc1b4baf6 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>
2017-01-23 13:57:20 -08:00
Brian Goff
b157b3c648 Merge pull request #30318 from sdurrheimer/zsh-completion-init
Add zsh completion for 'dockerd --init' and 'docker {create,run} --init'
2017-01-23 16:28:25 -05:00