Gurjeet Singh
d526038503
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 09:17:16 -05:00
James Turnbull
58daccab26
Updated Introduction link
...
Previously the introduction link pointed to www.docker.io. That
did not seem to make a lot of sense to me so instead I pointed it
at:
http://www.docker.io/learn_more/
2013-12-15 03:13:41 -05:00
unclejack
12fb508262
install vbox guest additions if not latest
2013-12-14 16:00:52 +02:00
Sven Dowideit
0a3eedd4c9
when sharing a /var/lib/docker dir with more than one distribution, an existing lxc-start-unconfined softlink may point to a non-existant path, following that link (as Stat does) will cause the daemon to fail to start
2013-12-14 15:29:08 +10:00
Guillaume J. Charmes
a6928e70ac
Merge pull request #3197 from ajhager/3138-names
...
Validate container names on creation. Fixes #3138
2013-12-13 17:28:36 -08:00
Guillaume J. Charmes
20197385b2
Merge pull request #3173 from vieux/docker_info_job
...
Move info to job
2013-12-13 17:27:59 -08:00
Victor Vieux
85b9338205
add GetenvInt64 ans SetenvInt64
2013-12-13 16:29:22 -08:00
Victor Vieux
51e2c1794b
move docker info to the job api
2013-12-13 16:15:15 -08:00
Guillaume J. Charmes
20899cdb34
Merge pull request #3183 from vieux/job_commit
...
Move commit to job
2013-12-13 16:11:58 -08:00
Guillaume J. Charmes
f5ab2516d8
Merge pull request #2897 from crosbymichael/aufs-42
...
Increase max image depth to 127
2013-12-13 16:03:57 -08:00
Victor Vieux
d5f5ecb658
improve GetenvJson
2013-12-13 16:02:19 -08:00
Victor Vieux
4b5ceb0f24
use args
2013-12-13 14:29:27 -08:00
Andy Rothfusz
906b481148
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
2013-12-13 14:29:14 -08:00
Victor Vieux
930ec9f52c
move commit to job
2013-12-13 14:19:56 -08:00
Guillaume J. Charmes
aaa1c48d24
Merge pull request #3175 from vieux/engine-job-stop
...
Move stop to job
2013-12-13 14:15:58 -08:00
Victor Vieux
d7123a597f
Merge pull request #3214 from dotcloud/shykes_maintainer
...
Temporarily remove @shykes from engine/MAINTAINERS
2013-12-13 14:03:08 -08:00
Guillaume J. Charmes
9a9ecda7c8
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
2013-12-13 13:56:35 -08:00
Guillaume J. Charmes
071338172c
Merge pull request #3187 from vieux/resize_job
...
Move resize to job
2013-12-13 13:55:23 -08:00
Victor Vieux
4975c1b549
Temporarily remve @shykes from engine/MAINTAINERS
2013-12-13 13:51:20 -08:00
Victor Vieux
73e8a39ff2
move resize to job
2013-12-13 13:15:39 -08:00
Victor Vieux
847cf5b599
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 13:15:22 -08:00
Michael Crosby
bf91636558
Merge pull request #3210 from rsampaio/fix_bridge_creation_3141
...
Bridge creation when ipv6 is not enabled
2013-12-13 12:03:55 -08:00
Andy Rothfusz
1e85aabf71
Fix #1695 by adding more about logging.
2013-12-13 11:42:58 -08:00
Michael Crosby
4fe0a9b6a0
Merge pull request #3211 from tianon/hack-make-cover
...
Add new cover bundlescript for giving a nice report across all the coverprofiles
2013-12-13 11:17:03 -08:00
Joseph Hager
f63cdf0260
Validate container names on creation. Fixes #3138
...
Move valid container name regex to the top of the file
Added hyphen as a valid rune in container names.
Remove group in valid container name regex.
2013-12-13 14:14:05 -05:00
Victor Vieux
9fb1ba97b1
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 11:06:20 -08:00
Tianon Gravi
59dc2876a7
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
2013-12-13 11:59:54 -07:00
Tianon Gravi
23ab0af2ff
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
2013-12-13 10:55:49 -08:00
Victor Vieux
b8a16b3459
Merge pull request #3194 from tianon/tianon-hack-maintainer
...
Make Tianon the hack maintainer
2013-12-13 10:55:07 -08:00
Rodrigo Vaz
a530b8d981
fix #3141 Bridge creation when ipv6 is not enabled
2013-12-13 16:39:49 -02:00
Victor Vieux
89beb55c32
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 10:38:26 -08:00
Victor Vieux
f9328ad9cc
Merge pull request #3201 from jpoimboe/libvirt-prereq-network
...
Set hostname and IP address from dockerinit
2013-12-13 10:38:17 -08:00
Victor Vieux
20759c3ef7
Merge branch 'libvirt-prereq-network' of https://github.com/jpoimboe/docker
2013-12-13 10:34:09 -08:00
Victor Vieux
5d81776714
Merge pull request #3202 from jpoimboe/libvirt-prereq-env
...
dockerinit: propagate "container" env variable from lxc
2013-12-13 10:32:17 -08:00
Tianon Gravi
0ef1ff91cb
Merge pull request #3151 from tianon/more-debootstrap-tweaks
...
Update mkimage-debootstrap with even more tweaks for keeping images tiny...
2013-12-13 09:28:11 -08:00
WarheadsSE
a68d7f3d70
Add -bip flag: allow specification of dynamic bridge IP via CIDR
...
e.g.:
```
docker -d -bip "10.10.0.1/16"
```
If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
2013-12-13 10:47:19 -05:00
Alexander Larsson
a8af12f80a
Re-enable TestApplyLayer
...
With the previous two changes we now pass this test.
2013-12-13 15:50:25 +01:00
Alexander Larsson
10cd902f90
Fix change detection when applying tar layers
...
The default gnu tar format has no sub-second precision mtime support,
and the golang tar writer currently doesn't support that either.
This means if we export the changes from a container we will not
get zeron in the sub-second precision field when the change is applied.
This means we can't compare that to the original without getting a
spurious change. So, we detect this case by treating a case where the
seconds match and either of the two nanoseconds are zero as equal.
2013-12-13 15:46:41 +01:00
Alexander Larsson
818c249bae
archive: Implement ApplyLayer directly
...
Rather than calling out to tar we use the golang tar parser
to directly extract the tar files. This has two major advantages:
1) We're able to replace an existing directory with a file in the
new layer. This currently breaks with the external tar, since
it refuses to recursively remove the destination directory in
this case, and there are no options to make it do that.
2) We avoid extracting the whiteout files just to later remove them.
2013-12-13 15:43:50 +01:00
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
Andy Chambers
2e6dbe87ad
Fix typos in Vagrantfile
2013-12-13 00:09:05 -05:00
Josh Poimboeuf
e877294321
dockerinit: propagate "container" env variable from lxc
...
Lxc (and libvirt) already set the "container" env variable
appropriately[1], so just use that.
[1] http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
2013-12-12 20:08:58 -06:00
Josh Poimboeuf
ecc51cd465
dockerinit: set IP address
...
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
2013-12-12 19:57:11 -06:00
Josh Poimboeuf
f7c7f7978c
dockerinit: set hostname
...
Set the hostname in dockerinit instead of with lxc utils. libvirt-lxc
doesn't have a way to do this, so do it in a common place.
2013-12-12 19:56:05 -06: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