Commit Graph

21549 Commits

Author SHA1 Message Date
e59587c05c Merge pull request #21292 from runcom/pkg-error-truncindex
pkg: truncindex: provide more info in error
Upstream-commit: d3afe34b51e7588984cc21a2f48da116645e52e3
Component: engine
2016-03-17 10:45:56 -07:00
7ddf20ec7a Merge pull request #21295 from rhvgoyal/fix-variable-assignment
Fix the assignment to wrong variable
Upstream-commit: 3df99b7fd2262e4f6ff486408a785de1947257fa
Component: engine
2016-03-17 10:39:15 -07:00
a0ed1e9e01 Merge pull request #21293 from cpuguy83/wtf_gcp
Do not call out to Google on init
Upstream-commit: 2b9ceea896ae0b0d1cf8c1a02b32a88861601b7e
Component: engine
2016-03-17 10:32:21 -07:00
0a38211674 Merge pull request #21286 from rhatdan/seccomp-man
Fix documentation on --security-opt seccomp
Upstream-commit: b4da1578463f65b4703021b72ad17753fb29cdb4
Component: engine
2016-03-17 10:29:33 -07:00
3c63753492 Merge pull request #21276 from nerdalert/mcvlan-v6-ci
Remove v6 IT test for experimental macvlan driver
Upstream-commit: 9d62c11ab5e7982836eb94d31f2fd7703fb46c13
Component: engine
2016-03-17 09:50:02 -07:00
d72402c2b3 Merge pull request #21273 from jfrazelle/remove-dead-code
remove dead code
Upstream-commit: 04c7d94c710bdb6c8378bdf896fd67455ba23199
Component: engine
2016-03-17 09:16:02 -07:00
f070230f44 Merge pull request #21294 from samoht/fix-typo
Fix typo in the triaging guidelines
Upstream-commit: 8d742bbe2f240f48f3452780d5ed432e1a4a9624
Component: engine
2016-03-17 16:46:19 +01:00
d4aa4c77d4 Merge pull request #21279 from WeiZhang555/typo
Fix typo
Upstream-commit: 553ffa7fd77d3dd18a77e601dccf0892996474c5
Component: engine
2016-03-17 08:20:26 -07:00
f588ea4d9d Fix the assignment to wrong variable
We should be assigning value to minFreeMetadata instead of minFreeData. This
is copy/paste error.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 4141a00921e3ae814736249ec1806d5d35c8d46c
Component: engine
2016-03-17 15:19:08 +00:00
af0bb40dbb Fix a typo in the triaging guidelines
Spotted by @dgageot

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
Upstream-commit: 2d2d1bb2c6485a1f41ecbc3ab0d93cfd83f63150
Component: engine
2016-03-17 15:09:13 +00:00
fdcbe43844 Remove trailing whitespaces
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
Upstream-commit: f906ca52eacf93bc98b97b0d9b7af1a606029661
Component: engine
2016-03-17 15:07:23 +00:00
0fc82d9270 Do not call out to Google on init
The GCP logging driver is calling out to GCP cloud service on package
init.
This is regardless if you are using GCP logging or not.

This change makes this happen on the first invocation of a new GCP
logging driver instance instead.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 24710fd3e228398dc02c72ab3f0efe70d70c313e
Component: engine
2016-03-17 11:06:21 -04:00
24be9013fa pkg: truncindex: provide more info in error
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: ae1002219bc5d602c552ba952bc45e440cf3aae7
Component: engine
2016-03-17 15:53:12 +01:00
f2e4125123 Remove v6 IT test for experimental macvlan driver
-Temporary until we find the source of CI/v6 issue with driver

Signed-off-by: Brent Salisbury <brent@docker.com>
Upstream-commit: 6d43dc99e5e67210ca502ec2eca12ae1ee9c2600
Component: engine
2016-03-17 08:57:52 -04:00
a9a03567a8 Merge pull request #21257 from yongtang/21247-TestRunAttachFailedNoLeak
Fix flaky test TestRunAttachFailedNoLeak in #21247.
Upstream-commit: cf9d0c8ae2dd12c10e4234f4857fdf559505ae41
Component: engine
2016-03-17 13:47:40 +01:00
52e22ba517 Fix documentation on --security-opt seccomp
Missing documentation and man pages on seccomp options.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 450fa7536edc03fb5b071c0d04af534b2f8572ff
Component: engine
2016-03-17 08:04:02 -04:00
89a6d49dd4 Merge pull request #21262 from justincormack/newsyscalls
Add new syscalls in libseccomp 2.3.0 to seccomp default profile
Upstream-commit: 8bbe3de4b3cd951719120e47b4f97653c11566f7
Component: engine
2016-03-17 09:37:36 +01:00
2250308978 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ca64269165fb30765d7ea0b0b231674df8da157b
Component: engine
2016-03-17 16:13:51 +08:00
94bf0c258a Remove vagrant files from vendor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 46da04388f144579a638aeb09ec5c10c800120d0
Component: engine
2016-03-16 20:30:47 -07:00
04c0a38220 Fix flaky test TestRunAttachFailedNoLeak in #21247.
The issue of the flaky test is because when the second container
starts, the first container in the detached mode may have only
been created and not yet entering the running state. So the
port 8000 might be used by the second container first.

This fix added a check to make sure the first container is already
in running state, before the second container is invoked.

This fix fixes #21247.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1a9f5f4c69451c580595d67844f41937b3293069
Component: engine
2016-03-17 03:14:59 +00:00
3836e556a4 Merge pull request #21258 from runcom/res.body.leaks
*: fix response body leaks
Upstream-commit: b1e9a5eaf1c8826b13fa502e5bce00a453ab4091
Component: engine
2016-03-16 19:20:10 -07:00
8366a6bcc0 remove dead code
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8dd88afb5b5f8ce353c00bfc71edf8238f3a0452
Component: engine
2016-03-16 19:15:14 -07:00
920cce78bf Merge pull request #21261 from aboch/vnd
Vendoring libnetwork v0.7.0-dev.8
Upstream-commit: 4227119588297a0ac36a4f5fe4ac9457e04b6918
Component: engine
2016-03-16 18:56:49 -07:00
352972d26e Merge pull request #20962 from lyndaoleary/docs-engine-edits
Edited content in the Hello World section
Upstream-commit: f3acca2fc8c84afd41b05c8bc9b3dba00036e6ac
Component: engine
2016-03-16 23:48:59 +00:00
d8866a7bcc Add new syscalls in libseccomp 2.3.0 to seccomp default profile
This adds the following new syscalls that are supported in libseccomp 2.3.0,
including calls added up to kernel 4.5-rc4:
mlock2 - same as mlock but with a flag
copy_file_range - copy file contents, like splice but with reflink support.

The following are not added, and mentioned in docs:
userfaultfd - userspace page fault handling, mainly designed for process migration

The following are not added, only apply to less common architectures:
switch_endian
membarrier
breakpoint
set_tls
I plan to review the other architectures, some of which can now have seccomp
enabled in the build as they are now supported.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 96896f2d0bc16269778dd4f60a4920b49953ffed
Component: engine
2016-03-16 21:17:32 +00:00
59253b391c Merge pull request #21219 from vdemeester/update-engine-api
Update engine api to use net/context.Context all accross the client API
Upstream-commit: 581fc536a678c52132b0a6d5ba067ff00051bd66
Component: engine
2016-03-16 14:10:59 -07:00
d0536df380 Vendoring libnetwork v0.7.0-dev.8
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 62232919650438a6ae2b18714b4fe223d34277f5
Component: engine
2016-03-16 13:45:34 -07:00
3b37cd85fb Merge pull request #21212 from runcom/wip-token-service-tests
distribution: errors: do not access the errors slice if it's empty
Upstream-commit: f2b1b44de81ec9c7fd404fb3e0b4eefd83939a94
Component: engine
2016-03-16 13:44:18 -07:00
44ad0dbdfd Update api/client file to use context
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8567286ed65c8aca180b4590acf7d9ef61e15955
Component: engine
2016-03-16 20:25:09 +01:00
c7abc234c4 Vendor engine-api to fba5dc8
It plumbs net/context.Context through entire API, see docker/engine-api#140

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 48339017dbb7a09827445d8c1a9db9ae6ecb8a4a
Component: engine
2016-03-16 20:25:09 +01:00
4686c0e8ba Clean Vagrantfile from vendoring
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 02476b23a796bfc2c51413a62cfc6329d5fa88cb
Component: engine
2016-03-16 20:25:04 +01:00
be817e6143 Merge pull request #21112 from allencloud/validate-configs-from-file
add validating configs from configuration file
Upstream-commit: f81754811fda48524133cc57ba8dac7aaf31274c
Component: engine
2016-03-16 10:42:25 -07:00
195d725261 *: fix response body leaks
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: f0d83c4cdb49adb53fdaf4216a4395c23d5cc8e9
Component: engine
2016-03-16 17:15:42 +01:00
975b6f56a8 Merge pull request #21242 from cyphar/fix-userns-permissions
daemon: use 0711 for /var/lib/docker
Upstream-commit: 45b2a57d1c36d6f0140c0dea8769d58d04a9fc67
Component: engine
2016-03-16 08:49:17 -07:00
33247bc8f9 Merge pull request #21217 from LK4D4/cleanup_gitignore
gitignore: cleanup some not needed entries
Upstream-commit: eff27d2b77a2cd42122b53db9a6906f419cfc7ed
Component: engine
2016-03-16 08:24:31 -07:00
7167a81e8a Merge pull request #21235 from Microsoft/jstarks/add_npipe_close_write
Windows: fix various npipe bugs
Upstream-commit: 3221c7a3c6367c3223c0e1b82b3de7adbbca8651
Component: engine
2016-03-16 08:23:39 -07:00
c8e18de26f bash completion for gelf-compression log driver settings
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 854ceaaa9ee5aa4c9f0b824ed3a0536decf29ef1
Component: engine
2016-03-16 15:58:58 +01:00
7a50c5f3c8 Merge pull request #21250 from runcom/comment-fix
registry: endpoint_v1: fix outdated comment
Upstream-commit: 5f8a0ceeda003df141ab462a8ad20dad4f5b5fe4
Component: engine
2016-03-16 14:35:14 +01:00
a5bcba2abf Merge pull request #21203 from HackToday/fixfilter
Add check about filter name for containers
Upstream-commit: bd97e4f95a72b26b59bf42c74f6b221bebbd685c
Component: engine
2016-03-16 14:30:04 +01:00
4073a69824 registry: endpoint_v1: fix outdated comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 137c8601a8c744d464855755ce756f07e83aa0b7
Component: engine
2016-03-16 12:53:11 +01:00
8930418a24 daemon: use 0711 for /var/lib/docker
This fixes problems encountered when running with a remapped root (the
syscalls related to the metadata directory will fail under user
namespaces). Using 0711 rather than 0701 (which solved the problem
previously) fixes the issue.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: e91ca0e239f1e6c71a5a6c789ec8177806773355
Component: engine
2016-03-16 19:24:03 +11:00
f9e5200e21 distribution: errors: do not access the errors slice if it's empty
- cherry-pick from 1.10.3 branch: 0186f4d4223a094a050d06f456355da3ae431468
- add token service test suite
- add integration test (missing in 1.10.3 branch)

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1b5c2e1d722757a55364fb45cf3fcec7f2c75fb4
Component: engine
2016-03-16 09:00:39 +01:00
9042585b0d Merge pull request #21222 from aaronlehmann/pull-with-no-layers
Fix pulling images that contain no layers at all
Upstream-commit: 2b1b235acf9aa029218e1bd5cd97a369c500e4f5
Component: engine
2016-03-15 23:03:42 -07:00
23972297db Merge pull request #21233 from aaronlehmann/testtransfer-flakiness
Fix flaky test TestTransfer
Upstream-commit: aa76ddd35307a007b14e955f7d7d787cb13bc0ea
Component: engine
2016-03-15 20:59:56 -07:00
75cce52537 Add check about filter name for containers
Fixes: #21202
We add valid check about filters like network, images,
volumes did.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 8a90e8a19b8108ecdff325fc19dbdf945aa15fad
Component: engine
2016-03-16 03:53:40 +00:00
79f5e01124 Windows: add support for CloseWrite() to npipe transport
This relies on changes to go-winio to support CloseWrite() when the pipe
is in message mode. This fixes an issue where stdin is not properly closed
when there is no more input to docker run.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 59573fb3c6e8e55278c973b9c799db6ed9c0f9c7
Component: engine
2016-03-15 18:25:35 -07:00
be26fc7c6f Windows: revendor go-winio with npipe fixes
This revendor provides support for CloseWrite() in the npipe transport,
fixes a performance regression introduced in Go 1.6, and improves
npipe performance by allowing the pipe buffer size to be specified.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 87c2aad6f11c4993222dd29fb8c7c520b19ac8d9
Component: engine
2016-03-15 18:25:34 -07:00
9be1d1ff78 Merge pull request #21108 from tianon/detect-daemon-osarch
Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"
Upstream-commit: 133b3cccb50dadf2b8b10519e3c8d8b924a91b76
Component: engine
2016-03-15 17:00:55 -07:00
333d5496a5 Merge pull request #20947 from thaJeztah/fix-pull-examples
Fix Docker pull examples
Upstream-commit: 354f9a8fd11f36c2c9a779a366e7779678e25a2f
Component: engine
2016-03-16 00:42:38 +01:00
bc34a5536f Merge pull request #21221 from tiborvass/changelog-1.10.3
Changelog from 1.10.3 to master
Upstream-commit: 08603dad63c068759eb7cd6a01e5331d1212ef9d
Component: engine
2016-03-15 16:37:47 -07:00