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

23085 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antonio Murdaca
5008a34072 Merge pull request #21333 from cpuguy83/sigpipe 
Don't forward SIGPIPE from client to container
 2016-03-21 15:09:13 +01:00
Sebastiaan van Stijn
c9488fe280 Merge pull request #21364 from thaJeztah/carry-21188-fix-docker-info-docs 
docs: fix incorrect output for "/info" endpoint
 2016-03-21 13:38:35 +01:00
Sebastiaan van Stijn
fffa83353f Merge pull request #21246 from nerdalert/vlan_docs 
Updates to macvlan/ipvlan experimental docs
 2016-03-21 13:16:52 +01:00
Arnaud Porterie
9014ac2d15 docs: fix incorrect output for "/info" endpoint 
OomScoreAjd is not part of `/info` output
Wrong field name `DiscoveryBackend` in API reference

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-03-21 12:55:45 +01:00
Sebastiaan van Stijn
722f06dae3 Merge pull request #21353 from Microsoft/jjh/tidylibcontainerdmore 
Windows: Tidy after libcontainerd
 2016-03-21 11:06:54 +01:00
Sebastiaan van Stijn
1a7afc075d Merge pull request #21355 from yongtang/20188-plugins-docs 
Update plugin docs for the covering of remote plugins (#20188).
 2016-03-21 10:28:25 +01:00
Sebastiaan van Stijn
02a90d0399 Merge pull request #21345 from duglin/BetterError 
Add the name of the exe that's trying to be executed
 2016-03-21 10:17:10 +01:00
Yong Tang
c3ef69270a Update plugin docs for the covering of remote plugins (#20188). 
This fix updates the Plugin API docs to cover the case of remote
plugins which could be deployed on a host different from the
docker host, through spec or json files.

This fix closes #20188.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-03-21 02:42:10 +00:00
Doug Davis
7942160638 Add the name of the exe that's trying to be executed 
so that the user knows what's not in the container but should be.
Its not always easy for the user to know what exact command is being run
when the 'docker run' is embedded deep in something else, like a Makefile.
Saw this while dealing with the containerd migration.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-03-20 18:15:46 -07:00
John Howard
3ca6ad5b9e Windows: Tidy after libcontainerd 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-20 15:59:52 -07:00
Jess Frazelle
9ea7e082ef Merge pull request #21343 from pandrew/fix-debian-policy-rule 
Fix debian policy rule
 2016-03-20 12:28:58 -07:00
Brian Goff
09a69ed8b9 Merge pull request #21344 from tonistiigi/fix-seccomp-profiles 
Reuse profiles/seccomp package
 2016-03-20 14:04:11 -04:00
Tonis Tiigi
99b16b3523 Reuse profiles/seccomp package 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-19 14:15:39 -07:00
Paul Liljenberg
f10c8e786b Fix debian policy rule 
Fix issue in debian policy by removeing double quotes.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
 2016-03-19 20:58:19 +01:00
Vincent Demeester
9e530247e0 Merge pull request #21338 from Microsoft/jjh/lcdcleanup 
Windows: libcontainerd cleanup
 2016-03-19 15:14:10 +01:00
John Howard
e331df5aee Windows: libcontainerd cleanup 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-03-18 20:31:11 -07:00
Jess Frazelle
b77573f48e Merge pull request #21274 from jfrazelle/fix-variables-that-werent-being-used 
fix variables that werent being called
 2016-03-18 18:03:15 -07:00
Brian Goff
131c59193f Merge pull request #21325 from frenkel/openbsd-support 
Support OpenBSD build
 2016-03-18 20:53:17 -04:00
Jess Frazelle
e5a3f86e44 Merge pull request #20662 from tonistiigi/containerd-integration 
Containerd integration
 2016-03-18 17:21:18 -07:00
Jess Frazelle
06e98f0a5c Merge pull request #21232 from calavera/consolidate_security_opts_format 
Consolidate security options to use `=` as separator.
 2016-03-18 16:02:38 -07:00
Brent Salisbury
8926af95e4 Updates to macvlan/ipvlan experimental docs 
- Added a few more diagrams.
- Fixed typos and a few additional  details.
- Moved experimental images to a new directory
  in /experimental/images per @cpuguy83 suggestion.

Signed-off-by: Brent Salisbury <brent@docker.com>
 2016-03-18 18:46:46 -04:00
Brian Goff
81707de23f Don't forward SIGPIPE from client to container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-03-18 16:50:18 -04:00
John Howard
94d70d8355 Windows libcontainerd implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Darren Stahl <darst@microsoft.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:41 -07:00
Tonis Tiigi
6eebe85290 Remove execdriver package 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-03-18 13:38:37 -07:00
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
Frank Groeneveld
719a43ca35 Cli binary can now be build on OpenBSD 
Signed-off-by: Frank Groeneveld <frank@frankgroeneveld.nl>
 2016-03-18 14:56:21 +01: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