076b3558fc
Merge pull request #20509 from estesp/cleanup-authz-test
...
Clean up authz integration-cli test
2016-02-20 12:10:29 +01:00
dc0a69cbcd
Merge pull request #20535 from hsinko/dev
...
A wrong word
2016-02-20 11:57:29 +01:00
fe275414fe
Merge pull request #19116 from WeiZhang555/19025-update-restart
...
Update RestartPolicy of container
2016-02-20 11:39:31 +01:00
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
0b64280195
Update configure-dns.md
...
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
2016-02-20 11:51:59 +08:00
6668326aa8
Merge pull request #20471 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
549fa67dae
Update dockernetworks.md
...
Fix truncated sentence
Signed-off-by: Alan Thompson <cloojure@gmail.com>
2016-02-19 16:57:13 -08:00
3d65e7126c
Merge pull request #20446 from estesp/fix-userns-cp
...
Fix copy chown settings to not default to real root
2016-02-19 19:45:44 -05:00
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
64785ff146
Merge pull request #20521 from estesp/vendor-engine-api-fix
...
Update engine-api vendoring to latest commit
2016-02-19 15:41:17 -08:00
b9195cd6d4
Merge pull request #20464 from cpuguy83/fix_events_flakiness
...
Fix events test flakiness.
2016-02-19 15:39:27 -08:00
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
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
b25b9b5709
Update Packagers readme with seccomp info
...
Signed-off-by: Levi Blackstone <levi.blackstone@rackspace.com>
2016-02-19 15:36:34 -06:00
e51457eea8
Merge pull request #20513 from tonistiigi/retake-ref
...
Fix releasing reference on deletion error
2016-02-19 13:25:26 -08:00
a657cfd68b
Merge pull request #20417 from redbaron/fix-deferred-removal-detection
...
Fix libdevmapper deferred removal detection
2016-02-19 13:58:18 -07:00
3b62a610ec
Merge pull request #20288 from tiborvass/debian-jessie
...
Switch Dockerfile to debian:jessie ... AGAIN
2016-02-19 13:51:30 -07:00
0e72550c5b
Merge pull request #20383 from HackToday/addsort
...
Make network ls output order
2016-02-19 15:42:48 -05:00
48701888c2
Merge pull request #20389 from HackToday/addvolumesupport
...
Make volume ls output order
2016-02-19 15:41:34 -05:00
9d70aef2c7
Merge pull request #20511 from icecrime/skip_flaky_test
...
Temporarily skip TestAuthZPluginAllowEventStream
2016-02-19 10:57:30 -08:00
64530c8e47
Fix releasing reference on deletion error
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-19 10:42:29 -08:00
6e0f873f05
Temporarily skip TestAuthZPluginAllowEventStream
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-19 10:32:05 -08:00
aa1fdf42da
Merge pull request #20253 from aaronlehmann/smarter-tls-fallback
...
Smarter push/pull fallback from TLS to plaintext
2016-02-19 13:16:53 -05:00
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
06af9471f8
Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs
...
Fix some flaws in docs
2016-02-19 17:07:50 +01:00
d6576ad9f0
Merge pull request #20504 from fuzzbomb/20503-document-names-format-placeholder-docker-ps-man-page
...
Document .Names format placeholder in docker-ps man page, fixes #20503 .
2016-02-19 16:34:23 +01:00
22d22eb9e1
Document .Names format placeholder in docker-ps man page, fixes #20503 .
...
Signed-off-by: Andrew Macpherson <hopscotch23@gmail.com>
2016-02-19 15:13:34 +00:00
787fe507bf
Merge pull request #20479 from qunhu/master
...
fix docs
2016-02-19 15:55:33 +01:00
33997ba69c
Merge pull request #20487 from wenchma/typo-error
...
Fix typo error of dockernetworks.md
2016-02-19 15:24:59 +01:00
f03050cc4c
Fix typo error of dockernetworks.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-19 17:18:52 +08:00
b96bbf26db
fix docs
...
Signed-off-by: huqun <huqun@zju.edu.cn>
2016-02-19 13:51:14 +08:00
117a982d2e
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
2016-02-18 17:39:46 -08:00
cdc7f26715
Fix some flaws in docs
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2016-02-19 09:27:03 +08:00
c96564a76c
Merge pull request #20433 from runcom/fixies
...
runconfig: opts: parse: lowercase errors
2016-02-18 17:08:01 -08:00
7068722678
Merge pull request #20458 from aaronlehmann/migration-close-gzip-writer
...
Close tarsplit gzip writer when creating tar-split.json.gz files during layer migration
2016-02-18 16:48:50 -08:00
6a8342d63d
Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts
...
Check in latest Win2Lin Jenkins scripts
2016-02-18 15:58:24 -08:00
40be5dba47
Fix copy chown settings to not default to real root
...
This corrects `docker cp` behavior when user namespaces are enabled.
Instead of chown'ing copied-in files to real root (0,0), the code
queries for the remapped root uid & gid and sets the chown option
properly.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-18 14:44:13 -08:00
319bbff799
Merge pull request #20381 from cpuguy83/20378_fix_multiple_deref
...
Fix issue with multiple volume refs with same name
2016-02-18 13:51:10 -08:00
22ff08e5b2
Merge pull request #20452 from icecrime/roadmap_update
...
Update ROADMAP.md
2016-02-18 13:50:27 -08:00
b52cd79cf4
Merge pull request #20459 from ozlerhakan/master
...
add a new sub-section to each volume page
2016-02-18 22:40:52 +01:00
abbf2aa6dd
Fix events test flakiness.
...
Since channel is getting a send instead of a close now, this can cause
random issues ranging through the list of channels if the channel is
unbuffered since the send may be blocked.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-18 16:10:29 -05:00
c9bec2be2a
Config-reload IT
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-18 12:22:56 -08:00
e5293f97f2
IT case for sending invalid query to embedded DNS server
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-02-18 12:14:19 -08:00
ed364b69df
Invoke ReloadConfiguration on network controller
...
- It reverts fa163f5619
2016-02-18 12:14:14 -08:00
d86f0d9b6d
Check in latest Win2Lin Jenkins scripts
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-18 11:59:08 -08:00
910ea8adf6
add a section to each volume page
...
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com>
2016-02-18 21:52:15 +02:00
038c3b8287
Merge pull request #20426 from calavera/remove_channel_close
...
Remove channel close.
2016-02-18 11:13:30 -08:00
1c05c65f6f
Close tarsplit gzip writer when creating tar-split.json.gz files during layer migration
...
There is a missing call to Close on the gzip.Writer that is used to
compress newly created tar-split files during layer migration. This can
result in corrupt tar-split files that later cause docker push and
docker save to fail. The Close call is necessary to flush buffered data
to the stream.
Fixes : #20104
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-18 10:55:38 -08:00
2e6c841b82
Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
...
Expose bridge IPv6 setting to `docker network inspect`
2016-02-18 10:35:04 -08:00
84d2d6acdd
Merge pull request #20438 from YeZhenan/nodejs_web_app-update
...
update the dockfile of dockerizing a Node.js app.
2016-02-18 19:17:59 +01:00
Antonio Murdaca
Sebastiaan van Stijn
Vincent Demeester
Zhang Wei
hsinko
Tibor Vass
Alan Thompson
Phil Estes
David Calavera
Arnaud Porterie
Levi Blackstone
Jess Frazelle
Brian Goff
Tonis Tiigi
Andrew Macpherson
Wen Cheng Ma
huqun
Jian Zhang
Madhu Venugopal
Santhosh Manohar
Alessandro Boch
John Howard
ozlerhakan
Aaron Lehmann