Tianon Gravi
5a89c6f6df
Merge pull request #3192 from unclejack/update_virtualbox_guest_additions
...
vagrant: update & verify virtualbox guest tools
2013-12-12 21:22:29 -08:00
Michael Crosby
8224e13bd2
Merge pull request #3185 from vieux/job_tag
...
Move tag to job
2013-12-12 17:02:39 -08:00
Guillaume J. Charmes
912bf8ff92
Merge pull request #3015 from jpoimboe/dockerinit-libvirt-prereqs
...
dockerinit: drop capabilities
2013-12-12 15:49:21 -08:00
Victor Vieux
e43ff2f6f2
move tag to job
2013-12-12 11:52:11 -08:00
Josh Poimboeuf
b8f1c73705
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.
2013-12-12 13:47:24 -06:00
Josh Poimboeuf
1572989201
dockerinit: refactor error handling
2013-12-12 13:47:24 -06:00
Josh Poimboeuf
bd02d6e662
dockerinit: put args in a struct
2013-12-12 13:47:23 -06:00
Andy Rothfusz
2d1f61ef0e
Merge pull request #3190 from zain/master
...
Small typo fixes
2013-12-12 11:25:11 -08:00
Andy Rothfusz
54df95f26c
Merge pull request #3189 from aknikitin/patch-1
...
Minor spelling fix
2013-12-12 11:24:45 -08:00
Guillaume J. Charmes
5b33ae5971
Merge pull request #3145 from vieux/fix_docker_images
...
multiple fixed in docker images
2013-12-12 11:17:19 -08:00
unclejack
f216448c82
vagrant: update & verify virtualbox guest tools
2013-12-12 13:03:33 +02:00
Zain Memon
f26a9d456c
Small typo fixes
2013-12-12 01:23:16 -08:00
Anton Nikitin
bf5b949ffc
Minor spelling fix
2013-12-12 01:09:24 -05:00
Victor Vieux
621523a041
Merge pull request #3184 from creack/fix-volumes-on-host
...
Fix volumes on host
2013-12-11 18:06:25 -08:00
Guillaume J. Charmes
8fd9633a6b
Improve FollowLink to handle recursive link and be more strick
2013-12-11 17:19:02 -08:00
Victor Vieux
1124261158
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
2013-12-11 17:18:54 -08:00
Andy Rothfusz
b722f809e7
Merge pull request #3181 from lsm5/rhel-docs-typos
...
Rhel docs typos
2013-12-11 16:37:24 -08:00
Michael Crosby
f396c42cad
Fix volumes on the host by following symlinks in a scope
2013-12-11 16:31:02 -08:00
Lokesh Mandvekar
8874f2aef9
keeping rhel page sorta in sync with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 18:26:17 -06:00
Lokesh Mandvekar
e8ec3dba7b
remove step numbers, keep consistent with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 18:21:52 -06:00
Andy Rothfusz
4eda2a54de
Merge pull request #3177 from tianon/fix-turnbull-github
...
Fix James's github handle in docs/MAINTAINERS
2013-12-11 16:00:06 -08:00
Andy Rothfusz
d3292078dc
Merge pull request #3176 from lsm5/rhel-docs
...
Rhel docs
2013-12-11 15:58:42 -08:00
Lokesh Mandvekar
44984602c7
more typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:36:14 -06:00
Lokesh Mandvekar
d534e1c3a1
some typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:20:54 -06:00
Andy Rothfusz
d56d8ab96e
Merge pull request #3174 from richo/features/https_install_script
...
Use https to get the install script
2013-12-11 14:09:22 -08:00
Andy Rothfusz
6cf8ec606e
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
2013-12-11 14:04:34 -08:00
Lokesh Mandvekar
db3019d50b
rhel page keywords update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:00:46 -06:00
Lokesh Mandvekar
42c38bf34d
rhel description update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 15:59:35 -06:00
Andy Rothfusz
11b3fbb3bd
Merge pull request #3167 from qbrossard/patch-1
...
Corrected typo (resdis -> redis)
2013-12-11 13:57:59 -08:00
Andy Rothfusz
036f41fde3
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 :)
2013-12-11 13:57:13 -08:00
Andy Rothfusz
6e9c1590c6
Merge pull request #3162 from SvenDowideit/docker-commit-example-change-CMD
...
add a direct example for changing the cmd that is run
2013-12-11 13:52:12 -08:00
Tianon Gravi
39cc8a32b1
Fix James's github handle in docs/MAINTAINERS
2013-12-11 14:13:55 -07:00
Lokesh Mandvekar
31961ccd94
rhel page only for rhel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 14:36:12 -06:00
Lokesh Mandvekar
eec48f93a3
rhel docs update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 14:34:51 -06:00
Richo Healey
81fc368a6d
Use https to get the install script
2013-12-11 11:27:36 -08:00
Michael Crosby
bd292759f0
Merge pull request #3153 from vieux/improve_docker_push_display
...
Update docker push to use new display
2013-12-11 11:11:53 -08:00
Michael Crosby
5fd3c8204d
Merge pull request #2735 from shykes/engine-job-kill
...
New engine command: 'kill'
2013-12-11 10:35:57 -08:00
Quentin Brossard
af21908493
Corrected typo (resdis -> redis)
2013-12-11 13:15:27 +01:00
Sven Dowideit
7edd1f6bad
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 15:54:34 +10:00
Sven Dowideit
d878632b25
add a direct example for changing the cmd that is run
2013-12-11 12:07:07 +10:00
Sven Dowideit
be13735001
associate swapping the built docker binary with building the binary, rather than a note in building the docs
2013-12-11 11:12:11 +10:00
Andy Rothfusz
fb9ddc5de5
Merge pull request #3159 from SvenDowideit/make-docs-consistency
...
Makefile: make docs is more consistent
2013-12-10 16:51:35 -08:00
Sven Dowideit
27646c4459
make docs is more consistent
2013-12-11 10:14:56 +10:00
Victor Vieux
b98d51dddb
revert 'firstErr'
2013-12-10 15:37:03 -08:00
Victor Vieux
0025e9bd71
Merge pull request #3113 from shykes/engine-export
...
Move 'docker export' to the engine API
2013-12-10 13:28:24 -08:00
Victor Vieux
4c6e528f13
Merge pull request #3152 from daniel-garcia/3129_dont-open-bindmounted-files
...
don't open bind mounted files/dirs to get Stat, use os.Lstat
2013-12-10 11:05:39 -08:00
Victor Vieux
95f061b408
update docker push to use [====> ]
2013-12-10 10:57:16 -08:00
Daniel Garcia
761184df52
don't open bind mounted files/dirs to get Stat, use os.Lstat
2013-12-10 12:49:53 -06:00
Andy Rothfusz
8814c11b14
Merge pull request #3103 from metalivedev/1229-titleactions
...
Update "Use" titles to be action-oriented
2013-12-09 18:57:48 -08:00
Victor Vieux
09d2c2351c
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
2013-12-09 17:35:44 -08:00