1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

22419 commits

Author SHA1 Message Date
David Calavera
921c744bc3 Merge pull request from MHBauer/cleanup
consistent variable names in api/server/router
2016-02-22 15:20:48 -08:00
Morgan Bauer
9021506502
consistent variable names in api/server/router
- banish 'daemon'

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-02-22 10:53:47 -08:00
Brian Goff
40397d8059 Merge pull request from Microsoft/jjh/dockerfilereliability
Windows CI: Making dockerfile WAAAAAY faster
2016-02-22 13:11:23 -05:00
Vincent Demeester
4a087e4e6b Merge pull request from hsinko/fix_api_docs
Fix tiny error. And Previous PR missed to update docker_remote_api v1.22 and v1.23
2016-02-22 14:43:50 +01:00
hsinko
5642cdeac5 Update docker_remote_api_v1.22.md and v1.23 to complete the docs
Signed-off-by: hsinko <21551195@zju.edu.cn>

id in example request should be a exact value

Signed-off-by: hsinko <21551195@zju.edu.cn>

revert v1.22 doc

Signed-off-by: hsinko <21551195@zju.edu.cn>

fix tiny errors

Signed-off-by: hsinko <21551195@zju.edu.cn>
2016-02-22 20:49:10 +08:00
Vincent Demeester
5d33ff7e9d Merge pull request from albers/completion-update--restart
Add bash completion for `docker update --restart`
2016-02-22 13:44:31 +01:00
Vincent Demeester
0542f66823 Merge pull request from albers/completion-etwlogs
Add bash completion for etwlogs logging driver
2016-02-22 13:42:46 +01:00
Vincent Demeester
074442df7a Merge pull request from zhuguihua/fix_storage_driver_options_in_man_page
fix storage driver options in man page
2016-02-22 10:40:52 +01:00
Zhu Guihua
13deb4a245 fix storage driver options in man page
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2016-02-22 17:34:19 +08:00
Harald Albers
dd4aa7f0e9 bash completion for docker update --restart
Signed-off-by: Harald Albers <github@albersweb.de>
2016-02-21 10:21:28 -08:00
Harald Albers
1cd6b545ec bash completion for etwlogs logging driver
Signed-off-by: Harald Albers <github@albersweb.de>
2016-02-21 09:58:42 -08:00
Vincent Demeester
675617bc85 Merge pull request from estesp/unskip-authz-events
Unskip authz events test after fixes
2016-02-21 09:32:28 +01:00
Vincent Demeester
1b811a8930 Merge pull request from tracylihui/20536-fix
Update docker_remote_api_v1.21.md to complete the docs
2016-02-21 09:27:50 +01:00
John Howard
c7089b4b46 Windows CI: Making dockerfile WAAAAAY faster
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-20 22:45:08 -08:00
tracylihui
cc2ff8c921 Update docs/reference/api to complete the docs
Signed-off-by: tracylihui <793912329@qq.com>
2016-02-21 10:28:07 +08:00
Phil Estes
4781d5c4fb Unskip authz events test after fixes
Now that the various fixes are all committed, let's see if this gets
less flaky now.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-20 20:19:54 -06:00
Vincent Demeester
3646b14ecd Merge pull request from cloojure/patch-3
Update dockernetworks.md
2016-02-20 23:25:51 +01:00
Vincent Demeester
41a2bac7cf Merge pull request from longliqiang88/master2.201
Update doc docker_remote_api_v1.20.md
2016-02-20 19:18:28 +01:00
Sebastiaan van Stijn
d006e32a91 Merge pull request from lblackstone/update-packager-readme
Update Packagers readme with seccomp info
2016-02-20 19:17:11 +01:00
longliqiang88
47e3ea7dd1 Update doc docker_remote_api_v1.20.md
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com>
2016-02-20 19:32:20 +08:00
tracylihui
df3ede95eb Update docker_remote_api_v1.21.md to complete the docs
Signed-off-by: tracylihui <793912329@qq.com>
2016-02-20 19:17:19 +08:00
Antonio Murdaca
076b3558fc Merge pull request from estesp/cleanup-authz-test
Clean up authz integration-cli test
2016-02-20 12:10:29 +01:00
Sebastiaan van Stijn
dc0a69cbcd Merge pull request from hsinko/dev
A wrong word
2016-02-20 11:57:29 +01:00
Vincent Demeester
fe275414fe Merge pull request from WeiZhang555/19025-update-restart
Update RestartPolicy of container
2016-02-20 11:39:31 +01:00
Zhang Wei
ff3ea4c90f Update RestartPolicy of container
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-20 17:06:32 +08:00
hsinko
0b64280195 Update configure-dns.md
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
2016-02-20 11:51:59 +08:00
Tibor Vass
6668326aa8 Merge pull request from calavera/userland_proxy_config_fix
Avoid setting default truthy values from flags that are not set.
2016-02-19 21:00:37 -05:00
Alan Thompson
549fa67dae Update dockernetworks.md
Fix truncated sentence

Signed-off-by: Alan Thompson <cloojure@gmail.com>
2016-02-19 16:57:13 -08:00
Tibor Vass
3d65e7126c Merge pull request from estesp/fix-userns-cp
Fix copy chown settings to not default to real root
2016-02-19 19:45:44 -05:00
Phil Estes
fe015c5ce0 Allow post-start load of busybox to remove restarts
The restarts in the authz plugin test suite seems to be causing
flakiness in CI, and can be avoided by separating the daemon start and
busybox image load.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-19 18:44:36 -06:00
David Calavera
64785ff146 Merge pull request from estesp/vendor-engine-api-fix
Update engine-api vendoring to latest commit
2016-02-19 15:41:17 -08:00
Arnaud Porterie
b9195cd6d4 Merge pull request from cpuguy83/fix_events_flakiness
Fix events test flakiness.
2016-02-19 15:39:27 -08:00
David Calavera
31cb96dcfa Avoid setting default truthy values from flags that are not set.
When the value for a configuration option in the file is `false`,
and the default value for a flag is `true`, we should not
take the value from the later as final value for the option,
because the user explicitly set `false`.

This change overrides the default value in the flagSet with
the value in the configuration file so we get the correct
result when we merge the two configurations together.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-19 18:39:10 -05:00
Phil Estes
1c2db56d2f Update engine-api vendoring to latest commit
This picks up the change for `Content-Type` which will help solve issues
with authz plugins.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-19 16:20:27 -06:00
Levi Blackstone
b25b9b5709 Update Packagers readme with seccomp info
Signed-off-by: Levi Blackstone <levi.blackstone@rackspace.com>
2016-02-19 15:36:34 -06:00
David Calavera
e51457eea8 Merge pull request from tonistiigi/retake-ref
Fix releasing reference on deletion error
2016-02-19 13:25:26 -08:00
Jess Frazelle
a657cfd68b Merge pull request from redbaron/fix-deferred-removal-detection
Fix libdevmapper deferred removal detection
2016-02-19 13:58:18 -07:00
Jess Frazelle
3b62a610ec Merge pull request from tiborvass/debian-jessie
Switch Dockerfile to debian:jessie ... AGAIN
2016-02-19 13:51:30 -07:00
Brian Goff
0e72550c5b Merge pull request from HackToday/addsort
Make network ls output order
2016-02-19 15:42:48 -05:00
Brian Goff
48701888c2 Merge pull request from HackToday/addvolumesupport
Make volume ls output order
2016-02-19 15:41:34 -05:00
Arnaud Porterie
9d70aef2c7 Merge pull request from icecrime/skip_flaky_test
Temporarily skip TestAuthZPluginAllowEventStream
2016-02-19 10:57:30 -08:00
Tonis Tiigi
64530c8e47 Fix releasing reference on deletion error
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-19 10:42:29 -08:00
Arnaud Porterie
6e0f873f05 Temporarily skip TestAuthZPluginAllowEventStream
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-19 10:32:05 -08:00
Tibor Vass
aa1fdf42da Merge pull request from aaronlehmann/smarter-tls-fallback
Smarter push/pull fallback from TLS to plaintext
2016-02-19 13:16:53 -05:00
Phil Estes
074561b0ec Clean up authz integration-cli test
- Order the flow of the handlers more cleanly--read req, do actions,
  write response.
- Add "always allowed" endpoints to handle `/_ping` and `/info` usage
  from the test framework/daemon start/restart management

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-19 10:12:39 -08:00
Vincent Demeester
06af9471f8 Merge pull request from zhangjianfnst/fix-some-flaws-in-docs
Fix some flaws in docs
2016-02-19 17:07:50 +01:00
Sebastiaan van Stijn
d6576ad9f0 Merge pull request from fuzzbomb/20503-document-names-format-placeholder-docker-ps-man-page
Document .Names format placeholder in docker-ps man page, fixes .
2016-02-19 16:34:23 +01:00
Andrew Macpherson
22d22eb9e1 Document .Names format placeholder in docker-ps man page, fixes .
Signed-off-by: Andrew Macpherson <hopscotch23@gmail.com>
2016-02-19 15:13:34 +00:00
Sebastiaan van Stijn
787fe507bf Merge pull request from qunhu/master
fix docs
2016-02-19 15:55:33 +01:00
Sebastiaan van Stijn
33997ba69c Merge pull request from wenchma/typo-error
Fix typo error of dockernetworks.md
2016-02-19 15:24:59 +01:00