Commit Graph

23038 Commits

Author SHA1 Message Date
ba90d2ea16 Merge pull request #21316 from estesp/daemon-dump-stack-note
Add documentation on the stack trace dump capability of the daemon
Upstream-commit: d2a8621b2002611a2c451540f69d0573ff5a055a
Component: engine
2016-03-18 14:29:55 +01:00
043ba80ee7 Add documentation on the dump-stack-traces capability of the daemon
Add a paragraph about how to force a stack trace dump to the daemon log.
This feature was added in Docker 1.9 I believe, but documentation was
never added.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ae466aafcbd3e000ff9ec2e8bd354fc3cc3729e5
Component: engine
2016-03-18 09:25:18 -04:00
f457bb9949 Merge pull request #21302 from allencloud/fix-typos-in-several-files
fix typos in several files
Upstream-commit: 9f00b4b79c2625a689233fa993dbab2e47778ffd
Component: engine
2016-03-18 14:06:59 +01:00
e07b2d424c Merge pull request #21321 from dsheets/patch-1
project/ISSUE-TRIAGE.md: fix shinny -> shiny typo
Upstream-commit: aa6d0f5310230166f31163d2704d890abf98b66f
Component: engine
2016-03-18 12:44:42 +01:00
d21fd46755 ISSUE-TRIAGE: fix shinny -> shiny typo
Signed-off-by: David Sheets <david.sheets@docker.com>
Upstream-commit: bd061b8df64b3015dc69b86a5c1de10ff37265cc
Component: engine
2016-03-18 09:42:49 +00:00
e433e1646d Merge pull request #21318 from wenchma/fix-doc
Update the document error
Upstream-commit: 3d13fddd2bc4d679f0eaa68b0be877e5a816ad53
Component: engine
2016-03-18 09:18:03 +01:00
8298077028 Update the document error
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: edf0da968ca8d653a6e4c9333e55530305cb3625
Component: engine
2016-03-18 15:23:27 +08:00
91649a03e2 fix typos in several files
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f1d34ac2eb3611cde8c4a438f367595eb08a6fe8
Component: engine
2016-03-18 12:51:57 +08:00
1d93a2025e Merge pull request #21305 from yongtang/031716-typo
Fix several typos in the documentation.
Upstream-commit: 46dde68158c851da0bdd8dc22342d35609a19a61
Component: engine
2016-03-18 01:44:01 +01:00
35483a9c93 Merge pull request #21307 from Microsoft/jstarks/fix_long_paths
Windows: revendor Microsoft/hcsshim to v0.1.0
Upstream-commit: 6dd69afd37fc0d2131387e78f8efd741c713d505
Component: engine
2016-03-17 19:35:03 -04:00
10d4438fda Windows: revendor Microsoft/hcsshim to v0.1.0
This (the first tagged hcsshim release) fixes long-path bugs on
Windows TP5 that affect commit and save. These bugs were blocking
commit of Windows containers that had node.js installed.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: b54058bafe07718a02e81a19b2dfc779dcdf11ba
Component: engine
2016-03-17 21:08:07 +00:00
4d8c3b87c5 Merge pull request #21266 from estesp/dockremap-system-user
Change subordinate range-owning user to be a system user
Upstream-commit: 41c1c6501e53698961cfdcab47eb5ab37ede667b
Component: engine
2016-03-17 11:42:15 -07:00
df52f37984 Fix several typos in the documentation.
This pull request fixes several typos in the documentation.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3c6aa163a3fd04c344a2072ab379f0778734b269
Component: engine
2016-03-17 18:29:35 +00:00
c5ce79819f Merge pull request #21296 from icecrime/add_programmerq
Add @programmerq to docker/docker curators
Upstream-commit: 0910946dc446ffa1f6264ca70f7382f16f798ce5
Component: engine
2016-03-17 11:18:08 -07:00
1071163f90 Merge pull request #21003 from riyazdf/hardware-signing-ga
Move hardware signing out of experimental
Upstream-commit: e6d3a9849c96201681915944947a0e5452619929
Component: engine
2016-03-17 14:16:40 -04:00
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
c69bc9037c Add @programmerq to docker/docker curators
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 441907e2cd9a3f975182e07c595950ed10fd1eb8
Component: engine
2016-03-17 09:08:19 -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
33e752c497 Merge pull request #21275 from tonistiigi/fix-vendor-vagrantfile
Remove vagrantfiles from vendor
Upstream-commit: 9c20d920a6c0a6a3196a782ef31c6ab60b180410
Component: engine
2016-03-16 20:55:28 -07: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
218e901de7 Change subordinate range-owning user to be a system user
Change user/group creation to use flags to adduser/useradd to enforce it
being a system user. Use system user defaults that auto-create a
matching group. These changes allow us to remove all group creation
code, and in doing so we also removed the code that finds available uid,
gid integers and use post-creation query to gather the system-generated
uid and gid.

The only added complexity is that today distros don't auto-create
subordinate ID ranges for a new ID if it is a system ID, so we now need
to handle finding a free range and then calling the `usermod` tool to
add the ranges for that ID. Note that this requires the distro supports
the `-v` and `-w` flags on `usermod` for subordinate ID range additions.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: c18e7f3a0419e35aeab4eefa51f3c17fbd72381f
Component: engine
2016-03-16 18:44:10 -04: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