Commit Graph

20902 Commits

Author SHA1 Message Date
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
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
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
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
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
30e0c42e90 Verify layer tarstream
This adds verification for getting layer data out
of layerstore. These failures should only be possible
if layer metadata files have been manually changed
of if something is wrong with tar-split algorithm.

Failing early makes sure we don’t upload invalid data
to the registries where it would fail after someone
tries to pull it.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit e29e580f7fe628e936925681a4885d0b655bb151)
Upstream-commit: 50a498ea1c49cc3caa81bb9fb1417de387117e89
Component: engine
2016-02-17 14:26:16 -05:00
d384741ec6 Merge pull request #20403 from runcom/use-test-req
integration-cli: use Devicemapper test requirement instead of checkin…
Upstream-commit: 11257dc729546a61618c03009d510d8940afd897
Component: engine
2016-02-17 11:17:26 -08:00
dfa517e368 Fix format string in TestExecApiCreateContainerPaused
It was s% instead of %s.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2210b15e08b8a81bb7c22b34036a5d0336fa04ef
Component: engine
2016-02-17 11:05:51 -08:00
be619004aa integration-cli: use Devicemapper test requirement instead of checking strings
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 337ee2aa63d54392321e2603c0f4e4f2f711dbc5
Component: engine
2016-02-17 18:18:18 +01:00
3288368680 vendor: update runc/libcontainer
This includes all of v0.0.8 as well as a few bug fixes that popped up
during vendoring.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 093dd39686d5e7c562dfdf337bc7545f51d5abf4
Component: engine
2016-02-18 01:42:36 +11:00
eaaadc99cd vendor: remove fsnotify
It is not longer used by us, so hack/vendor.sh complains because it
removes unused files (but also complains about removing an entire
vendored project).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: bc195e1558d3091dccb209f1bb35115248886c7a
Component: engine
2016-02-18 00:12:53 +11:00
54e25a7e3f pkg: remove unused filenotify
pkg/filenotify isn't used anymore and it causes problems with
hack/vendor.sh (nothing uses it, so hack/vendor.sh will remove the
vendored code).

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: ee99b5f2e96aafa982487aadbb78478898ae0c71
Component: engine
2016-02-18 00:11:43 +11:00
1d8e52b52f Merge pull request #20385 from WeiZhang555/fix-docs
Fix docs
Upstream-commit: 2a9e6ace706999be3c0d36f1f94ce20cc3ad33b5
Component: engine
2016-02-17 08:55:02 +01:00
83d138a180 Merge pull request #20366 from LK4D4/socks_proxy
Add support for forwarding Docker client through SOCKS proxy
Upstream-commit: 5c78515430860ad822e016cc5cd5d5ff3dd6a21c
Component: engine
2016-02-16 22:29:49 -08:00
34db004d4d Fix docs
Fix wrong descriptions in docs

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 899335022f08710996b43077c736421e06c583e9
Component: engine
2016-02-17 11:55:56 +08:00
9111f0c18a Fix index generator for apt/yum packages
Some @_@ characters could become visible if filename is longer than 44
characters.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7acd3987d3d55e950ada47b41bb89ccb12b539cb
Component: engine
2016-02-16 21:54:07 -05:00
c165bf9e34 Bugfix: the actions when pull from notary should not contains push
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 6b8a2a0fe47b218aaba3050c1f376941e4773313
Component: engine
2016-02-17 10:36:09 +08:00
8107240b18 Require linux for TestExecAfterContainerRestart
All the other exec tests require linux except this one and it is
causing failures in the TP4 test runs.

ref:
https://jenkins.dockerproject.org/job/Docker-PRs-WoW-TP4/1076/console

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 46e41dc2f86e27ef502c2b1a679ab95d0426c8c3
Component: engine
2016-02-16 17:50:50 -08:00
e9b00fc7ff Merge pull request #20374 from icecrime/20357_test_logs_since_future_follow
Fix flaky TestLogsSinceFutureFollow
Upstream-commit: eae59c4226bb94027ed0e51c1899479c44a4cc97
Component: engine
2016-02-16 15:23:19 -08:00
5aea778205 Merge pull request #19689 from cednation/etwlogs
Windows: Add ETW logging driver plug-in
Upstream-commit: c795d0bab9057fbf16ca70349bcc37e244be33b9
Component: engine
2016-02-16 15:01:17 -08:00
61b6c6f1c0 Merge pull request #20373 from bastiaanb/fix/docs-trailing-slash-in-dockerfile-copy-example
add missing trailing slash in ADD and COPY /absoluteDir examples.
Upstream-commit: c66d9f56279237bc0ff9d8fb84896de4193247f8
Component: engine
2016-02-16 23:10:47 +01:00
90b76dddc5 Merge pull request #20367 from tonistiigi/fix-import-gzip
Fix docker import on compressed data
Upstream-commit: 0f5624d37433cd93eb6a19f8d8e513ad399d6d47
Component: engine
2016-02-16 14:09:46 -08:00
f663556077 Merge pull request #19498 from mountkin/refactor-jsonfilelog-reader
use pubsub instead of filenotify to follow json logs
Upstream-commit: 8545fdc6ddd7010a4134062cf99444e586c3c99e
Component: engine
2016-02-16 13:55:48 -08:00