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
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
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
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
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
8de4ae7396
Fix flakey TestAuthZPluginAllowEventStream
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4cf9b725f2117581ac4ba3e6f1db23da090e1732
Component: engine
2016-02-18 10:19:19 -05:00
22c38da429
Merge pull request #20415 from thaJeztah/improve-seccomp-warning
...
Be more explicit on seccomp availability
Upstream-commit: 1f97f2232db75a9e1e2afd63894c98266a87b7d7
Component: engine
2016-02-18 15:18:36 +01:00
4c5186de7e
update the file of dockerizing a Node.js app.
...
Signed-off-by: Zhenan Ye <21551168@zju.edu.cn >
Upstream-commit: 883b0567f2c96cb5cbcc31e5b02938bcc6d5877f
Component: engine
2016-02-18 06:12:11 -08:00
b800719b7b
Be more explicit on seccomp availability
...
Seccomp is only *compiled* in binaries built for
distros that ship with seccomp 2.2.1 or higher,
and in the static binaries.
The static binaries are not really useful for
RHEL and CentOS, because devicemapper does
not work properly with the static binaries,
so static binaries is only an option for Ubuntu
and Debian.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 13839a6d328692c672394811ee3afd9a168fc328
Component: engine
2016-02-18 14:57:47 +01:00
2884a8cafd
Merge pull request #20425 from HackToday/fixindex
...
Fix wrong index marking
Upstream-commit: a9c73b1a7ebe4ccd6893f37d2515be94000d081a
Component: engine
2016-02-18 14:49:15 +01:00
d29ee326fa
Update to Golang 1.6 in Power8 Dockerfile
...
Signed-off-by: Christophe Mehay <cmehay@online.net >
Upstream-commit: 7f0ca59ec2696c960b7c7d2fa9e24f7ded694881
Component: engine
2016-02-18 14:42:19 +01:00
bc74abda34
runconfig: opts: parse: lowercase errors
...
also fix wrong function comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: d266142230bd041c8299eef329cf79a17f8f7478
Component: engine
2016-02-18 11:21:44 +01:00
f1882e8081
Remove channel close.
...
Send a message instead, discarding duplicated messages.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 010951083060e1267e4dd726f5322d7309a8fd62
Component: engine
2016-02-17 22:52:06 -05:00
59522de764
Fix wrong index marking
...
The index was wrong set in docs, so let's fix it
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 0b4e0ce7cda357904342d41ea139519b8bbf755b
Component: engine
2016-02-18 03:08:21 +00:00
00d55504d4
Add sudo for related command
...
The du need sudo to perform to get correct results.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: f7fe2f0992126d45802a376b6da760d4e2b8607c
Component: engine
2016-02-18 02:58:26 +00:00
5ad396f39a
Vendoring libnetwork v0.7.0-dev.3
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 196b27211b77562cd6d5d620d4dd5bfe473383ed
Component: engine
2016-02-17 17:07:33 -08:00
28d01ce1bc
Merge pull request #20382 from HuKeping/fixbug
...
Bugfix: the actions when pull from notary should not contains `push`
Upstream-commit: 776c5ee299b614360cdbcc392a36dd8d15f385a0
Component: engine
2016-02-17 15:20:26 -08:00
1a7ab19790
Merge pull request #20411 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts
...
Improve resilience of TestPullFromCentralRegistryImplicitRefParts
Upstream-commit: e9234d8aaf9061beeb9e138efe3d39a86d0ddea7
Component: engine
2016-02-17 15:08:20 -08:00
9c9b13ac0c
Merge pull request #20372 from tonistiigi/fix-empty-diffid
...
Fix migration diffid atomic write
Upstream-commit: 61aa025faf4f606606430d5cc821325504683e9b
Component: engine
2016-02-17 15:03:42 -08:00
9c01cfa3e9
Merge pull request #20408 from cpuguy83/use_pool_for_pubsub_wg
...
Use pool for pubsub `Publish`'s waitgroups
Upstream-commit: 9a81f206b3f951e9e19e642b070fcab393fa3318
Component: engine
2016-02-17 14:46:13 -08:00
04850e0662
Merge pull request #20187 from cyphar/vendor-runc
...
[carry 19752] vendor: update runc/libcontainer to v0.0.8
Upstream-commit: 929f62e64d8760033ff6db4607c21a6431c46e4d
Component: engine
2016-02-17 13:59:00 -08:00
c68f4a42c4
Merge pull request #20260 from Microsoft/jjh/testunit-pkggitutils
...
Windows CI: Unit tests - port pkg\gitutils
Upstream-commit: 647d3266eab1bf184f6c880c972a75c1b80a32cc
Component: engine
2016-02-17 13:50:17 -08:00
0376c9075e
Merge pull request #20407 from tiborvass/backmerge-1.10.1
...
Backmerge 1.10.1 fixes to master
Upstream-commit: b26c21f7040c89b055d4fe135e45b3ab0b881ddb
Component: engine
2016-02-17 13:45:43 -08:00
e1d1f67bc5
Improve resilience of TestPullFromCentralRegistryImplicitRefParts
...
Sometimes transient network issues will cause
TestPullFromCentralRegistryImplicitRefParts to end up pulling with the
v1 protocol. This violates the assumptions behind the test. To make the
test more robust, allow a few retries if any pull ends up using the v1
protocol.
Fixes #17214
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 884201115315abb0c7815e44e6728e590476aeb8
Component: engine
2016-02-17 13:08:51 -08:00
9dfc13ec47
Merge pull request #20375 from tiborvass/fix-yum-index-output
...
Fix index generator for apt/yum packages
Upstream-commit: 6b70964fea1e2b7182ed8aef2577a8a74d8accd3
Component: engine
2016-02-17 21:36:02 +01:00
7aa41cb67d
Use pool for pubsub Publish's waitgroups
...
benchmark old ns/op new ns/op delta
BenchmarkPubSub-8 1036494796 1032443513 -0.39%
benchmark old allocs new allocs delta
BenchmarkPubSub-8 2467 1441 -41.59%
benchmark old bytes new bytes delta
BenchmarkPubSub-8 212216 187792 -11.51%
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 58d98f82888345a49f2e7660a0a5b35a5da891f5
Component: engine
2016-02-17 14:36:57 -05:00
9893f97f62
Merge pull request #20406 from aaronlehmann/integration-test-format-string
...
Fix format string in TestExecApiCreateContainerPaused
Upstream-commit: 0cc9720c2a5ad97d5261d3754d4f6788d7276c33
Component: engine
2016-02-17 11:28:42 -08:00
ea1de57ceb
Don’t stop daemon on migration hard failure
...
Also changes missing storage layer for container
RWLayer to a soft failure.
Fixes #20147
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
(cherry picked from commit 2798d7a6a681aee8995e87c9b68128e54876d2b5)
Upstream-commit: 55080fc03bed4dba85d5c5760363b92851ff728f
Component: engine
2016-02-17 14:26:30 -05:00
