f97eeadc02
Change version to 0.7.2-dev
...
Upstream-commit: 64136071c6128fc759f1040186b06fee61d6aab6
Component: engine
2013-12-16 15:43:46 -08:00
f2efee0f5b
Bump to v0.7.2
...
Upstream-commit: e960152a1e9064d8c2ae57b9ab2a33d9b27276b9
Component: engine
2013-12-16 14:50:07 -08:00
0617d7b95b
Merge pull request #3230 from crosbymichael/allow-untag
...
Allow untag operations with no container validation
Upstream-commit: 47375ddf54bdc3eedd460e0385cfe03c468edcf0
Component: engine
2013-12-16 14:34:56 -08:00
a37b4e5ec9
Merge pull request #3217 from SvenDowideit/deal-with-changing-paths-for-lxc-start
...
lxc-start-unconfined softlink can go bad
Upstream-commit: f0d6a91a1b1de6bf44df678ce16d694fe197eee0
Component: engine
2013-12-16 13:38:03 -08:00
8986c6ae1a
Allow untag operations with no container validation
...
Upstream-commit: 62213ee314d0669a278fae1e3052329f4ca35f75
Component: engine
2013-12-16 13:29:43 -08:00
2aaa1a7929
Merge pull request #3219 from unclejack/vagrant_fix_version_check
...
install vbox guest additions if the latest aren't already installed
Upstream-commit: 41d972baf1d8160f81744a239ac273ef1a84c77b
Component: engine
2013-12-16 12:49:32 -08:00
e18bf01fe0
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
Upstream-commit: b3ad3307829dc4601cb996be3d6d8cfa37e71c79
Component: engine
2013-12-16 10:53:10 -08:00
fa0d9a6f45
Merge pull request #3222 from gurjeet/zfs_driver_owner
...
Update readme to mark ZFS driver as Alpha quality.
Upstream-commit: 606cacdca0c364b8eead4cb41e0dc04fde6af0ab
Component: engine
2013-12-15 07:09:00 -08:00
0d59c96419
Update readme to mark ZFS driver as Alpha quality.
...
Upstream-commit: d526038503d59481965f6614c05ec6acb534b986
Component: engine
2013-12-15 09:17:16 -05:00
1613f79aed
install vbox guest additions if not latest
...
Upstream-commit: 12fb50826297c40dcfd047e8635f40c6824797ac
Component: engine
2013-12-14 16:00:52 +02:00
77b832e35d
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
...
Upstream-commit: 0a3eedd4c9d2bed208a85cd7aefae050a821eb6b
Component: engine
2013-12-14 15:29:08 +10:00
7d30838e63
Merge pull request #3197 from ajhager/3138-names
...
Validate container names on creation. Fixes #3138
Upstream-commit: a6928e70ace51793c15160e5f7206855abab89ff
Component: engine
2013-12-13 17:28:36 -08:00
3e3c1af9cc
add GetenvInt64 ans SetenvInt64
...
Upstream-commit: 85b9338205da0c8f1d62f277db342cf4b9feaf13
Component: engine
2013-12-13 16:29:22 -08:00
77daf141f4
move docker info to the job api
...
Upstream-commit: 51e2c1794b50295607c6eddb29edf39d40816a88
Component: engine
2013-12-13 16:15:15 -08:00
2cea948247
Merge pull request #3183 from vieux/job_commit
...
Move commit to job
Upstream-commit: 20899cdb34e6cd491e5c4c6830f1c53ddf64ad53
Component: engine
2013-12-13 16:11:58 -08:00
db82e5f1c7
Merge pull request #2897 from crosbymichael/aufs-42
...
Increase max image depth to 127
Upstream-commit: f5ab2516d8d50c2ef756fe92d7218bc3248d714a
Component: engine
2013-12-13 16:03:57 -08:00
3589bae2ee
improve GetenvJson
...
Upstream-commit: d5f5ecb658c7a6a0f04939061494c9d404d393ce
Component: engine
2013-12-13 16:02:19 -08:00
f8c4f98d81
use args
...
Upstream-commit: 4b5ceb0f24285718620465bb4073269d6fb8097b
Component: engine
2013-12-13 14:29:27 -08:00
ffe3e370f1
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
Upstream-commit: 906b481148d8355f3cab2271d55ecf64d2d46102
Component: engine
2013-12-13 14:29:14 -08:00
3eb9010924
move commit to job
...
Upstream-commit: 930ec9f52ceceabcb72589ac7f20e1e8bbccbed5
Component: engine
2013-12-13 14:19:56 -08:00
3c2d9ba7fe
Merge pull request #3175 from vieux/engine-job-stop
...
Move stop to job
Upstream-commit: aaa1c48d243e693b29bc52e382e3c37637c8bc3c
Component: engine
2013-12-13 14:15:58 -08:00
aed93695fe
Merge pull request #3214 from dotcloud/shykes_maintainer
...
Temporarily remove @shykes from engine/MAINTAINERS
Upstream-commit: d7123a597f408860a09825104972404c37a0e4e8
Component: engine
2013-12-13 14:03:08 -08:00
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
dd90d88abc
Temporarily remve @shykes from engine/MAINTAINERS
...
Upstream-commit: 4975c1b54980517b5527278e637f3c05dd6a32db
Component: engine
2013-12-13 13:51:20 -08:00
9575d9c5e7
move resize to job
...
Upstream-commit: 73e8a39ff219833ebb28c12dc318466e3551b5bd
Component: engine
2013-12-13 13:15:39 -08:00
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
a0d092fa16
Fix #1695 by adding more about logging.
...
Upstream-commit: 1e85aabf710b2bc8d47027973fe19f4f10a5ba1e
Component: engine
2013-12-13 11:42:58 -08:00
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
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
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
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
c85e5831b2
fix #3141 Bridge creation when ipv6 is not enabled
...
Upstream-commit: a530b8d9818126e04207de619af8578a4ec4c590
Component: engine
2013-12-13 16:39:49 -02:00
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
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
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
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
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
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
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
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
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
07befa45fc
move tag to job
...
Upstream-commit: e43ff2f6f2630f971c9494aed285f1d410e42df9
Component: engine
2013-12-12 11:52:11 -08:00
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
a0c18beb35
dockerinit: refactor error handling
...
Upstream-commit: 1572989201cc54dc87d961fe9c5d6850c61d47b9
Component: engine
2013-12-12 13:47:24 -06:00
22678e4bed
dockerinit: put args in a struct
...
Upstream-commit: bd02d6e662fdf197665a92663854c629c4dda747
Component: engine
2013-12-12 13:47:23 -06:00
6c5256e4e3
Merge pull request #3190 from zain/master
...
Small typo fixes
Upstream-commit: 2d1f61ef0ec93539fd55f27cbd6f08ef0f0f33d2
Component: engine
2013-12-12 11:25:11 -08:00
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
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
2d710e71c8
Make Tianon the hack maintainer
...
Upstream-commit: 0db1c60542d3570558bad09eddd3b2b605e55e4e
Component: engine
2013-12-12 11:25:30 -07:00
a7508a8385
vagrant: update & verify virtualbox guest tools
...
Upstream-commit: f216448c823d1aa3dd661935d60da390d463039d
Component: engine
2013-12-12 13:03:33 +02:00
