Guillaume J. Charmes
8638e1b670
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
Upstream-commit: 9a9ecda7c8034534130a37a469a66e90c51799f8
Component: engine
2013-12-13 13:56:35 -08:00
Guillaume J. Charmes
2036f3cda3
Merge pull request #3187 from vieux/resize_job
...
Move resize to job
Upstream-commit: 071338172cd0fb8fea8b4c2d84ee16a7ab0b6012
Component: engine
2013-12-13 13:55:23 -08:00
Victor Vieux
dd90d88abc
Temporarily remve @shykes from engine/MAINTAINERS
...
Upstream-commit: 4975c1b54980517b5527278e637f3c05dd6a32db
Component: engine
2013-12-13 13:51:20 -08:00
Victor Vieux
9575d9c5e7
move resize to job
...
Upstream-commit: 73e8a39ff219833ebb28c12dc318466e3551b5bd
Component: engine
2013-12-13 13:15:39 -08:00
Victor Vieux
089f5a651b
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 847cf5b5994152b7cd0d9fb86cfe0757afe3473d
Component: engine
2013-12-13 13:15:22 -08:00
Michael Crosby
e2926099e1
Merge pull request #3210 from rsampaio/fix_bridge_creation_3141
...
Bridge creation when ipv6 is not enabled
Upstream-commit: bf916365589aa907c6ce486d5cae66f7a4da1419
Component: engine
2013-12-13 12:03:55 -08:00
Andy Rothfusz
a0d092fa16
Fix #1695 by adding more about logging.
...
Upstream-commit: 1e85aabf710b2bc8d47027973fe19f4f10a5ba1e
Component: engine
2013-12-13 11:42:58 -08:00
Michael Crosby
52621c8ff3
Merge pull request #3211 from tianon/hack-make-cover
...
Add new cover bundlescript for giving a nice report across all the coverprofiles
Upstream-commit: 4fe0a9b6a0c96541b5daa2af2b915b0c15a6787d
Component: engine
2013-12-13 11:17:03 -08:00
Joseph Hager
acf919be05
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.
Upstream-commit: f63cdf0260cf6287d28a589a79d3f947def6a569
Component: engine
2013-12-13 14:14:05 -05:00
Victor Vieux
14b8795f59
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 9fb1ba97b175867da1028a5955ccee5378ffd835
Component: engine
2013-12-13 11:06:20 -08:00
Tianon Gravi
6a19f653da
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
...
Upstream-commit: 59dc2876a7d2ac0e231d7d97511e572a1d739136
Component: engine
2013-12-13 11:59:54 -07:00
Tianon Gravi
433f293713
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
Upstream-commit: 23ab0af2ff3083f475b67787cc5619ead5524948
Component: engine
2013-12-13 10:55:49 -08:00
Victor Vieux
8b030b6f33
Merge pull request #3194 from tianon/tianon-hack-maintainer
...
Make Tianon the hack maintainer
Upstream-commit: b8a16b34599b9497615606de733a4f6452683b5e
Component: engine
2013-12-13 10:55:07 -08:00
Rodrigo Vaz
c85e5831b2
fix #3141 Bridge creation when ipv6 is not enabled
...
Upstream-commit: a530b8d9818126e04207de619af8578a4ec4c590
Component: engine
2013-12-13 16:39:49 -02:00
Victor Vieux
e0758c49a0
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 89beb55c3261ad7224f383884b2e084532b0e3bf
Component: engine
2013-12-13 10:38:26 -08:00
Victor Vieux
1beb5ed6c0
Merge pull request #3201 from jpoimboe/libvirt-prereq-network
...
Set hostname and IP address from dockerinit
Upstream-commit: f9328ad9cc5ecf2b1fcbf0c5b181907141149e4f
Component: engine
2013-12-13 10:38:17 -08:00
Victor Vieux
11c5775bab
Merge branch 'libvirt-prereq-network' of https://github.com/jpoimboe/docker
...
Upstream-commit: 20759c3ef7d8a0425ecd0642269fde8ae73aa4cf
Component: engine
2013-12-13 10:34:09 -08:00
Victor Vieux
30b9f2c469
Merge pull request #3202 from jpoimboe/libvirt-prereq-env
...
dockerinit: propagate "container" env variable from lxc
Upstream-commit: 5d817767146b68194003eeab1ac2ec540d3503bf
Component: engine
2013-12-13 10:32:17 -08:00
Tianon Gravi
43ef2dfb91
Merge pull request #3151 from tianon/more-debootstrap-tweaks
...
Update mkimage-debootstrap with even more tweaks for keeping images tiny...
Upstream-commit: 0ef1ff91cbcb48463a0cfdfb6fb040e7beadd045
Component: engine
2013-12-13 09:28:11 -08:00
WarheadsSE
ca9e7bd94d
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.
Upstream-commit: a68d7f3d70ab1638fd5b63a3026b211cb4e7a65e
Component: engine
2013-12-13 10:47:19 -05:00
Alexander Larsson
7bf68dd3de
Re-enable TestApplyLayer
...
With the previous two changes we now pass this test.
Upstream-commit: a8af12f80a4a1678988b4667e5211d4e576ce903
Component: engine
2013-12-13 15:50:25 +01:00
Alexander Larsson
51b58640b0
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.
Upstream-commit: 10cd902f900392a2f10a6f8763bba70607ea0d41
Component: engine
2013-12-13 15:46:41 +01:00
Alexander Larsson
e5d96fb523
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.
Upstream-commit: 818c249bae8d29842834bf765299c86c09e6913e
Component: engine
2013-12-13 15:43:50 +01:00
Tianon Gravi
52ac1dad3b
Merge pull request #3192 from unclejack/update_virtualbox_guest_additions
...
vagrant: update & verify virtualbox guest tools
Upstream-commit: 5a89c6f6dffdcaa4d24b331ca233afccebdf6cc4
Component: engine
2013-12-12 21:22:29 -08:00
Andy Chambers
83a69e139c
Fix typos in Vagrantfile
...
Upstream-commit: 2e6dbe87ad6e9ba87cacf818e44dea6b58be05c5
Component: engine
2013-12-13 00:09:05 -05:00
Josh Poimboeuf
8538072ed6
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/
Upstream-commit: e8772943215fff3e17642ad410e4815e40e96b8b
Component: engine
2013-12-12 20:08:58 -06:00
Josh Poimboeuf
bfaa130f9b
dockerinit: set IP address
...
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
Upstream-commit: ecc51cd465da56b38190fe852cf9f31bdfbb0fdc
Component: engine
2013-12-12 19:57:11 -06:00
Josh Poimboeuf
50a1369b02
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.
Upstream-commit: f7c7f7978cf0ca94da5cc68ec2634b5a22ae329c
Component: engine
2013-12-12 19:56:05 -06:00
Michael Crosby
5570b7b013
Merge pull request #3185 from vieux/job_tag
...
Move tag to job
Upstream-commit: 8224e13bd25a41c3e3d8755edd3a754cd060adee
Component: engine
2013-12-12 17:02:39 -08:00
Guillaume J. Charmes
2eae46daad
Merge pull request #3015 from jpoimboe/dockerinit-libvirt-prereqs
...
dockerinit: drop capabilities
Upstream-commit: 912bf8ff92a684400f094e12ee69c68510ebd5b4
Component: engine
2013-12-12 15:49:21 -08:00
Victor Vieux
07befa45fc
move tag to job
...
Upstream-commit: e43ff2f6f2630f971c9494aed285f1d410e42df9
Component: engine
2013-12-12 11:52:11 -08:00
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
Tianon Gravi
2d710e71c8
Make Tianon the hack maintainer
...
Upstream-commit: 0db1c60542d3570558bad09eddd3b2b605e55e4e
Component: engine
2013-12-12 11:25:30 -07:00
unclejack
a7508a8385
vagrant: update & verify virtualbox guest tools
...
Upstream-commit: f216448c823d1aa3dd661935d60da390d463039d
Component: engine
2013-12-12 13:03:33 +02: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
Andy Rothfusz
b0f69a4755
Merge pull request #3181 from lsm5/rhel-docs-typos
...
Rhel docs typos
Upstream-commit: b722f809e751dd33371c46e3fe63c63aea405724
Component: engine
2013-12-11 16:37:24 -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
