Andy Rothfusz
8a428ead43
Merge pull request #3687 from shykes/docs-intro
...
docs: harmonize intro paragraph with website
Upstream-commit: fb919137bec47bb4922a2571a0f9410a5887c670
Component: engine
2014-01-21 11:02:55 -08:00
Andy Rothfusz
08877d190e
Merge pull request #3700 from jamtur01/fixedtoc
...
Fixed commandline/index warning in TOC
Upstream-commit: 31274ffccb954bde88c973719c949894cc02d314
Component: engine
2014-01-21 10:52:13 -08:00
Tianon Gravi
a290d454f3
Merge pull request #3671 from tianon/completion-ignore-stderr
...
Update bash completion to ignore stderr output of docker binary
Upstream-commit: 678d76fa9cd11dc57af405653b26be9323139e7f
Component: engine
2014-01-21 10:40:23 -08:00
Tianon Gravi
bbcbe4bcf1
Merge pull request #3459 from Barthalion/master
...
Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code
Upstream-commit: b23e6e99b38edf8453dbbcc21302cda6ff1d0cdf
Component: engine
2014-01-21 07:11:57 -08:00
Bartłomiej Piotrowski
7f4f60d7bd
mkimage-arch: provide and use own pacman.conf
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: 4137a0ea327ea1775c1b57892fd684da2c738f3e
Component: engine
2014-01-21 14:22:56 +01:00
James Turnbull
0d4fdafaa4
Fixed commandline/index warning in TOC
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: fabf96b8ff5560523d60269d0052b65037394dcc
Component: engine
2014-01-21 08:22:51 -05:00
Bartłomiej Piotrowski
94cf963f92
mkimage-arch: use hash to check if command is available
...
Apart from having more predictable return codes on various operating
systems, it additionally caches the path to application.
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: 787ff55283067ef3d8da3238e65ca204bc63b3f9
Component: engine
2014-01-21 14:22:47 +01:00
Bartłomiej Piotrowski
7ed82adb9b
mkimage-arch: don't generate ISO-8859-1 locale
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: da4ba80733ff4826ea17d253677a58fdedf4cc00
Component: engine
2014-01-21 14:22:39 +01:00
Bartłomiej Piotrowski
2034daa056
mkimage-arch: unify usage of brackets around variables
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: c6535d272c0d1a07ea51639be66e1959a0fc996f
Component: engine
2014-01-21 14:22:33 +01:00
Bartłomiej Piotrowski
5807b83360
mkimage-arch: remove $DEV instead of renaming it
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: a4e6e9bd41ee0f80e7e9bce05156ddd7d63554aa
Component: engine
2014-01-21 14:22:26 +01:00
Bartłomiej Piotrowski
80f16b65b6
mkimage-arch: use mktemp to create ROOTFS directory
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
Upstream-commit: c138c335a5d867d81231fdca6f418a9cc11ca244
Component: engine
2014-01-21 14:21:43 +01:00
Solomon Hykes
7cb035c53d
docs: harmonize intro paragraph with website
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: fdf43f5de14e1ddf9e806e78f51e98721b920b5d
Component: engine
2014-01-21 07:33:26 +00:00
Tianon Gravi
8056a9e2e7
Merge pull request #3662 from tianon/add-udev-to-deb
...
Add udev rules file to our generated deb package
Upstream-commit: a37ffa4041cb8504741ab2805d16f8b268772793
Component: engine
2014-01-20 19:44:05 -08:00
Andy Rothfusz
1f774297a3
Reordering to make FAQ last
...
Upstream-commit: 90b52b7e0623271ec0351ffb6dc7a7586bbe6e4d
Component: engine
2014-01-20 17:11:03 -08:00
Andy Rothfusz
1665fbf899
Merge pull request #3618 from shykes/docs-cleanup-install
...
Docs cleanup install
Upstream-commit: acf43b4da7c7f81f5774f341828b8b862f204c04
Component: engine
2014-01-20 17:10:02 -08:00
Andy Rothfusz
59aa210c0d
Merge pull request #3600 from SvenDowideit/ghost-status-doc
...
Ghost status doc
Upstream-commit: b38d3154c85bf66db7c84df58ce5c24696a841b5
Component: engine
2014-01-20 16:51:47 -08:00
Victor Vieux
6ba2547fb5
Merge pull request #3442 from DevTable/master
...
Fix support for registry auth with Dockerfile build.
Upstream-commit: ffe78e82c3e1288285266d9aeae387935b528777
Component: engine
2014-01-20 15:50:14 -08:00
Jake Moshenko
145ef0e1f4
Fix support for registry auth with Dockerfile build.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
Upstream-commit: 6e6ff85362dfa823c392392cb9e70d620e308911
Component: engine
2014-01-20 18:35:14 -05:00
Michael Crosby
d34a852586
Merge pull request #3685 from pnasrat/3679-cgroups-outside-lxc
...
Move Resources into exec driver
Upstream-commit: 37c1c7cf7ae2148fc1b87c27f5bc6828787b299b
Component: engine
2014-01-20 15:35:06 -08:00
Guillaume J. Charmes
3f3b1f9fb2
Merge pull request #3684 from crosbymichael/push-multiple-tags
...
Push multiple tags for repository
Upstream-commit: c2501942cfb5a169d40fd6e445e336ac3bc8c303
Component: engine
2014-01-20 15:24:53 -08:00
Solomon Hykes
28daf949e1
docs: reuse official dependencies list from packager's guide for custom binary install docs
...
Upstream-commit: 45e8d1f4c0366c5372229db20b95b70badc92119
Component: engine
2014-01-20 23:17:40 +00:00
Solomon Hykes
aec4036475
docs: remove out-of-date kernel requirements document.
...
Requirements differ from platform to platform depending on the plugins used, and so should be documented separately for each target platform
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 4e54dd245a5e20b86f305ccb8f493d7f17317c50
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
d1c858864a
docs: instead of a top-level 'upgrading docker' doc, add an 'upgrades' paragraph to each installation target
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: dd786eefbbf286ca57b52374a6905c1ac8b8bd60
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
07e461cf30
docs: change topic of windows install docs to 'install docker on windows'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 29e6868cc36356393730ff2a5ae4506ac2d162e1
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
61d0a6b6c9
docs: move 'vagrant' install docs to the more accurate 'mac' install docs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: c56e3b8569caa8db6fb7372c7a5f5153eb5d63b7
Component: engine
2014-01-20 23:11:30 +00:00
Solomon Hykes
19a30043af
docs: move security article to a new 'articles' section
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: d8a71635d4eb6b3dbe0102ab6e177bff8ff5dbec
Component: engine
2014-01-20 23:11:30 +00:00
Paul Nasrat
5de2521000
Don't expose cgroups via the execdriver API.
...
Use Resources to represent container limits rather than a cgroup specific field.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 71c1646ba33da9b2567ad7a2f4cda0433c9718dd
Component: engine
2014-01-20 17:06:24 -05:00
Michael Crosby
bcfdc65951
Merge pull request #3681 from pnasrat/extract-cgroups-pkg
...
Extract cgroups into pkg sub dir
Upstream-commit: fbd374f30b11a39ea24a7f3fddb6a50329e4ddd7
Component: engine
2014-01-20 14:00:44 -08:00
Andy Rothfusz
28e9f7be0b
Merge pull request #3650 from tianon/fix-doc-man-generation
...
Fix docs man page generation and add Dockerfile man page
Upstream-commit: 6dfbbaa4ffa91764ad4c332808d3cc9f76aa37b4
Component: engine
2014-01-20 13:44:01 -08:00
Michael Crosby
4963d0d960
Make sure new repositories can be pushed with multiple tags
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a2aab7757e236a895abf7b06836d8e3b84236429
Component: engine
2014-01-20 13:39:35 -08:00
Tianon Gravi
1c3b8811ea
Fix Travis build errors by bumping our python module versions to be newer
...
See also https://bitbucket.org/birkenfeld/sphinx/issue/1281/sphinx-113-not-build-proper-manpages
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6ed9b06e072888d1e7bd60106f17371a89b668a4
Component: engine
2014-01-20 12:30:18 -07:00
Michael Crosby
c2c845ecd8
Merge branch 'fix-registry-push-tags' of https://github.com/codeaholics/docker into codeaholics-fix-registry-push-tags
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 03a25c0800691806534d96f108856097e9c18d6b
Component: engine
2014-01-20 11:23:09 -08:00
Paul Nasrat
c8d1294225
Extract cgroups pkg.
...
Initial move before enhancing cgroups package.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 2553029959929184696e25ebdba4631ba7aeb8a6
Component: engine
2014-01-20 14:15:44 -05:00
Victor Vieux
c45dd55039
Merge pull request #3665 from vgeta/3450-fix
...
Fixes Issue #3450
Upstream-commit: 69be8adb6830f8631f7fd35ebed6783963c79b28
Component: engine
2014-01-20 11:10:54 -08:00
Guillaume J. Charmes
d4c3241336
Merge pull request #3292 from alexlarsson/export-changes-manual
...
Don't shell out to tar for ExportChanges
Upstream-commit: b563c0c02b563d72f32a4e4c6fac5aaba34bc287
Component: engine
2014-01-20 11:08:16 -08:00
Michael Crosby
ca8c167948
Merge pull request #3680 from pnasrat/extract-mount-pkg
...
Extract mount into pkg.
Upstream-commit: 0f0e5824903ccaa543eb1126d5da655e5f6c878d
Component: engine
2014-01-20 11:04:16 -08:00
Paul Nasrat
20e6d0be01
Extract mount into pkg.
...
Mount is self contained and generic, it should be in pkg, to allow other pkg modules to use it.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
Upstream-commit: 2e094db6390dde57263c07665290b1477bb6df7e
Component: engine
2014-01-20 13:59:29 -05:00
Guillaume J. Charmes
a169b77a82
Merge pull request #3295 from alexlarsson/implement-untar
...
Implement UnTar via archive/tar
Upstream-commit: 3aa27eb055f75d6e92bf4860f632aee61c2b3f87
Component: engine
2014-01-20 10:54:42 -08:00
Guillaume J. Charmes
760a549e35
Merge pull request #3678 from creack/sysinfo_update
...
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
Upstream-commit: a431f1703d709043f070fd6bbb8aaba24de2efb8
Component: engine
2014-01-20 10:39:37 -08:00
Michael Crosby
834c1cb5f1
Merge pull request #3649 from vieux/remove_buffers
...
refactor, remove useless buffers
Upstream-commit: f87a67a3a85189756ece90cd7ac5eef2c0ad51a8
Component: engine
2014-01-20 10:29:54 -08:00
Tianon Gravi
38c688ffeb
Update Travis to also compile the man page(s) now that they compile properly again
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 274863f221b55f2eb60fde7457e30998438a3f72
Component: engine
2014-01-20 11:29:24 -07:00
Tianon Gravi
cafba118e5
Add Dockerfile man page generation from our Dockerfile reference page
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 1c152f443df254e18d44790cd0dbfb6f6361e018
Component: engine
2014-01-20 11:29:07 -07:00
Tianon Gravi
03deebf0c1
Fix docs manpage generation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 10fc518fba8bf0f4a32cb1824664abfbacf5d884
Component: engine
2014-01-20 11:29:07 -07:00
Tianon Gravi
b63f338a88
Merge pull request #3656 from tianon/travis-test-docs
...
Update Travis to also test compiling the docs
Upstream-commit: 4fb507d7568fa38f1e717f79ae2606a4f7ce6e9f
Component: engine
2014-01-20 10:28:44 -08:00
Tianon Gravi
e1a1963ce9
Update Travis to also test compiling the docs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fe02d589272e61f75c9e794afb82641e78dfe8a3
Component: engine
2014-01-20 11:24:38 -07:00
Tianon Gravi
f7349c8f1e
Merge pull request #3652 from tianon/fix-travis-on-non-master-prs
...
Fix Travis for PRs against non-master (like release, for example)
Upstream-commit: 3bd36157a10bbbe8fbdca14aefb03496a225e0be
Component: engine
2014-01-20 10:21:50 -08:00
Guillaume J. Charmes
642babd6eb
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: ff662446f774d573442baa526263544df2570ebf
Component: engine
2014-01-20 10:20:29 -08:00
Tianon Gravi
3db540f2fc
Update bash completion to ignore stderr output of docker binary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 9152aab653294f8f8b2f206a2ccc3c8603f33d0c
Component: engine
2014-01-20 01:26:01 -07:00
Victor Vieux
f8a6d99b37
Merge pull request #3669 from tianon/new-flags-completion
...
Update New Flags Completion
Upstream-commit: cfd3d027373557a3605fb9aaaa581adaca419a93
Component: engine
2014-01-20 00:12:40 -08:00
Tianon Gravi
98435ab7c4
Switch docker run --username to docker run --user which is more accurate (while we can still do so without breaking anyone's scripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fb981bdace66e5b34d41125beb16e450998fd1e7
Component: engine
2014-01-20 00:28:55 -07:00