toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,750 Commits 3 Branches 295 Tags
0d48ade88271b1d24e84839122b3fe2d31c57ef4
Commit Graph
6750 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby 0d48ade882 Add IsRunning to server interface 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 47edf3e8bf759270c243711eaed1faa1d4d61f35
Component: engine
 2014-03-09 23:16:15 -07:00
Michael Crosby 060a86aead Move runtime and container into sub pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 36c3614fdde079fad178390f651945fba884668a
Component: engine
 2014-03-09 23:03:40 -07:00
Michael Crosby a67c5c76aa Move graph and tags to graph sub pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 01b6b2be73a6f40e0179e0217385eea6b41100a5
Component: engine
 2014-03-09 22:59:29 -07:00
Michael Crosby fc0f37e6e1 Move image into sub pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 82a5439835b0bff3ab3dfb169415948dae504d56
Component: engine
 2014-03-09 22:59:29 -07:00
Michael Crosby a25b16df9e Move daemon config into sub pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 12bd83182dff24a800eee6e7e93beeab30b480b7
Component: engine
 2014-03-09 22:59:28 -07:00
Sven Dowideit a1038a6e80 Merge pull request #4508 from walterl/patch-1 
Fixed installmirrors ref
Upstream-commit: d9f47c41c3a451efd18e59d7aedd383db849d56f
Component: engine
 2014-03-09 10:15:47 +10:00
James Turnbull 195571688e Merge pull request #4528 from tomfotherby/patch-1 
Correct Docker run --host param to --hostname
Upstream-commit: 198f8d788483d2d69626dba2f0ef710225197b6c
Component: engine
 2014-03-08 17:53:55 -05:00
Tianon Gravi c6b9b33a59 Merge pull request #4540 from unclejack/debootstrap_upgrade_packages 
Run dist-upgrade after repo updates in mkimage-debootstrap
Upstream-commit: 68217729a3d08ac30ad81ce1cd14c69e96e6b983
Component: engine
 2014-03-08 10:10:11 -07:00
unclejack 063107f17f 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)
Upstream-commit: d04f4d836c6b2a9266350a1b0e284949dcc6510a
Component: engine
 2014-03-08 18:41:50 +02:00
unclejack 7391576547 Merge pull request #4535 from vieux/fix_string_command 
fix string in docker images
Upstream-commit: a5c6e08bd61948e973da1d6ffd7b8f55ad44bd22
Component: engine
 2014-03-08 17:02:25 +02:00
Michael Crosby a38b9b106f Merge pull request #4534 from creack/fix_race_kill 
Fix Race when killing the daemon
Upstream-commit: d8425d98e61500efa5c404f7450ed4876c7c407a
Component: engine
 2014-03-07 18:11:51 -05:00
Sven Dowideit b5b438daae Merge pull request #4524 from gurjeet/patch-3 
Correct typo
Upstream-commit: 65283afc8bbbc272d1812d6978d8ff81b5e5922a
Component: engine
 2014-03-08 08:43:16 +10:00
Victor Vieux c65746a97c fix string in docker images 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: bc086a9cd61b2d15fbef9db3cb53c7f3650fda48
Component: engine
 2014-03-07 20:07:17 +00:00
Guillaume J. Charmes 3a9e0a7416 Fix Race when killing the daemon 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: b845ff355a3342ee3fee99196d22194706763182
Component: engine
 2014-03-07 11:51:28 -08:00
Victor Vieux 5b857edcb5 Merge pull request #4529 from pmorie/typo 
Fix typo in devmapper driver_test
Upstream-commit: 27eae50224a8ce68e0379aca0c6d85081c6374a3
Component: engine
 2014-03-07 11:01:04 -08:00
Guillaume J. Charmes a29949a7bc 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
Upstream-commit: f27ad07139dc166124ee36f003eb968cd6461651
Component: engine
 2014-03-07 10:15:49 -08:00
Guillaume J. Charmes cb3ba7d537 Merge pull request #4519 from crosbymichael/back-to-pivot-root 
Use env var to toggle pivot root or ms_move
Upstream-commit: 5b0ca89e2a9c5c1a33d246933deff061eda089a2
Component: engine
 2014-03-07 10:12:00 -08:00
Paul Morie 926a18e3d9 Fix typo in devmapper driver_test 
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
Upstream-commit: b3e7df48dfbf3d2300877d1e524132624e9493c3
Component: engine
 2014-03-07 12:20:25 -05:00
Tom Fotherby f8687ad662 Correct Docker run --host param to --hostname 
Upstream-commit: d61938d2b879fe0ccbf46b4a7ca8dd2eb537eee9
Component: engine
 2014-03-07 16:41:11 +00:00
Gurjeet Singh b1cd97bc5d Correct typo 
Upstream-commit: 6d9a7d6bc3edb8294e05a9903d5fa97239ed12e2
Component: engine
 2014-03-07 08:45:08 -05:00
Sven Dowideit 3dd923dd6c Merge pull request #4522 from liubin0329/patch-1 
removing redundant dot
Upstream-commit: 3e5102c11e272fd7adf79e6de4d378ff0429c9bd
Component: engine
 2014-03-07 23:20:02 +10:00
bin liu 4948f76f10 removing redundant dot 
Maybe it's a typo
Upstream-commit: 29079f03cfb0653316b07c58d24f4d547b3de1cc
Component: engine
 2014-03-07 18:19:18 +08:00
Tianon Gravi fa19c6a895 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)
Upstream-commit: a40bb2aabc1c0aba8b4de82dc353fae322b8831d
Component: engine
 2014-03-06 21:22:25 -07:00
Michael Crosby 957f74b876 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)
Upstream-commit: 36dd124b16a76704a88142fa96bb4bb6260dd821
Component: engine
 2014-03-06 19:30:52 -08:00
Tianon Gravi 2e92b6ef1e 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)
Upstream-commit: be344cf0d8e4f9881724f49398603a6e3109bc89
Component: engine
 2014-03-06 19:55:22 -07:00
Michael Crosby 6f0ad9195c Revert "Revert "libcontainer: Use pivot_root instead of chroot"" 
This reverts commit 82f797f14096430c3edbace1cd30e04a483ec41f.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c38635020accaffa6868f19f308042be051132a0
Component: engine
 2014-03-06 17:19:59 -08:00
Michael Crosby 3e4d7be838 Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"" 
This reverts commit bd263f5b15b51747e3429179fef7fcb425ccbe4a.

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

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

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 82f797f14096430c3edbace1cd30e04a483ec41f
Component: engine
 2014-03-06 16:32:06 -08:00
Michael Crosby c896586b70 Ensure that native containers die with the parent 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ea9bce8724303656c87c05e9049272258c9827b3
Component: engine
 2014-03-06 16:30:56 -08:00
unclejack fe7e822dde Merge pull request #4509 from crosbymichael/kill-all 
Remove the ghosts and kill everything
Upstream-commit: 1695c77c436e65a9f553b365714b56f78891bef5
Component: engine
 2014-03-07 01:35:38 +02:00
Michael Crosby 936f96cce5 Remove the ghosts and kill everything 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 772ef99d2816b629d084e11fe7fba5953687b620
Component: engine
 2014-03-06 15:30:26 -08:00
James Turnbull 5af40cdb6e Merge pull request #4510 from vieux/fix_param_doc 
Fix name parameter
Upstream-commit: eda43fc70fb771d9a55355db3f278e36987700fe
Component: engine
 2014-03-06 17:55:57 -05:00
Andy Rothfusz 6f1e791920 Merge pull request #4475 from ubermuda/patch-1 
Added Docker-PHP to the list of client libs
Upstream-commit: 44fc1dfca25dbd873c9d99eda73eba317796ec53
Component: engine
 2014-03-06 14:54:33 -08:00
Victor Vieux a45e674934 Fix name parameter 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 476c290b079d94b1da02c6e72ed15b7f9bd7fce5
Component: engine
 2014-03-06 22:51:44 +00:00
unclejack 1f7c2a04c8 Merge pull request #4488 from crosbymichael/return-correct-lxc-pid 
Return correct process pid for lxc
Upstream-commit: e4ebe6a12f5067602ab76aa0763dc4b291e5046f
Component: engine
 2014-03-07 00:14:08 +02:00
unclejack 81ffbaf8cc 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
Upstream-commit: e388b6aba5e7d75fecf87223abcd3c1deffd27f0
Component: engine
 2014-03-07 00:05:57 +02:00
Guillaume J. Charmes ecf60ced9e Merge pull request #4506 from creack/fix_apparmor 
Use CGO for apparmor profile switch
Upstream-commit: b722aa21b7ddfd558c2a36c8301d61b011221197
Component: engine
 2014-03-06 13:37:34 -08:00
Walter Leibbrandt ec7a1fa7d6 Fixed installmirrors ref 
Nested inline markup is not (yet) possible: http://stackoverflow.com/a/9645684
Upstream-commit: 188dea9e0e8b968b28a288192c357343dcc5834c
Component: engine
 2014-03-06 23:33:08 +02:00
Guillaume J. Charmes 415acc0f7a Merge pull request #7 from tianon/fix-hack-tags 
Update build tags such that we can properly compile on all platforms
Upstream-commit: 2128eb52eda1a65e725a9a98f500a468778092f0
Component: engine
 2014-03-06 12:49:05 -08:00
Tianon Gravi 24c5efffe2 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)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
 2014-03-06 13:39:17 -07:00
Guillaume J. Charmes 2ebfedab6d Add buildflags to allow crosscompilation for apparmor 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: c89fa6645ef87e1863ef5812bd42176f5bd987ca
Component: engine
 2014-03-06 12:05:03 -08:00
Geoffrey Bachelet e582b9139d Added Docker-PHP to the list of client libs 
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com> (github: ubermuda)
Upstream-commit: 511b57bee5bfc80cab26df044e1e821d01064192
Component: engine
 2014-03-06 20:33:51 +01:00
Victor Vieux 68556310d4 Merge pull request #3612 from EvanKrall/specify_socket_group 
Create a -G option that specifies the group which unix sockets belong to...
Upstream-commit: 83ffc2860bb4912828a8454291483ccf77888860
Component: engine
 2014-03-06 11:30:17 -08:00
Guillaume J. Charmes feec772c9b Merge pull request #4503 from unclejack/attempt_to_fix_apparmor_profile 
remove dbus from apparmor profile for Ubuntu 12.04
Upstream-commit: 31f62b934b7edc4942a6535d28954c0122748509
Component: engine
 2014-03-06 11:20:06 -08:00
Evan Krall e23e08e833 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)
Upstream-commit: 644acec2f7e3b144a423d0f0a6c900701abdc511
Component: engine
 2014-03-06 11:17:04 -08:00
Guillaume J. Charmes 9f58f80f28 Use CGO for apparmor profile switch 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: f0f833c6d795fc8b3fb4bb379f9916745f5c7ac9
Component: engine
 2014-03-06 11:10:58 -08:00
unclejack 22c0393b79 remove dbus from apparmor profile 
This removes the dbus entry from the apparmor profile Docker creates.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 46fdb6af8ecc804b204fc93ab6d8d4a5f7503860
Component: engine
 2014-03-06 19:47:03 +02:00