b76e5dced0
Update doc docker_remote_api_v1.20.md
...
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com >
Upstream-commit: 47e3ea7dd1a08abc86d1ef0e32b71248a0eac95e
Component: engine
2016-02-20 19:32:20 +08:00
7b8239e00e
Merge pull request #20471 from calavera/userland_proxy_config_fix
...
Avoid setting default truthy values from flags that are not set.
Upstream-commit: 6668326aa8cbb8af32bb49b4a843be2cae762cb3
Component: engine
2016-02-19 21:00:37 -05:00
2d2a092a9b
Merge pull request #20446 from estesp/fix-userns-cp
...
Fix copy chown settings to not default to real root
Upstream-commit: 3d65e7126c60ef23a7f0e255cd2e4b5938859413
Component: engine
2016-02-19 19:45:44 -05:00
b264f70571
Merge pull request #20521 from estesp/vendor-engine-api-fix
...
Update engine-api vendoring to latest commit
Upstream-commit: 64785ff146536cd9c86e8093fc951f22964f615e
Component: engine
2016-02-19 15:41:17 -08:00
f92b8a2bd5
Merge pull request #20464 from cpuguy83/fix_events_flakiness
...
Fix events test flakiness.
Upstream-commit: b9195cd6d416280a021eaa630bd333453f71e270
Component: engine
2016-02-19 15:39:27 -08:00
2625f17a24
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 >
Upstream-commit: 31cb96dcfaaebe3f807e7c7bf82a48b5995c743b
Component: engine
2016-02-19 18:39:10 -05:00
124bd17f17
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)
Upstream-commit: 1c2db56d2f69f74e2859da251b6b8565d72bcb02
Component: engine
2016-02-19 16:20:27 -06:00
7d686adce9
Merge pull request #20513 from tonistiigi/retake-ref
...
Fix releasing reference on deletion error
Upstream-commit: e51457eea87a52a24ad1cececbf1ca7191f2ca02
Component: engine
2016-02-19 13:25:26 -08:00
f4798a7a2e
Merge pull request #20417 from redbaron/fix-deferred-removal-detection
...
Fix libdevmapper deferred removal detection
Upstream-commit: a657cfd68bb869602ee0bf0578e13d737855f390
Component: engine
2016-02-19 13:58:18 -07:00
0373049b19
Merge pull request #20288 from tiborvass/debian-jessie
...
Switch Dockerfile to debian:jessie ... AGAIN
Upstream-commit: 3b62a610ec81996ec3b1aa5422c62fa926ef4f04
Component: engine
2016-02-19 13:51:30 -07:00
34184bd076
Merge pull request #20383 from HackToday/addsort
...
Make network ls output order
Upstream-commit: 0e72550c5b27704ac1ec043302fe2aaebe3b1956
Component: engine
2016-02-19 15:42:48 -05:00
033a056f03
Merge pull request #20389 from HackToday/addvolumesupport
...
Make volume ls output order
Upstream-commit: 48701888c216868379ee430e041f7a9568970117
Component: engine
2016-02-19 15:41:34 -05:00
f575b4c854
Merge pull request #20511 from icecrime/skip_flaky_test
...
Temporarily skip TestAuthZPluginAllowEventStream
Upstream-commit: 9d70aef2c7a1a83cd2d38abf2737cdda90dff42f
Component: engine
2016-02-19 10:57:30 -08:00
baea9d79b2
Fix releasing reference on deletion error
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 64530c8e47ec663827cceb28fc64b12da5e56147
Component: engine
2016-02-19 10:42:29 -08:00
58b5075165
Temporarily skip TestAuthZPluginAllowEventStream
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 6e0f873f053f5ae54901177cd5272f6fef7d49a0
Component: engine
2016-02-19 10:32:05 -08:00
468eaa4449
Merge pull request #20253 from aaronlehmann/smarter-tls-fallback
...
Smarter push/pull fallback from TLS to plaintext
Upstream-commit: aa1fdf42da8536d69c40322856aeaae197698fcd
Component: engine
2016-02-19 13:16:53 -05:00
48bb84c5fc
Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs
...
Fix some flaws in docs
Upstream-commit: 06af9471f869cd1f46da814e21c21bc815fd665e
Component: engine
2016-02-19 17:07:50 +01:00
2ac28d1841
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 .
Upstream-commit: d6576ad9f0e7b0ae9ed374ddd2f095a3121cf056
Component: engine
2016-02-19 16:34:23 +01:00
eecb66a20c
Document .Names format placeholder in docker-ps man page, fixes #20503 .
...
Signed-off-by: Andrew Macpherson <hopscotch23@gmail.com >
Upstream-commit: 22d22eb9e17c500fa19c4bd8d56f3faad1df4440
Component: engine
2016-02-19 15:13:34 +00:00
7c66a41aa5
Merge pull request #20479 from qunhu/master
...
fix docs
Upstream-commit: 787fe507bf4e119a00f35975d5d483355a1276f8
Component: engine
2016-02-19 15:55:33 +01:00
71db62a003
Merge pull request #20487 from wenchma/typo-error
...
Fix typo error of dockernetworks.md
Upstream-commit: 33997ba69ca3d3bce26ee6cfe34d591cc32e40ea
Component: engine
2016-02-19 15:24:59 +01:00
59be9aceed
Fix typo error of dockernetworks.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0
Component: engine
2016-02-19 17:18:52 +08:00
831079c48f
fix docs
...
Signed-off-by: huqun <huqun@zju.edu.cn >
Upstream-commit: b96bbf26dbce9ca60e54e4bb734b8574642e3026
Component: engine
2016-02-19 13:51:14 +08:00
d9c028ed66
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
Upstream-commit: 117a982d2e805d3279ff75fcec071635e5191ef6
Component: engine
2016-02-18 17:39:46 -08:00
6f4e1021b0
Fix some flaws in docs
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: cdc7f26715fbf0779a5283354048caf9faa1ec4a
Component: engine
2016-02-19 09:27:03 +08:00
b2de5808fb
Merge pull request #20433 from runcom/fixies
...
runconfig: opts: parse: lowercase errors
Upstream-commit: c96564a76c8d9d3ba2c4d316deae55ab3f5e0b3f
Component: engine
2016-02-18 17:08:01 -08:00
c9fee8a605
Merge pull request #20458 from aaronlehmann/migration-close-gzip-writer
...
Close tarsplit gzip writer when creating tar-split.json.gz files during layer migration
Upstream-commit: 70687226781545499c45414286a5b864bfc4eecd
Component: engine
2016-02-18 16:48:50 -08:00
97579187c2
Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts
...
Check in latest Win2Lin Jenkins scripts
Upstream-commit: 6a8342d63d3c649b280fdd9a2090067c2a9af14c
Component: engine
2016-02-18 15:58:24 -08:00
b3b5161196
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)
Upstream-commit: 40be5dba473aa57a388fe26bb79ac38a66653f31
Component: engine
2016-02-18 14:44:13 -08:00
6d35b4b034
Merge pull request #20381 from cpuguy83/20378_fix_multiple_deref
...
Fix issue with multiple volume refs with same name
Upstream-commit: 319bbff799d637ad76edfe348fedb4adc1a531f3
Component: engine
2016-02-18 13:51:10 -08:00
7ad3f289b8
Merge pull request #20452 from icecrime/roadmap_update
...
Update ROADMAP.md
Upstream-commit: 22ff08e5b2a200d896437b1a1faa6b90197ee157
Component: engine
2016-02-18 13:50:27 -08:00
deaa280da0
Merge pull request #20459 from ozlerhakan/master
...
add a new sub-section to each volume page
Upstream-commit: b52cd79cf4ae2896062fb0dfeb712696bec2fa33
Component: engine
2016-02-18 22:40:52 +01:00
b978414dca
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 >
Upstream-commit: abbf2aa6ddbf8159a5fceb4df25d7f85aeffe70e
Component: engine
2016-02-18 16:10:29 -05:00
10c9ca900c
Config-reload IT
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: c9bec2be2af62571e49b4992d5a2fd8806049a07
Component: engine
2016-02-18 12:22:56 -08:00
d9d773f20a
IT case for sending invalid query to embedded DNS server
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: e5293f97f240c194eba1a46e5883514c9ccb4586
Component: engine
2016-02-18 12:14:19 -08:00
fa1db664e1
Invoke ReloadConfiguration on network controller
...
- It reverts fa163f5619bb01cabca1c21 plus a small change
in order to allow passing the global scope datastore
to libnetwork after damon boot.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ed364b69df0432d0143e7661c4c0695377ceef7b
Component: engine
2016-02-18 12:14:14 -08:00
31f903989d
Check in latest Win2Lin Jenkins scripts
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d86f0d9b6d3b8d1077d6fb23b8f94e072ef1ba28
Component: engine
2016-02-18 11:59:08 -08:00
615c87e18e
add a section to each volume page
...
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com >
Upstream-commit: 910ea8adf6c2c94fdb3748893e5b1e51a6b8c431
Component: engine
2016-02-18 21:52:15 +02:00
64d8a74799
Merge pull request #20426 from calavera/remove_channel_close
...
Remove channel close.
Upstream-commit: 038c3b82870646cefd8f631c891cd99120cc4109
Component: engine
2016-02-18 11:13:30 -08:00
076a9b5f8a
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 >
Upstream-commit: 1c05c65f6fbb5ea35608da259dfe4a6d211dbf82
Component: engine
2016-02-18 10:55:38 -08:00
7d665cca4e
Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
...
Expose bridge IPv6 setting to `docker network inspect`
Upstream-commit: 2e6c841b826cc73332c44d5a04a5996fc65af724
Component: engine
2016-02-18 10:35:04 -08:00
164f49c5e5
Merge pull request #20438 from YeZhenan/nodejs_web_app-update
...
update the dockfile of dockerizing a Node.js app.
Upstream-commit: 84d2d6acddb853fa8e2071d5d43e5364200f9b32
Component: engine
2016-02-18 19:17:59 +01:00
b85a054d81
Merge pull request #20447 from cpuguy83/fix_netnone
...
Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
Upstream-commit: 2f283f3cd8204f8e1e1eb9d571e79a263f202e9d
Component: engine
2016-02-18 10:10:26 -08:00
829775e270
Update ROADMAP.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 3b65dda2edb6dc6c16dae4da3b866fd0251d0f36
Component: engine
2016-02-18 09:39:25 -08:00
4456b512b3
Merge pull request #20292 from Microsoft/jjh/testunit-pkgarchivestep2
...
Windows CI: test-unit on pkg\archive part 2
Upstream-commit: aae454cb520cb36e5b4b36f7d71a6297c6ffc3c2
Component: engine
2016-02-18 12:12:09 -05:00
4d9228f02f
Merge pull request #20442 from cpuguy83/fix_flakey_TestAuthZPluginAllowEventStream
...
Fix flakey TestAuthZPluginAllowEventStream
Upstream-commit: e7b25237514917d16b2422404777ec364200917a
Component: engine
2016-02-18 12:07:20 -05:00
58f7113a32
Merge pull request #20365 from calavera/remove_debug_from_server
...
Remove all docker debugging knowledge from the server.
Upstream-commit: 1fb144cb230fb5e26a19263bd0a159f3c9bd700b
Component: engine
2016-02-18 12:06:23 -05:00
93243f693c
Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
...
Broken by bcb9adf49e6726eccc1ee1ed41fbe21789c2367f
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8e0e9e0f24e5802709508b7c7fe61cb5171ec414
Component: engine
2016-02-18 11:34:34 -05:00
935a79e0b6
Merge pull request #20434 from cmehay/power8
...
Update to Golang 1.6 in Power8 Dockerfile
Upstream-commit: fb00fe5ea3e6d1a2aba2dc639aff30d4687f346c
Component: engine
2016-02-18 08:33:38 -08:00
684142a88d
Merge pull request #20333 from rhatdan/mqueue
...
/dev/mqueue should never be mounted readonly
Upstream-commit: be5939f40778d8056edff621153391e322f149d5
Component: engine
2016-02-18 11:02:17 -05:00
