Commit Graph

7111 Commits

Author SHA1 Message Date
Scott Collier 59acb8c83d Adding the new options to the `docker ps` documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
2014-03-08 16:32:00 -06: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
Victor Vieux 7da37fec13 handle capital
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-07 23:40:45 +00:00
Michael Crosby 0ab7b6952a Bump to version 0.9.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-07 15:38:10 -08:00
Michael Crosby ccdf27e502 Merge branch 'master' into bump_v0.9.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-07 15:37:29 -08: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 661cf32e4f Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 23:29:08 -07:00
Tianon Gravi 0a819380c5 Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 23:16:26 -07:00
Tianon Gravi aceb10b1e5 Resync the DCO text with upstream at http://developercertificate.org/
```
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
```

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 22:32:58 -07: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
Victor Vieux 3729ece2ea improve alpha sort in mflag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-07 02:20:59 +00: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
Guillaume J. Charmes b722aa21b7 Merge pull request #4506 from creack/fix_apparmor
Use CGO for apparmor profile switch
2014-03-06 13:37:34 -08:00
Walter Leibbrandt 188dea9e0e Fixed installmirrors ref
Nested inline markup is not (yet) possible: http://stackoverflow.com/a/9645684
2014-03-06 23:33:08 +02:00
Guillaume J. Charmes 2128eb52ed Merge pull request #7 from tianon/fix-hack-tags
Update build tags such that we can properly compile on all platforms
2014-03-06 12:49:05 -08:00
Tianon Gravi 0b23393ba1 Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 13:39:17 -07:00
Guillaume J. Charmes c89fa6645e
Add buildflags to allow crosscompilation for apparmor
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-06 12:05:03 -08:00
Geoffrey Bachelet 511b57bee5 Added Docker-PHP to the list of client libs
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com> (github: ubermuda)
2014-03-06 20:33:51 +01:00
Victor Vieux 83ffc2860b Merge pull request #3612 from EvanKrall/specify_socket_group
Create a -G option that specifies the group which unix sockets belong to...
2014-03-06 11:30:17 -08:00
Guillaume J. Charmes 31f62b934b Merge pull request #4503 from unclejack/attempt_to_fix_apparmor_profile
remove dbus from apparmor profile for Ubuntu 12.04
2014-03-06 11:20:06 -08:00
Evan Krall 644acec2f7 Create a -G option that specifies the group which unix sockets belong to.
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
2014-03-06 11:17:04 -08:00
Guillaume J. Charmes f0f833c6d7
Use CGO for apparmor profile switch
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-06 11:10:58 -08:00