3fbfa38dfc
Fix apparent typo
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: 14b2b2b7c2db83ef1413a7469608f655cd15958e
Component: engine
2014-01-20 19:49:40 -08:00
185397ce27
Remove Flavor from KernelVersionInfo
...
Also change to parsing it with regexp to keep things simple.
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: d2c9c1036b94b0c3e7fa3f591fa83f9c95f49406
Component: engine
2014-01-20 19:49:39 -08:00
7e4afd3263
Add failing test for odd kernel version
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: fc30346086a890687d145c33aa8fb3d0ad6a4b7e
Component: engine
2014-01-20 19:49:39 -08:00
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
1f774297a3
Reordering to make FAQ last
...
Upstream-commit: 90b52b7e0623271ec0351ffb6dc7a7586bbe6e4d
Component: engine
2014-01-20 17:11:03 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
38cccce275
Resync bash completion to include all flags defined in the code, and to autocomplete properly on all parameters that are reasonably possible to do so on today
...
This also includes several new minor features that are interesting, so do explore a little. :)
Finally, this also fixes a few bugs where commands would complete parameters that they won't necessarily accept. We still have a few of these cases, but they're reduced to a minimum now.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: c6e43154f186c9fac8501016473b459db3130222
Component: engine
2014-01-20 00:28:55 -07:00
fc1cb79689
Fixes Issue# 3450
...
Docker-DCO-1.1-Signed-off-by: Gopikannan Venugopalsamy <gopikannan.venugopalsamy@gmail.com > (github: vgeta)
Upstream-commit: e45b87031c2b68ebbf98fdc02bace53ebe932148
Component: engine
2014-01-19 17:48:54 -08:00
24bf0702fc
add a little info about ghosts
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: b8cca8138b9aa10fd087e6ebb62ca03d1e820f2f
Component: engine
2014-01-20 10:37:06 +10:00
31abecb9fd
Add udev rules file to our generated deb package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 595b8f29869455432e14e58fcdd9c64bc74dd3fd
Component: engine
2014-01-19 17:27:43 -07:00
24ba808848
Merge pull request #3256 from alexlarsson/blkdiscard
...
Discard all data on devicemapper devices when deleting them
Upstream-commit: a60f0a07542b923f81adef2b56621a1eb712d008
Component: engine
2014-01-18 10:12:10 -08:00
068067c588
Fix Travis for PRs against non-master (like release, for example)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 980e0bf52c15bdf179c58b2d4f1085e26f8a3e2a
Component: engine
2014-01-18 10:41:37 -07:00
4100795860
refactor, remove useless buffers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 455495f7caf1bf2ff9ea1364bbf2362d9737b54c
Component: engine
2014-01-17 18:54:02 -08:00
83cca3f4a4
Merge pull request #3638 from tianon/update-mailmap-authors
...
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
Upstream-commit: dc359e07d3d48202c7fe6168bd6cf5ab5b2725e9
Component: engine
2014-01-17 18:19:41 -08:00
ce11258e8e
Fix rebase for init error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d5112ffce60625e470515578ccd446a191dd9e88
Component: engine
2014-01-17 17:42:58 -08:00
95062bc2c2
Add todos for driver changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5c30c4379af20b3cbd2d20cc9f0ccb6f04ac63ab
Component: engine
2014-01-17 17:42:58 -08:00
96611d5300
Make sure drivers are registerd within sysinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 97c84507054a7379c8f8b461773b9c8d4972902b
Component: engine
2014-01-17 17:42:58 -08:00
3a041a0663
Change drvier name to append version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cdfebc2a20e76d4ea81eb154b748e0547a7e7ab5
Component: engine
2014-01-17 17:42:58 -08:00
