fd15c72b59
Merge pull request #3289 from crosbymichael/add-mtu-option
...
Allow mtu to be configured at daemon start
Upstream-commit: aa619de748e2337f6bb7aac62c212811ac709c1e
Component: engine
2013-12-20 13:21:56 -08:00
5da4f518c9
Merge pull request #3300 from crosbymichael/fix-mountinfo-parsing
...
Only parse upto the mountpoint in mountinfo
Upstream-commit: 6fde28c2932c0f6691856df39ae5ca3f77ef0f22
Component: engine
2013-12-20 13:21:20 -08:00
eeb209ee58
Merge pull request #3291 from dineshs-altiscale/3282-sparse-files
...
Add -S option to tar for efficient sparse file handling
Upstream-commit: f4358fc647c8b6fa609447f45f332187aab6813b
Component: engine
2013-12-20 11:10:31 -08:00
70588a9762
Only parse upto the mountpoint in mountinfo
...
Upstream-commit: 8051b6c1a1f9c381d42f5c776020658700c63c57
Component: engine
2013-12-20 13:34:05 -05:00
44050b9219
Allow mtu to be configured at daemon start
...
Upstream-commit: 566ff54d0ddffbeb3ba2e5f1e400db8528faf0a7
Component: engine
2013-12-20 12:12:03 -05:00
0b51803275
Return error if Dockerfile is empty
...
Upstream-commit: f7ba1c34bb7670b1a8d761b73eb9a775fa0f6bbe
Component: engine
2013-12-20 14:13:52 +01:00
e69eef70c1
Add -S option to tar for efficient sparse file handling
...
Fixes issue #3282
Upstream-commit: 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593
Component: engine
2013-12-19 21:41:22 -08:00
31ff556216
Merge pull request #3286 from pandrew/3279-documentation-docker-inspect
...
Update docs to include images for docker inspect
Upstream-commit: efde305c05fe1969b6116f4ee777e5c37d30d139
Component: engine
2013-12-19 14:50:55 -08:00
cf1704f27a
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
Upstream-commit: 636dfc82b0c9aaddd5b0f5fb0f70797d5068c93e
Component: engine
2013-12-19 14:31:41 -08:00
6332a18092
Merge pull request #3273 from crosbymichael/set-mtu-in-dockerinit
...
Move MTU setting outside of lxc and set with netlink
Upstream-commit: 93abcc3a3b06171daedba8af95120d5c220d8712
Component: engine
2013-12-19 14:25:27 -08:00
c6dd97f16f
Merge pull request #3244 from codeaholics/remove-apt-errors-during-build
...
Tidy up some of the error messages from apt during build
Upstream-commit: c3ec6962847222ea66b90d4517c6339992399ac8
Component: engine
2013-12-19 13:28:56 -08:00
36b27a819f
Add Tianon as Makefile maintainer
...
Upstream-commit: cd89fe5c4f342adae870a04f04729e3b50ae20ea
Component: engine
2013-12-19 13:42:35 -07:00
506d5d5cf2
Merge pull request #3283 from jpoimboe/update-vendor.sh
...
add gosqlite to vendor.sh
Upstream-commit: 1636ed9826440e11dbcc4cd89a02082368896f78
Component: engine
2013-12-19 12:37:25 -08:00
f4c2be3a58
Update docs to include images for docker inspect
...
Upstream-commit: 8072d3a4e009f404fbc31507887c3418ea7327fc
Component: engine
2013-12-19 20:55:19 +01:00
d29d3cbd93
add gosqlite to vendor.sh
...
Add gosqlite and its latest revision to vendor.sh so that the vendor
directory can be reliably recreated.
Upstream-commit: d215724ad6f70a783cb00b77f3c1a0cf9f69c83e
Component: engine
2013-12-19 13:51:46 -06:00
0bf2305d2f
Move MTU setting outside of lxc and set with netlink
...
Upstream-commit: 0e6f0c4e02f4a29a1495f68f8aa52c5a10f587da
Component: engine
2013-12-19 11:51:44 -08:00
498aab65bc
Merge pull request #3284 from jamtur01/faqmore
...
Added some more items to the FAQ
Upstream-commit: 629cc2fce4a3c29cc0d1dea63d2c4729c729d001
Component: engine
2013-12-19 11:32:53 -08:00
b1321196bf
Added some more items to the FAQ
...
Upstream-commit: 8c52140059c83b9ef6f4f9336f162945cd360c4f
Component: engine
2013-12-19 14:27:47 -05:00
dbe3d58b07
Merge pull request #3271 from crosbymichael/mount-outside
...
Perform docker specific mounts outside of lxc
Upstream-commit: f21bd80e90af12745c7a8bf98d84ec50c3295987
Component: engine
2013-12-19 11:13:31 -08:00
12888b58b8
Merge pull request #3243 from alexlarsson/compressed-tar
...
Handle compressed tars in ApplyLayer
Upstream-commit: 4bdd4599f0aa539c3266e29917eef07ca38058b5
Component: engine
2013-12-19 11:02:32 -08:00
8622d70cfb
Merge pull request #3276 from tianon/cross-compile
...
Add new "cross" bundle to cross-compile the Docker client
Upstream-commit: ed93dab9a8d26efd2a6defe6dc60c9db045cb6c0
Component: engine
2013-12-19 10:41:12 -08:00
a7fc58e1eb
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
...
Upstream-commit: 62a81370fffb3cfdb15ef19702f0ea07ab2f4c36
Component: engine
2013-12-19 11:33:49 -07:00
bdfb29b00e
Merge pull request #3274 from tianon/tianon-dockerfile
...
Make Tianon the official root "Dockerfile" maintainer
Upstream-commit: e74c65c3db579c93d3cf4ead44db8ad2466ba95c
Component: engine
2013-12-19 10:31:00 -08:00
179f66cee2
Merge pull request #3277 from jpoimboe/fix-root-symlink
...
Move root symlink check to engine.New
Upstream-commit: 248eadd341a6a440a085791f8801494598647174
Component: engine
2013-12-19 10:24:23 -08:00
bb97c6f261
Merge pull request #3275 from crosbymichael/sqlite-import
...
Move sqlite conn to graph db for cross compile support
Upstream-commit: e829d5b6d2865417d3161370782176b19550d9d7
Component: engine
2013-12-19 10:18:30 -08:00
f633c6e7d1
Move root symlink check to engine.New
...
Since commit c91c365, when starting the docker daemon without an
existing /var/lib/docker directory, it fails with:
2013/12/18 23:39:36 Unable to canonicalize root (%!s(*string=0xc210077c80)): lstat /var/lib/docker: no such file or directory
Move the symlink checking code to engine.New after the root dir has been
created.
Upstream-commit: 94821a33534a25fe906f3f66e1c06b1f2c877aac
Component: engine
2013-12-19 00:39:12 -06:00
5fd54c24bc
Use box-drawing characters in docker images -tree
...
This makes the output of `docker images -tree` look a little prettier.
Previously it displayed a combination of box-drawing characters and pipe
characters, so the lines didn't quite connect...
Before:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
|─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
| └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
| └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
After:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
├─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
│ └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
│ └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
Upstream-commit: d14c162fd621da809baa48e8af007443c4f2ae0a
Component: engine
2013-12-18 22:30:21 -08:00
8a97983c9f
Make Tianon the official root "Dockerfile" maintainer, since it's so hard-locked to hack changes most of the time
...
Upstream-commit: 14d1c5a2c331f9abe4199b1064ff8f642981fa77
Component: engine
2013-12-18 22:29:48 -07:00
69bf3879ed
Move sqlite conn to graph db for cross compile support
...
Upstream-commit: 329d154209f8da83226e729222dafff4e214b25d
Component: engine
2013-12-18 21:14:16 -08:00
dd4dc32856
Improve interface by moving to subpkg
...
Enable builds on OSX
Upstream-commit: 7bc96aec7bf978e87cb87935bd55f85e2cb1664a
Component: engine
2013-12-18 16:42:49 -08:00
eb112b17e6
Fix unmount issues
...
Upstream-commit: a6fdc5d208b6726a33d30bd25ab115131a298b90
Component: engine
2013-12-18 15:24:08 -08:00
b713827b64
Merge pull request #3268 from vieux/prevent_panic_volume
...
prevent a panic with docker run -v /
Upstream-commit: 681b40c8014e8f9d14e7fa43a2d1b4a8d50f1f13
Component: engine
2013-12-18 14:06:44 -08:00
a1f6c20284
prevent a panic with docker run -v /
...
Upstream-commit: 536da93380f1cacb82c344ad09c2daaae29f8ac3
Component: engine
2013-12-18 13:57:49 -08:00
8eec37c741
Handle external mounts outside of lxc
...
Upstream-commit: 45d7dcfea276841cce782feced3a2eb3eab01208
Component: engine
2013-12-18 13:46:02 -08:00
a22a0e3adb
Merge pull request #3267 from vieux/debug_daemon_start
...
add some debug to runtime.restore()
Upstream-commit: 210fa0871c55f6e3f4fc4533008eb298d62981e4
Component: engine
2013-12-18 13:45:22 -08:00
ab9277b26a
Merge pull request #3263 from tianon/abspath-root
...
Canonicalize our root path before we try using it
Upstream-commit: f768c6adb766bda5a74e9a5131698e6a75c47882
Component: engine
2013-12-18 11:41:47 -08:00
766980f441
add some debug to runtime.restore()
...
Upstream-commit: fde909ffb8e09ae39310093b7389f61aa4ec29df
Component: engine
2013-12-18 10:57:21 -08:00
de668bdcfd
Merge pull request #3264 from creack/fix_osx_compilation
...
Fix osx compilation
Upstream-commit: 553b4dae453fccf3dee1e36099cc5bb67129f69f
Component: engine
2013-12-18 10:50:14 -08:00
70fa345719
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
...
Also, now that we use "-a", we no longer get any benefit from "go test -i", and it actually causes problems sometimes, so let's nuke it.
Upstream-commit: fbac8125408c076317f3f51239394cd6b7351b49
Component: engine
2013-12-18 11:32:25 -07:00
9b574d4dfb
Fix OSX compilation for aufs
...
Upstream-commit: e481c82fa9521ecc719b29b314543a205c0b53ec
Component: engine
2013-12-18 10:18:49 -08:00
f609f65b61
Fix OSX build for sysinit
...
Upstream-commit: 73a1ef7c22f5cde9db5e1292f1340885bf28e807
Component: engine
2013-12-18 10:16:48 -08:00
624a293ce3
Canonicalize our root path before we try using it, because we make assumptions about it not containing symlinks
...
Fixes #3242
Upstream-commit: c91c365f8860315d29a17368b78dcefb23674042
Component: engine
2013-12-18 11:15:09 -07:00
3222062547
archive: Re-add XZ compression support
...
This shells out to the xz binary to support .tar.xz layers, as
there is no compression/xz support in go.
Upstream-commit: b8a4f570fb31091f43caeba5b824ae38a5bc69e8
Component: engine
2013-12-18 10:50:22 +01:00
5f28e84d16
Merge pull request #3128 from codeaholics/1530-improve-error-message
...
Improve error message when refusing to remove image due to multiple repo tags
Upstream-commit: 70c7220a990ba522a12baed8d8c7aa06af7f8547
Component: engine
2013-12-17 20:49:25 -08:00
2ad1bde3a1
Merge pull request #3205 from cddr/Vagrantfile-typos
...
Fix typos in Vagrantfile
Upstream-commit: 0f45e3c6e0e090ee980b6decf6769feaf133f617
Component: engine
2013-12-17 20:41:53 -08:00
7b1b83e614
Merge pull request #3238 from tianon/go-build-a
...
Readd go build -a
Upstream-commit: be0beb897aeed280fe1964feaebe4411b5547fc8
Component: engine
2013-12-17 20:40:36 -08:00
a3e0fa246c
Add container name validation test
...
Upstream-commit: c06ab5f9c237a647120b9b3cc433e094676fe75a
Component: engine
2013-12-17 20:19:23 -05:00
b6d7266c64
DRY up valid container name pattern usage
...
Upstream-commit: 3ec39ad01a5823acbb3c4ce49ce5c81258a60815
Component: engine
2013-12-17 20:17:50 -05:00
3c037baf07
Add '.' to valid container name pattern
...
Upstream-commit: 1940015824f5dabf1e8ffbd0c2b7c09f11f8cdf0
Component: engine
2013-12-17 20:17:06 -05:00
7df1c5a0f0
Merge pull request #3234 from creack/default_unix_path
...
Default unix path
Upstream-commit: 1acefac97eafdb8e701763da8616b607be4f0510
Component: engine
2013-12-17 16:24:01 -08:00
