toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,084 Commits 3 Branches 295 Tags
11c5775babcae416cd785c740de4e567e1478f7c
Commit Graph
5084 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux 11c5775bab Merge branch 'libvirt-prereq-network' of https://github.com/jpoimboe/docker 
Upstream-commit: 20759c3ef7d8a0425ecd0642269fde8ae73aa4cf
Component: engine
 2013-12-13 10:34:09 -08:00
Victor Vieux 30b9f2c469 Merge pull request #3202 from jpoimboe/libvirt-prereq-env 
dockerinit: propagate "container" env variable from lxc
Upstream-commit: 5d817767146b68194003eeab1ac2ec540d3503bf
Component: engine
 2013-12-13 10:32:17 -08:00
Tianon Gravi 43ef2dfb91 Merge pull request #3151 from tianon/more-debootstrap-tweaks 
Update mkimage-debootstrap with even more tweaks for keeping images tiny...
Upstream-commit: 0ef1ff91cbcb48463a0cfdfb6fb040e7beadd045
Component: engine
 2013-12-13 09:28:11 -08:00
Tianon Gravi 52ac1dad3b Merge pull request #3192 from unclejack/update_virtualbox_guest_additions 
vagrant: update & verify virtualbox guest tools
Upstream-commit: 5a89c6f6dffdcaa4d24b331ca233afccebdf6cc4
Component: engine
 2013-12-12 21:22:29 -08:00
Josh Poimboeuf 8538072ed6 dockerinit: propagate "container" env variable from lxc 
Lxc (and libvirt) already set the "container" env variable
appropriately[1], so just use that.

[1] http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
Upstream-commit: e8772943215fff3e17642ad410e4815e40e96b8b
Component: engine
 2013-12-12 20:08:58 -06:00
Josh Poimboeuf bfaa130f9b dockerinit: set IP address 
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
Upstream-commit: ecc51cd465da56b38190fe852cf9f31bdfbb0fdc
Component: engine
 2013-12-12 19:57:11 -06:00
Josh Poimboeuf 50a1369b02 dockerinit: set hostname 
Set the hostname in dockerinit instead of with lxc utils.  libvirt-lxc
doesn't have a way to do this, so do it in a common place.
Upstream-commit: f7c7f7978cf0ca94da5cc68ec2634b5a22ae329c
Component: engine
 2013-12-12 19:56:05 -06:00
Michael Crosby 5570b7b013 Merge pull request #3185 from vieux/job_tag 
Move tag to job
Upstream-commit: 8224e13bd25a41c3e3d8755edd3a754cd060adee
Component: engine
 2013-12-12 17:02:39 -08:00
Guillaume J. Charmes 2eae46daad Merge pull request #3015 from jpoimboe/dockerinit-libvirt-prereqs 
dockerinit: drop capabilities
Upstream-commit: 912bf8ff92a684400f094e12ee69c68510ebd5b4
Component: engine
 2013-12-12 15:49:21 -08:00
Victor Vieux 07befa45fc move tag to job 
Upstream-commit: e43ff2f6f2630f971c9494aed285f1d410e42df9
Component: engine
 2013-12-12 11:52:11 -08:00
Josh Poimboeuf 161e9b78f9 dockerinit: drop capabilities 
Drop capabilities in dockerinit instead of with lxc utils, since
libvirt-lxc doesn't support it.

This will also be needed for machine container mode, since dockerinit
needs CAP_SYS_ADMIN to setup /dev/console correctly.
Upstream-commit: b8f1c7370516a4eec0d3168d594a7d7d92e7f8e9
Component: engine
 2013-12-12 13:47:24 -06:00
Josh Poimboeuf a0c18beb35 dockerinit: refactor error handling 
Upstream-commit: 1572989201cc54dc87d961fe9c5d6850c61d47b9
Component: engine
 2013-12-12 13:47:24 -06:00
Josh Poimboeuf 22678e4bed dockerinit: put args in a struct 
Upstream-commit: bd02d6e662fdf197665a92663854c629c4dda747
Component: engine
 2013-12-12 13:47:23 -06:00
Andy Rothfusz 6c5256e4e3 Merge pull request #3190 from zain/master 
Small typo fixes
Upstream-commit: 2d1f61ef0ec93539fd55f27cbd6f08ef0f0f33d2
Component: engine
 2013-12-12 11:25:11 -08:00
Andy Rothfusz b89adb4dee Merge pull request #3189 from aknikitin/patch-1 
Minor spelling fix
Upstream-commit: 54df95f26c8fcb9bf4f90974e98188f4142e82b4
Component: engine
 2013-12-12 11:24:45 -08:00
Guillaume J. Charmes 8ac6f87f86 Merge pull request #3145 from vieux/fix_docker_images 
multiple fixed in docker images
Upstream-commit: 5b33ae5971ae1071ba377ec1761956a05bf7b21e
Component: engine
 2013-12-12 11:17:19 -08:00
unclejack a7508a8385 vagrant: update & verify virtualbox guest tools 
Upstream-commit: f216448c823d1aa3dd661935d60da390d463039d
Component: engine
 2013-12-12 13:03:33 +02:00
Zain Memon 641d703cbd Small typo fixes 
Upstream-commit: f26a9d456ca267b0346077b98fc447b99319d8b9
Component: engine
 2013-12-12 01:23:16 -08:00
Anton Nikitin 147d85142c Minor spelling fix 
Upstream-commit: bf5b949ffc005127399db51f8f49c3c8cc4736bc
Component: engine
 2013-12-12 01:09:24 -05:00
Victor Vieux e69094c61d Merge pull request #3184 from creack/fix-volumes-on-host 
Fix volumes on host
Upstream-commit: 621523a04155401888b08265fbc1f51e7f7aeb10
Component: engine
 2013-12-11 18:06:25 -08:00
Guillaume J. Charmes bf9ceb198b Improve FollowLink to handle recursive link and be more strick 
Upstream-commit: 8fd9633a6bb136af6666626a76056b1592fef0c7
Component: engine
 2013-12-11 17:19:02 -08:00
Victor Vieux 4c119b77b9 Merge pull request #3144 from codeaholics/643-stale-nfs-handle 
Prevent deletion of image if ANY container is depending on it; not just running containers
Upstream-commit: 1124261158721f5db51b4da6ea77a7d3c51ff82a
Component: engine
 2013-12-11 17:18:54 -08:00
Andy Rothfusz b0f69a4755 Merge pull request #3181 from lsm5/rhel-docs-typos 
Rhel docs typos
Upstream-commit: b722f809e751dd33371c46e3fe63c63aea405724
Component: engine
 2013-12-11 16:37:24 -08:00
Michael Crosby 19acae63e7 Fix volumes on the host by following symlinks in a scope 
Upstream-commit: f396c42cad2b23dae5e3296c18fd6190f210c022
Component: engine
 2013-12-11 16:31:02 -08:00
Lokesh Mandvekar 80136f3a4a keeping rhel page sorta in sync with fedora 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 8874f2aef9ed12574160394fd7a6a254c0ef0526
Component: engine
 2013-12-11 18:26:17 -06:00
Lokesh Mandvekar 8caad93e85 remove step numbers, keep consistent with fedora 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: e8ec3dba7b1eb9254a04c852ffe7d98d10d0d476
Component: engine
 2013-12-11 18:21:52 -06:00
Andy Rothfusz a47c0933c1 Merge pull request #3177 from tianon/fix-turnbull-github 
Fix James's github handle in docs/MAINTAINERS
Upstream-commit: 4eda2a54de9d1033d5be4925ae4aa6fb3b4508d9
Component: engine
 2013-12-11 16:00:06 -08:00
Andy Rothfusz b20c07a32a Merge pull request #3176 from lsm5/rhel-docs 
Rhel docs
Upstream-commit: d3292078dc501b8afc94c87554184789757586e7
Component: engine
 2013-12-11 15:58:42 -08:00
Lokesh Mandvekar 256dcd7255 more typo corrections 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 44984602c7c7460454531c22ee4dfab2a34fa334
Component: engine
 2013-12-11 16:36:14 -06:00
Lokesh Mandvekar 51019ea44e some typo corrections 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: d534e1c3a1e00786d63e9dbeffceb6ab7f51c92b
Component: engine
 2013-12-11 16:20:54 -06:00
Andy Rothfusz 1f4103a07d Merge pull request #3174 from richo/features/https_install_script 
Use https to get the install script
Upstream-commit: d56d8ab96eff194619624a5b09749ebb960743ad
Component: engine
 2013-12-11 14:09:22 -08:00
Andy Rothfusz ef604cf7d9 Merge pull request #3161 from SvenDowideit/make-replace-docker-binary-note-more-obvious 
associate swapping the built docker binary with building the binary, rather than a note in building the docs
Upstream-commit: 6cf8ec606ee6826c65efe4275cd819002bacb9a5
Component: engine
 2013-12-11 14:04:34 -08:00
Lokesh Mandvekar 18d434e8aa rhel page keywords update 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: db3019d50b7a38dd52d8ad959017c63b04f11462
Component: engine
 2013-12-11 16:00:46 -06:00
Lokesh Mandvekar f68960fa0e rhel description update 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 42c38bf34dff7a5af4c75646b7252d3ecbdd334a
Component: engine
 2013-12-11 15:59:35 -06:00
Andy Rothfusz 851d8d4fe9 Merge pull request #3167 from qbrossard/patch-1 
Corrected typo (resdis -> redis)
Upstream-commit: 11b3fbb3bdedfeb65ae002a6feaa336a7a8c7c5b
Component: engine
 2013-12-11 13:57:59 -08:00
Andy Rothfusz 562bdffce3 Merge pull request #3165 from SvenDowideit/cmd-rmi-example 
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
Upstream-commit: 036f41fde395d0f567b08996836aeb7e217729f3
Component: engine
 2013-12-11 13:57:13 -08:00
Andy Rothfusz 958e22180f Merge pull request #3162 from SvenDowideit/docker-commit-example-change-CMD 
add a direct example for changing the cmd that is run
Upstream-commit: 6e9c1590c6f992d76aa507233f059fc0d5d5bf4d
Component: engine
 2013-12-11 13:52:12 -08:00
Tianon Gravi b98e3d0286 Fix James's github handle in docs/MAINTAINERS 
Upstream-commit: 39cc8a32b1dcf6dcb9462fbc2768ae035e8095dc
Component: engine
 2013-12-11 14:13:55 -07:00
Lokesh Mandvekar 17c7de8491 rhel page only for rhel 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 31961ccd94bc2d0941d3062591206a58b3b451a1
Component: engine
 2013-12-11 14:36:12 -06:00
Lokesh Mandvekar c55d5472f2 rhel docs update 
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: eec48f93a36873b8255c1c533b0d2bfbd742f9fa
Component: engine
 2013-12-11 14:34:51 -06:00
Richo Healey a47c99e75e Use https to get the install script 
Upstream-commit: 81fc368a6d70ef369bd16a3c090c6910851faacf
Component: engine
 2013-12-11 11:27:36 -08:00
Michael Crosby d332e70646 Merge pull request #3153 from vieux/improve_docker_push_display 
Update docker push to use new display
Upstream-commit: bd292759f03688cfa22f885572cae6e5cbfc4d77
Component: engine
 2013-12-11 11:11:53 -08:00
Michael Crosby 5cde259caa Merge pull request #2735 from shykes/engine-job-kill 
New engine command: 'kill'
Upstream-commit: 5fd3c8204de3a8188097add6a75ca70536e1375a
Component: engine
 2013-12-11 10:35:57 -08:00
Quentin Brossard 8abc4cd131 Corrected typo (resdis -> redis) 
Upstream-commit: af21908493e570a1399bbd462803398ef34e56bc
Component: engine
 2013-12-11 13:15:27 +01:00
Sven Dowideit 288950b62c add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :) 
Upstream-commit: 7edd1f6bad752dd89eeaa3690e219dfa748afa9c
Component: engine
 2013-12-11 15:54:34 +10:00
Sven Dowideit 923bfddec3 add a direct example for changing the cmd that is run 
Upstream-commit: d878632b2548247fc9e4c2da1b2520e4c7b9420a
Component: engine
 2013-12-11 12:07:07 +10:00
Sven Dowideit baafd9623d associate swapping the built docker binary with building the binary, rather than a note in building the docs 
Upstream-commit: be137350018608bf4a1fd01ce956f166c39988c4
Component: engine
 2013-12-11 11:12:11 +10:00
Andy Rothfusz 1e4a06b36d Merge pull request #3159 from SvenDowideit/make-docs-consistency 
Makefile: make docs is more consistent
Upstream-commit: fb9ddc5de5477a88c236963e5ac4dc6f054115ff
Component: engine
 2013-12-10 16:51:35 -08:00
Sven Dowideit 0675a87be6 make docs is more consistent 
Upstream-commit: 27646c445951b47a728675764d7ef2b198436156
Component: engine
 2013-12-11 10:14:56 +10:00
Victor Vieux 56c52707db revert 'firstErr' 
Upstream-commit: b98d51dddb081e4bf4f54cbc9c48ef123c2254d0
Component: engine
 2013-12-10 15:37:03 -08:00