kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
15774 commits 10 branches 356 tags 299 MiB
Commit graph

15774 commits

Author SHA1 Message Date
David Calavera
26650e2ccc Merge pull request from jfrazelle/lxc-we-meet-again 
fix lxc tests unshare, they dont use our apparmor profile
 2015-05-27 10:22:31 -07:00
Doug Davis
b29f3bb1c3 Merge pull request from hqhq/hq_fix_wrong_return_nil 
Return err if we got err on parseForm
 2015-05-27 12:38:53 -04:00
Alexander Morozov
2029257e3c Merge pull request from jlhawn/volume_unmount_fix 
Fix container unmount networkMounts
 2015-05-27 08:44:11 -07:00
Phil Estes
f3e56420a3 Merge pull request from cpuguy83/fix_stats_unsubscribe 
Fix unregister stats on when rm running container
 2015-05-27 11:10:36 -04:00
Antonio Murdaca
3f66f6f2f0 Merge pull request from HuKeping/cleanup 
Remove unused code
 2015-05-27 13:59:40 +02:00
Hu Keping
a34cb32186 Remove unused code 
As far as I see, it's a dead code.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-27 22:39:02 +08:00
Qiang Huang
7c7aebfcfe Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:16:28 +08:00
Brian Goff
b3e8ab3021 Fix unregister stats on when rm running container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 22:22:03 -04:00
moxiegirl
e580734149 Merge pull request from moxiegirl/experimental-work 
Placeholder Part II: For commenting about install
 2015-05-26 18:19:26 -07:00
Josh Hawn
04f99a6ca8 Fix container unmount networkMounts 
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-05-26 17:38:26 -07:00
Arnaud Porterie
b50e780925 Merge pull request from jfrazelle/revert-exec-privileged 
Revert "Add docker exec run a command in privileged mode"
 2015-05-26 16:41:50 -07:00
Brian Goff
838e1a8947 Merge pull request from calavera/volume_load_regression_test 
Add regression test to make sure we can load old containers with volumes.
 2015-05-26 19:40:08 -04:00
Tibor Vass
54b514735c Merge pull request from nakedible/patch-1 
Prevent fallback to v1 registry for digest pulls
 2015-05-26 19:24:37 -04:00
Mary Anthony
1ba1a0550f Fixes title, line wrap, and Adds install area 
Tibor's comment
Updating with the new plugins
Entering comments from Seb

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-26 15:37:38 -07:00
Alexander Morozov
0d445685b8 Merge pull request from runcom/fix-race-stats 
Fix race in stats cli and native driver
 2015-05-26 15:34:50 -07:00
David Calavera
ea0e15ba62 Add regression test to make sure we can load old containers with volumes. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-26 15:28:58 -07:00
Arnaud Porterie
bd18d86250 Merge pull request from calavera/donot_force_syscall_unmount_on_cleanup 
Do not force `syscall.Unmount` on container cleanup.
 2015-05-26 15:23:16 -07:00
David Calavera
f78dce152c Do not force syscall.Unmount on container cleanup. 
This is not necessary and it's a regression from the old behavior.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-26 14:28:26 -07:00
Alexander Morozov
de318d8c1d Merge pull request from cpuguy83/cleanup_rm_funcs 
Cleanup container rm funcs
 2015-05-26 14:24:02 -07:00
Jessica Frazelle
40b71adee3 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
 2015-05-26 14:12:16 -07:00
Arnaud Porterie
47e727d1fc Merge pull request from LK4D4/fix_bridge_none 
Fix network with -b none
 2015-05-26 14:08:21 -07:00
Tianon Gravi
3b795e035b Merge pull request from LK4D4/add_opts_to_checkconfig 
Add some opts to checkconfig
 2015-05-26 13:54:23 -06:00
Brian Goff
f8628ba891 Cleanup container rm funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 15:38:52 -04:00
David Calavera
fc679bebb9 Merge pull request from Microsoft/10662-fixcontaineragain 
Windows: Fix up container again
 2015-05-26 10:49:48 -07:00
Arnaud Porterie
7853bd29ec Merge pull request from Microsoft/10662-fixvolumecompile 
Windows: Fix volume_windows compile
 2015-05-26 10:32:44 -07:00
Jessica Frazelle
a08fb73f93 fix lxc tests unshare, they dont use our apparmor profile 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-26 10:31:21 -07:00
John Howard
1dc0499b64 Windows: Fix volume_windows compile 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-26 09:43:21 -07:00
John Howard
5d207de509 Windows: Fix up container again 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-26 09:33:55 -07:00
Brian Goff
0fccc40307 Merge pull request from ibuildthecloud/no-nil 
Preinitialize MountPoints to avoid assigning to a nil map
 2015-05-26 12:26:49 -04:00
Sebastiaan van Stijn
aee9ac302d Merge pull request from jfrazelle/add-apparmor-unshare-test 
add unshare apparmor profile test
 2015-05-26 17:32:45 +02:00
Antonio Murdaca
9e425d56d0 Add lock before accessing native driver active containers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-26 13:55:02 +02:00
Antonio Murdaca
77280a87b7 Fix race in stats cli and native driver 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-26 13:55:02 +02:00
Darren Shepherd
59214a0737 Preinitialize MountPoints to avoid assigning to a nil map 
Fixes 

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-25 19:37:57 -07:00
James Turnbull
628c396555 Merge pull request from epc/epc-2015145 
Documentation Copy edits for typos
 2015-05-25 14:32:17 -04:00
Ed Costello
7d75c5be95 Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
 2015-05-25 13:39:56 -04:00
Sebastiaan van Stijn
8efd87f5a2 Merge pull request from justone/mention-dockviz-alternative 
mention dockviz alternative
 2015-05-25 19:26:19 +02:00
Sebastiaan van Stijn
187362414d Merge pull request from donkirkby/patch-1 
small formatting and grammar fixes
 2015-05-25 19:15:47 +02:00
Nate Jones
453c0abf1c mention dockviz alternative 
closes 

Signed-off-by: Nate Jones <nate@endot.org>
 2015-05-25 09:43:25 -07:00
Sebastiaan van Stijn
c12081987a Merge pull request from moxiegirl/add-glossary-back 
Adding back in Glossary
 2015-05-25 18:32:15 +02:00
Sebastiaan van Stijn
5f57143b31 Merge pull request from janjaapdriessen/patch-1 
Fix markdown syntax for "docker run" instruction example
 2015-05-25 18:07:19 +02:00
Don Kirkby
5051aee555 small formatting and grammar fixes 
Having the line break in the middle of a code span caused the line break to appear on the web site version, even though it doesn't appear in the preview.

The other two changes are just small grammar improvements.

Signed-off-by: don <donkirkby@gmail.com>
 2015-05-25 09:05:42 -07:00
Sebastiaan van Stijn
e2ed11df13 Merge pull request from lloydde/doc-cli-no-head 
doc: cli images examples rm "| head".
 2015-05-25 17:32:13 +02:00
Jan-Jaap Driessen
02405a96b2 Markdown changes (thanks to runcom for the rebase+squash handholding) 
Signed-off-by: Jan-Jaap Driessen <janjaapdriessen@gmail.com>
 2015-05-25 17:24:41 +02:00
Mary Anthony
08da08f3f9 Adding back in Glossary 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-05-25 07:39:27 -07:00
Sebastiaan van Stijn
fd28f15288 Merge pull request from WeiZhang555/cleanup 
Cleanup: change test func name
 2015-05-25 13:11:31 +02:00
Zhang Wei
ab121345ee Cleanup: change test func name 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-25 14:51:10 +08:00
Lloyd Dewolf
ca23ac37ef doc: cli images examples rm "| head". 
It's a given that lines of example output might be truncated or come
from a contrived environment.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
 2015-05-24 14:04:13 -07:00
Alexander Morozov
3cb14df68c Fix network with -b none 
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-24 08:26:59 -07:00
Arnaud Porterie
f83073d3eb Merge pull request from mavenugo/vendorin 
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
 2015-05-23 21:08:58 -07:00
Arnaud Porterie
bce3e761c0 Merge pull request from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00