Commit Graph

21584 Commits

Author SHA1 Message Date
efaac80fee Vendor containerd, specs, runc
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: cc83031ade5c4baed722c31603d56d54e4679681
Component: engine
2016-03-18 13:38:26 -07:00
5d6926e18b Vendor updated grpc, protobuf
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 14299daacaf4e80735615ff9f42ba2479cf04486
Component: engine
2016-03-18 13:38:21 -07:00
7c520b0e93 change email
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d3b650062faec3d1cc05eae8847d88d8227c1c4a
Component: engine
2016-03-18 13:17:28 -07:00
306477a8ef Merge pull request #21269 from mlaventure/inspect-bind-mounts
Update inspect/ps to properly handle bind mounts
Upstream-commit: 6c6363c726ccfec97d577eff1cc60314f15dc841
Component: engine
2016-03-18 20:52:02 +01:00
b021945636 Merge pull request #21299 from allencloud/handle-kernel-version-error-in-version-api
handle kernel version error in version api
Upstream-commit: ea0025a7e104dfcb53f331ece6b784d893011afd
Component: engine
2016-03-18 18:07:48 +01:00
d5c972ccf5 Merge pull request #21183 from thaJeztah/fix-flaky-TestUpdateRestartPolicy
Fix flaky TestUpdateRestartPolicy on Windows
Upstream-commit: a30332e705b3c75647859383e86d65a48fa5c412
Component: engine
2016-03-18 17:45:05 +01:00
709b902d70 Merge pull request #20200 from thockin/14282-hostname-domainname-v2
Don't smoosh hostname and domainname in API
Upstream-commit: ae75435dae9cb386eb213774f97fe35cdcafff49
Component: engine
2016-03-18 09:08:22 -07:00
6cb929cb7d Merge pull request #21238 from yongtang/21211-TestRestartStoppedContainer
Fix flaky test of TestRestartStoppedContainer (#21211).
Upstream-commit: 6eaf4434eed297423133b79aa162a6b60165ad2d
Component: engine
2016-03-18 17:01:30 +01:00
4051a1b3e8 Merge pull request #21311 from nalind/journal-race
Fix a couple of races in the journald log reader
Upstream-commit: 8ef56e1f98377a10ae970db6b83bf7f269b73f7c
Component: engine
2016-03-18 08:53:21 -07:00
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
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
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
4bffdb208b Fix flaky test of TestRestartStoppedContainer (#21211).
This fix addressed the issue of test TestRestartStoppedContainer
in #21211. Inside the test, a `docker restart` command is
followed by a `docker logs` command. However, `docker restart`
returns immediately so there is no guarantee that `docker logs`
will wait until the restarted container completes the command
`echo foobar`.

This fix use the check of `{{.State.Running}} = false` to make
sure that the restarted container has already finished, before
invoking the `docker logs` command. The timeout is set to 20s
to make sure it passes WindowsTP4 check.

This fixes #21211.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 48ccdd46aea4bb16925d0a333f792a712f1c11dc
Component: engine
2016-03-18 05:50:23 +00: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
98172de036 Update TestPsShowMounts to also test bind mounts
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: cdd7fddfec70cca2cc228519794281988ef2a15a
Component: engine
2016-03-17 15:43:32 -07:00
9fd3d4a31e Update filter volume to allow filtering by bind mount source
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 8451a08ed52b976fffb0cf34be0a48dcc36bdcbe
Component: engine
2016-03-17 15:42:45 -07:00
0477d61856 Fix inspect to print bind mounts source path instead of an empty string
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: cb8cc56c225cfc74b81f22a0f2ca8ce7bdccfe04
Component: engine
2016-03-17 15:42:45 -07:00
a49b1e8f69 Fix a race in cleaning up after journald followers
When following a journal-based log, it was possible for the worker
goroutine, which reads the journal using the journal context and sends
entry data down the message channel, to be scheduled after the function
which started it had returned.  This could create problems, since the
invoking function was closing the journal context object and message
channel before it returned, which could trigger use-after-free segfaults
and write-to-closed-channel panics in the worker goroutine.

Make the cleanup in the invoking function conditional so that it's only
done when we're not following the logs, and if we are, that it's left to
the worker goroutine to close them.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
Upstream-commit: 52c0f36f7b7aa794932fa41dfe50dc85f78e6146
Component: engine
2016-03-17 18:36:21 -04:00
ecc2f43e0e Fix a race in maintaining the journald reader list
The journald log reader keeps a map of following readers so that it can
close them properly when the journald reader object itself is closed,
but it was possible for its worker goroutine to be scheduled so that the
worker attempted to remove a reader from the map before the reader had
been added to the map.  This patch adds the item to the map before
starting the goroutine which is expected to eventually remove it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
Upstream-commit: 4d200cd6938c1416e34bf43576b0d528b73e8ba3
Component: engine
2016-03-17 18:36:21 -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
8f9f1ee4a7 handle kernel version error in version api
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 73046cb8d8d04a952c0e2daf068af25cd72786f6
Component: engine
2016-03-18 00:31:50 +08: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
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