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
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
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
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
Victor Vieux
f1ea4ce449
Merge pull request #3113 from shykes/engine-export
...
Move 'docker export' to the engine API
Upstream-commit: 0025e9bd719b1cd8314543019ed8e6f6bc5c57cd
Component: engine
2013-12-10 13:28:24 -08:00
Victor Vieux
879ab073ea
update docker push to use [====> ]
...
Upstream-commit: 95f061b408eafbf981450d3fdb26ebc3188cba4a
Component: engine
2013-12-10 10:57:16 -08:00
Daniel Garcia
84ef86d05d
don't open bind mounted files/dirs to get Stat, use os.Lstat
...
Upstream-commit: 761184df5295b72c5d1ab4549dcddb54977da487
Component: engine
2013-12-10 12:49:53 -06:00
Andy Rothfusz
cdb25c470c
Merge pull request #3103 from metalivedev/1229-titleactions
...
Update "Use" titles to be action-oriented
Upstream-commit: 8814c11b140fbcda266c5168340431044f59aa30
Component: engine
2013-12-09 18:57:48 -08:00
Victor Vieux
8644761a3b
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
Upstream-commit: 09d2c2351c4b016d57f979990698838a94173ec4
Component: engine
2013-12-09 17:35:44 -08:00
Victor Vieux
4ef02ca4a1
fix size in -tree
...
Upstream-commit: c618a906a4a50b4cc76e9230f971d737a59b8c27
Component: engine
2013-12-09 17:27:05 -08:00
Andy Rothfusz
1bde8bd6e1
Fix #1229 . Update titles, fix some wrapping.
...
Make the Ambassador container explicit.
Apply Sven's suggestions.
Upstream-commit: 9c1e9a5157b3ef7627f4b735c2b8b6d97f26dd53
Component: engine
2013-12-09 17:23:56 -08:00
Andy Rothfusz
e09eb89d48
Merge pull request #3146 from jamtur01/linkedits
...
Some minor cleanup of the Links use document
Upstream-commit: 0b0b0ca0f915bcbe79923b313fb45be6253d8ade
Component: engine
2013-12-09 17:09:59 -08:00
Victor Vieux
af25bb8dd1
fix docker images -tree <invalid_image> and docker images -viz <image_name>
...
Upstream-commit: ac1093b83aee38243b0d6df3dd8aabc52062b9d2
Component: engine
2013-12-09 16:58:17 -08:00
James Turnbull
5584948c34
Some minor cleanup of the Links use document
...
Upstream-commit: c9cedb4c0484c3e1879495ab5c02088ae738763e
Component: engine
2013-12-09 16:47:19 -08:00
Victor Vieux
2ddcfd0b85
Merge pull request #2843 from shykes/engine-job-wait
...
New engine job:wait
Upstream-commit: a74be95b2397a17d2bf9683e011cb9f8f953fb4b
Component: engine
2013-12-09 16:36:23 -08:00
Andy Rothfusz
86975238fd
Merge pull request #3109 from artagnon/arch-install
...
Update Arch installation doc
Upstream-commit: b7bc80cba90ecfe75cd621f3d437e63e3ec3fd5d
Component: engine
2013-12-09 15:52:54 -08:00
Andy Rothfusz
6865b89ad2
Merge pull request #3104 from jamtur01/uses
...
Added section on Trusted Builds
Upstream-commit: 864729b96fbf3fa912d2686df79ec9baf15af856
Component: engine
2013-12-09 15:51:52 -08:00