35a7f0c59e
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-05-27 16:37:32 -04:00
f5d3311839
Merge pull request #13449 from duglin/FixRaceInStop
...
Fix race condition on container stop
2015-05-27 13:05:53 -07:00
7b57fae046
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
2015-05-27 10:44:57 -07:00
26650e2ccc
Merge pull request #13483 from jfrazelle/lxc-we-meet-again
...
fix lxc tests unshare, they dont use our apparmor profile
2015-05-27 10:22:31 -07:00
b29f3bb1c3
Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil
...
Return err if we got err on parseForm
2015-05-27 12:38:53 -04:00
2029257e3c
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
2015-05-27 08:44:11 -07:00
f3e56420a3
Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe
...
Fix unregister stats on when rm running container
2015-05-27 11:10:36 -04:00
66121d1b45
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-05-27 11:00:12 -04:00
3f66f6f2f0
Merge pull request #13500 from HuKeping/cleanup
...
Remove unused code
2015-05-27 13:59:40 +02:00
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
94d604357f
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-27 18:25:57 +08:00
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
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
e580734149
Merge pull request #13406 from moxiegirl/experimental-work
...
Placeholder Part II: For commenting about install
2015-05-26 18:19:26 -07:00
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
b50e780925
Merge pull request #13491 from jfrazelle/revert-exec-privileged
...
Revert "Add docker exec run a command in privileged mode"
2015-05-26 16:41:50 -07:00
838e1a8947
Merge pull request #13487 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
54b514735c
Merge pull request #12881 from nakedible/patch-1
...
Prevent fallback to v1 registry for digest pulls
2015-05-26 19:24:37 -04:00
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
0d445685b8
Merge pull request #13444 from runcom/fix-race-stats
...
Fix race in stats cli and native driver
2015-05-26 15:34:50 -07:00
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
bd18d86250
Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup
...
Do not force `syscall.Unmount` on container cleanup.
2015-05-26 15:23:16 -07:00
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
de318d8c1d
Merge pull request #13489 from cpuguy83/cleanup_rm_funcs
...
Cleanup container rm funcs
2015-05-26 14:24:02 -07:00
40b71adee3
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5
2015-05-26 14:12:16 -07:00
47e727d1fc
Merge pull request #13440 from LK4D4/fix_bridge_none
...
Fix network with -b none
2015-05-26 14:08:21 -07:00
3b795e035b
Merge pull request #13409 from LK4D4/add_opts_to_checkconfig
...
Add some opts to checkconfig
2015-05-26 13:54:23 -06:00
f8628ba891
Cleanup container rm funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-26 15:38:52 -04:00
fc679bebb9
Merge pull request #13479 from Microsoft/10662-fixcontaineragain
...
Windows: Fix up container again
2015-05-26 10:49:48 -07:00
7853bd29ec
Merge pull request #13480 from Microsoft/10662-fixvolumecompile
...
Windows: Fix volume_windows compile
2015-05-26 10:32:44 -07:00
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
1dc0499b64
Windows: Fix volume_windows compile
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 09:43:21 -07:00
5d207de509
Windows: Fix up container again
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-26 09:33:55 -07:00
0fccc40307
Merge pull request #13471 from ibuildthecloud/no-nil
...
Preinitialize MountPoints to avoid assigning to a nil map
2015-05-26 12:26:49 -04:00
aee9ac302d
Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
...
add unshare apparmor profile test
2015-05-26 17:32:45 +02:00
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
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
59214a0737
Preinitialize MountPoints to avoid assigning to a nil map
...
Fixes #13435
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-25 19:37:57 -07:00
628c396555
Merge pull request #13467 from epc/epc-2015145
...
Documentation Copy edits for typos
2015-05-25 14:32:17 -04:00
7d75c5be95
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-05-25 13:39:56 -04:00
8efd87f5a2
Merge pull request #13447 from justone/mention-dockviz-alternative
...
mention dockviz alternative
2015-05-25 19:26:19 +02:00
187362414d
Merge pull request #13418 from donkirkby/patch-1
...
small formatting and grammar fixes
2015-05-25 19:15:47 +02:00
453c0abf1c
mention dockviz alternative
...
closes #13431
Signed-off-by: Nate Jones <nate@endot.org>
2015-05-25 09:43:25 -07:00
c12081987a
Merge pull request #13461 from moxiegirl/add-glossary-back
...
Adding back in Glossary
2015-05-25 18:32:15 +02:00
5f57143b31
Merge pull request #13458 from janjaapdriessen/patch-1
...
Fix markdown syntax for "docker run" instruction example
2015-05-25 18:07:19 +02:00
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
e2ed11df13
Merge pull request #13445 from lloydde/doc-cli-no-head
...
doc: cli images examples rm "| head".
2015-05-25 17:32:13 +02:00
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
08da08f3f9
Adding back in Glossary
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-25 07:39:27 -07:00
29bdcaf3cf
Fix race condition on container stop
...
I'm fairly consistently seeing an error in
DockerSuite.TestContainerApiRestartNotimeoutParam:
docker_api_containers_test.go:969:
c.Assert(status, check.Equals, http.StatusNoContent)
... obtained int = 500
... expected int = 204
And in the daemon logs I see:
INFO[0003] Container 8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971 failed to exit within 0 seconds of SIGTERM - using the force
ERRO[0003] Handler for POST /containers/{name:.*}/restart returned error: Cannot restart container 8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971: [2] Container does not exist: container destroyed
ERRO[0003] HTTP Error err=Cannot restart container 8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971: [2] Container does not exist: container destroyed
statusCode=500
Note the "container destroyed" error message. This is being generatd by
the libcontainer code and bubbled up in container.Kill() as a result of the
call to `container.killPossiblyDeadProcess(9)` on line 439.
See the comment in the code, but what I think is going on is that because we
don't have any timeout on the Stop() call we immediate try to force things to
stop. And by the time we get into libcontainer code the process just finished
stopping due to the initial signal, so this secondary sig-9 fails due to the
container no longer running (ie. its 'destroyed').
Since we can't look for "container destroyed" to just ignore the error, because
some other driver might have different text, I opted to just ignore the error
and keep going - with the assumption that if it couldnt send a sig-9 to the
process then it MUST be because its already dead and not something else.
To reproduce this I just run:
curl -v -X POST http://127.0.0.1:2375/v1.19/containers/8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971/restart
a few times and then it fails with the HTTP 500.
Would like to hear some other ideas on to handle this since I'm not
thrilled with the proposed solution.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-25 04:28:23 -07:00
Dan Walsh
David Calavera
Alexander Morozov
Doug Davis
Phil Estes
Antonio Murdaca
Hu Keping
Qiang Huang
Brian Goff
moxiegirl
Josh Hawn
Arnaud Porterie
Tibor Vass
Jessica Frazelle
Tianon Gravi
John Howard
Sebastiaan van Stijn
Antonio Murdaca
Darren Shepherd
James Turnbull
Ed Costello
Nate Jones
Don Kirkby
Jan-Jaap Driessen
Doug Davis