Commit Graph

6761 Commits

Author SHA1 Message Date
Victor Vieux fde5f573d3 move opts out of pkg because it's related to docker
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-10 21:10:23 +00:00
Victor Vieux d648708d02 remove utils.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-10 21:06:27 +00:00
unclejack 52c258c5cf Merge pull request #4538 from crosbymichael/move-runtime
Move runtime into sub package
2014-03-10 22:52:32 +02:00
Guillaume J. Charmes 4fa8d0794e Merge pull request #4542 from fabiofalci/remove_manual_cookie
Remove manual http cookie management
2014-03-10 13:51:02 -07:00
unclejack 9bfbc7e648 Merge pull request #4560 from vieux/move_unit_test
move a unit test file
2014-03-10 22:45:41 +02:00
Victor Vieux 0ebf5d0ab3 move a unit test file
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-10 20:24:15 +00:00
James Turnbull 2b1244fc0d Merge pull request #4559 from metalivedev/unmaintainer
Removing myself from doc maintainers
2014-03-10 15:59:50 -04:00
Andy Rothfusz 3e4d0857bf Removing myself from doc maintainers due to other obligations eliminating time to maintain docs.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-03-10 12:55:26 -07:00
Tianon Gravi 211fc574a1 Merge pull request #4545 from tianon/update-packaging-and-init
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups
2014-03-10 10:52:45 -06:00
Tianon Gravi 50082f792b Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-10 03:27:46 -06:00
Michael Crosby 47edf3e8bf Add IsRunning to server interface
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-09 23:16:15 -07:00
Michael Crosby 36c3614fdd Move runtime and container into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-09 23:03:40 -07:00
Michael Crosby 01b6b2be73 Move graph and tags to graph sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-09 22:59:29 -07:00
Michael Crosby 82a5439835 Move image into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-09 22:59:29 -07:00
Michael Crosby 12bd83182d Move daemon config into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-09 22:59:28 -07:00
Fabio Falci df9b99aca0 Remove manual http cookie management
Since docker uses cookiejar it doesn't need to manage cookies manually
anymore.
Managing cookie was duplicating it.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-03-09 02:25:19 +00:00
Sven Dowideit d9f47c41c3 Merge pull request #4508 from walterl/patch-1
Fixed installmirrors ref
2014-03-09 10:15:47 +10:00
James Turnbull 198f8d7884 Merge pull request #4528 from tomfotherby/patch-1
Correct Docker run --host param to --hostname
2014-03-08 17:53:55 -05:00
Tianon Gravi 68217729a3 Merge pull request #4540 from unclejack/debootstrap_upgrade_packages
Run dist-upgrade after repo updates in mkimage-debootstrap
2014-03-08 10:10:11 -07:00
unclejack d04f4d836c upgrade packages after debootstrap
This makes mkimage-debootstrap upgrade packages after retrieving
updated lists of packages.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-08 18:41:50 +02:00
unclejack a5c6e08bd6 Merge pull request #4535 from vieux/fix_string_command
fix string in docker images
2014-03-08 17:02:25 +02:00
Michael Crosby d8425d98e6 Merge pull request #4534 from creack/fix_race_kill
Fix Race when killing the daemon
2014-03-07 18:11:51 -05:00
Sven Dowideit 65283afc8b Merge pull request #4524 from gurjeet/patch-3
Correct typo
2014-03-08 08:43:16 +10:00
Victor Vieux bc086a9cd6 fix string in docker images
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-07 20:07:17 +00:00
Guillaume J. Charmes b845ff355a
Fix Race when killing the daemon
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-07 11:51:28 -08:00
Victor Vieux 27eae50224 Merge pull request #4529 from pmorie/typo
Fix typo in devmapper driver_test
2014-03-07 11:01:04 -08:00
Guillaume J. Charmes f27ad07139 Merge pull request #4516 from tianon/fix-static-dockerinit
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
2014-03-07 10:15:49 -08:00
Guillaume J. Charmes 5b0ca89e2a Merge pull request #4519 from crosbymichael/back-to-pivot-root
Use env var to toggle pivot root or ms_move
2014-03-07 10:12:00 -08:00
Paul Morie b3e7df48df Fix typo in devmapper driver_test
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
2014-03-07 12:20:25 -05:00
Tom Fotherby d61938d2b8 Correct Docker run --host param to --hostname 2014-03-07 16:41:11 +00:00
Gurjeet Singh 6d9a7d6bc3 Correct typo 2014-03-07 08:45:08 -05:00
Sven Dowideit 3e5102c11e Merge pull request #4522 from liubin0329/patch-1
removing redundant dot
2014-03-07 23:20:02 +10:00
bin liu 29079f03cf removing redundant dot
Maybe it's a typo
2014-03-07 18:19:18 +08:00
Tianon Gravi a40bb2aabc Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 21:22:25 -07:00
Michael Crosby 36dd124b16 Add env var to toggle pivot root or ms_move
Use the  DOCKER_RAMDISK env var to tell the native driver not to use
a pivot root when setting up the rootfs of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-06 19:30:52 -08:00
Tianon Gravi be344cf0d8 Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 19:55:22 -07:00
Michael Crosby c38635020a Revert "Revert "libcontainer: Use pivot_root instead of chroot""
This reverts commit 82f797f140.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-06 17:19:59 -08:00
Michael Crosby 557e4fef44 Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE""
This reverts commit bd263f5b15.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-06 17:19:47 -08:00
unclejack 78dc1ede52 Merge pull request #4512 from crosbymichael/no-pivot-root
No pivot root because of ramdisk
2014-03-07 02:54:03 +02:00
unclejack f244d9763e Merge pull request #4511 from crosbymichael/ensure-native-containers-die
Ensure that native containers die with the parent
2014-03-07 02:49:10 +02:00
Michael Crosby bd263f5b15 Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"
This reverts commit 757b577572.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-06 16:41:03 -08:00
Michael Crosby 82f797f140 Revert "libcontainer: Use pivot_root instead of chroot"
This reverts commit 5b5c884cc8.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-06 16:32:06 -08:00
Michael Crosby ea9bce8724 Ensure that native containers die with the parent
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-06 16:30:56 -08:00
unclejack 1695c77c43 Merge pull request #4509 from crosbymichael/kill-all
Remove the ghosts and kill everything
2014-03-07 01:35:38 +02:00
Michael Crosby 772ef99d28 Remove the ghosts and kill everything
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-06 15:30:26 -08:00
James Turnbull eda43fc70f Merge pull request #4510 from vieux/fix_param_doc
Fix name parameter
2014-03-06 17:55:57 -05:00
Andy Rothfusz 44fc1dfca2 Merge pull request #4475 from ubermuda/patch-1
Added Docker-PHP to the list of client libs
2014-03-06 14:54:33 -08:00
Victor Vieux 476c290b07 Fix name parameter
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-06 22:51:44 +00:00
unclejack e4ebe6a12f Merge pull request #4488 from crosbymichael/return-correct-lxc-pid
Return correct process pid for lxc
2014-03-07 00:14:08 +02:00
unclejack e388b6aba5 Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command
Add ability to force removal of running container via docker rm -f
2014-03-07 00:05:57 +02:00