0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23058 commits 14 branches 412 tags 338 MiB
Commit graph

23058 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tonis Tiigi
9c4570a958 Replace execdrivers with containerd implementation 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-03-18 13:38:32 -07:00
Tonis Tiigi
cc83031ade Vendor containerd, specs, runc 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:26 -07:00
Tonis Tiigi
14299daaca Vendor updated grpc, protobuf 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:21 -07:00
Brian Goff
03003619af Merge pull request #21332 from jfrazelle/change-email 
change email
 2016-03-18 16:28:51 -04:00
Jessica Frazelle
d3b650062f
change email 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-03-18 13:17:28 -07:00
Vincent Demeester
6c6363c726 Merge pull request #21269 from mlaventure/inspect-bind-mounts 
Update inspect/ps to properly handle bind mounts
 2016-03-18 20:52:02 +01:00
Vincent Demeester
ea0025a7e1 Merge pull request #21299 from allencloud/handle-kernel-version-error-in-version-api 
handle kernel version error in version api
 2016-03-18 18:07:48 +01:00
Antonio Murdaca
a30332e705 Merge pull request #21183 from thaJeztah/fix-flaky-TestUpdateRestartPolicy 
Fix flaky TestUpdateRestartPolicy on Windows
 2016-03-18 17:45:05 +01:00
David Calavera
ae75435dae Merge pull request #20200 from thockin/14282-hostname-domainname-v2 
Don't smoosh hostname and domainname in API
 2016-03-18 09:08:22 -07:00
Sebastiaan van Stijn
6eaf4434ee Merge pull request #21238 from yongtang/21211-TestRestartStoppedContainer 
Fix flaky test of TestRestartStoppedContainer (#21211).
 2016-03-18 17:01:30 +01:00
David Calavera
8ef56e1f98 Merge pull request #21311 from nalind/journal-race 
Fix a couple of races in the journald log reader
 2016-03-18 08:53:21 -07:00
Sebastiaan van Stijn
d2a8621b20 Merge pull request #21316 from estesp/daemon-dump-stack-note 
Add documentation on the stack trace dump capability of the daemon
 2016-03-18 14:29:55 +01:00
Phil Estes
ae466aafcb 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)
 2016-03-18 09:25:18 -04:00
Vincent Demeester
9f00b4b79c Merge pull request #21302 from allencloud/fix-typos-in-several-files 
fix typos in several files
 2016-03-18 14:06:59 +01:00
Sebastiaan van Stijn
aa6d0f5310 Merge pull request #21321 from dsheets/patch-1 
project/ISSUE-TRIAGE.md: fix shinny -> shiny typo
 2016-03-18 12:44:42 +01:00
David Sheets
bd061b8df6 ISSUE-TRIAGE: fix shinny -> shiny typo 
Signed-off-by: David Sheets <david.sheets@docker.com>
 2016-03-18 09:42:49 +00:00
Sebastiaan van Stijn
3d13fddd2b Merge pull request #21318 from wenchma/fix-doc 
Update the document error
 2016-03-18 09:18:03 +01:00
Wen Cheng Ma
edf0da968c Update the document error 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-03-18 15:23:27 +08:00
Yong Tang
48ccdd46ae 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>
 2016-03-18 05:50:23 +00:00
allencloud
f1d34ac2eb fix typos in several files 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-03-18 12:51:57 +08:00
Sebastiaan van Stijn
46dde68158 Merge pull request #21305 from yongtang/031716-typo 
Fix several typos in the documentation.
 2016-03-18 01:44:01 +01:00
Brian Goff
6dd69afd37 Merge pull request #21307 from Microsoft/jstarks/fix_long_paths 
Windows: revendor Microsoft/hcsshim to v0.1.0
 2016-03-17 19:35:03 -04:00
Kenfe-Mickael Laventure
cdd7fddfec Update TestPsShowMounts to also test bind mounts 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-17 15:43:32 -07:00
Kenfe-Mickael Laventure
8451a08ed5 Update filter volume to allow filtering by bind mount source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-17 15:42:45 -07:00
Kenfe-Mickael Laventure
cb8cc56c22 Fix inspect to print bind mounts source path instead of an empty string 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-03-17 15:42:45 -07:00
Nalin Dahyabhai
52c0f36f7b 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)
 2016-03-17 18:36:21 -04:00
Nalin Dahyabhai
4d200cd693 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)
 2016-03-17 18:36:21 -04:00
John Starks
b54058bafe 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>
 2016-03-17 21:08:07 +00:00
Alexander Morozov
41c1c6501e Merge pull request #21266 from estesp/dockremap-system-user 
Change subordinate range-owning user to be a system user
 2016-03-17 11:42:15 -07:00
Yong Tang
3c6aa163a3 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>
 2016-03-17 18:29:35 +00:00
David Calavera
0910946dc4 Merge pull request #21296 from icecrime/add_programmerq 
Add @programmerq to docker/docker curators
 2016-03-17 11:18:08 -07:00
Tibor Vass
e6d3a9849c Merge pull request #21003 from riyazdf/hardware-signing-ga 
Move hardware signing out of experimental
 2016-03-17 14:16:40 -04:00
David Calavera
d3afe34b51 Merge pull request #21292 from runcom/pkg-error-truncindex 
pkg: truncindex: provide more info in error
 2016-03-17 10:45:56 -07:00
David Calavera
3df99b7fd2 Merge pull request #21295 from rhvgoyal/fix-variable-assignment 
Fix the assignment to wrong variable
 2016-03-17 10:39:15 -07:00
Michael Crosby
2b9ceea896 Merge pull request #21293 from cpuguy83/wtf_gcp 
Do not call out to Google on init
 2016-03-17 10:32:21 -07:00
David Calavera
b4da157846 Merge pull request #21286 from rhatdan/seccomp-man 
Fix documentation on --security-opt seccomp
 2016-03-17 10:29:33 -07:00
Arnaud Porterie
9d62c11ab5 Merge pull request #21276 from nerdalert/mcvlan-v6-ci 
Remove v6 IT test for experimental macvlan driver
 2016-03-17 09:50:02 -07:00
allencloud
73046cb8d8 handle kernel version error in version api 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-03-18 00:31:50 +08:00
Alexander Morozov
04c7d94c71 Merge pull request #21273 from jfrazelle/remove-dead-code 
remove dead code
 2016-03-17 09:16:02 -07:00
Arnaud Porterie
441907e2cd Add @programmerq to docker/docker curators 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-03-17 09:08:19 -07:00
Vincent Demeester
8d742bbe2f Merge pull request #21294 from samoht/fix-typo 
Fix typo in the triaging guidelines
 2016-03-17 16:46:19 +01:00
David Calavera
553ffa7fd7 Merge pull request #21279 from WeiZhang555/typo 
Fix typo
 2016-03-17 08:20:26 -07:00
Vivek Goyal
4141a00921 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>
 2016-03-17 15:19:08 +00:00
Thomas Gazagnaire
2d2d1bb2c6 Fix a typo in the triaging guidelines 
Spotted by @dgageot

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
 2016-03-17 15:09:13 +00:00
Thomas Gazagnaire
f906ca52ea Remove trailing whitespaces 
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
 2016-03-17 15:07:23 +00:00
Brian Goff
24710fd3e2 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>
 2016-03-17 11:06:21 -04:00
Antonio Murdaca
ae1002219b pkg: truncindex: provide more info in error 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-03-17 15:53:12 +01:00
Brent Salisbury
6d43dc99e5 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>
 2016-03-17 08:57:52 -04:00
Vincent Demeester
cf9d0c8ae2 Merge pull request #21257 from yongtang/21247-TestRunAttachFailedNoLeak 
Fix flaky test TestRunAttachFailedNoLeak in #21247.
 2016-03-17 13:47:40 +01:00
Dan Walsh
450fa7536e Fix documentation on --security-opt seccomp 
Missing documentation and man pages on seccomp options.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-03-17 08:04:02 -04:00