bc4bacc415
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
Upstream-commit: d9a1cc7e2beb9a8956ed97328a945868db107f52
Component: engine
2013-12-17 09:06:52 -08:00
bac1f7d5e4
Merge pull request #3207 from alexlarsson/fix-applylayer
...
Re-enable TestApplyLayer and make it work
Upstream-commit: 124da338fd1c238c8b8e76b15db642104eac1b23
Component: engine
2013-12-16 16:55:48 -08:00
c5d17b12c9
Merge pull request #3232 from dhrp/Full-width-documentation
...
Full width documentation
Upstream-commit: 945a1f06f9666313b4e5cfd7579952f2c5074cfe
Component: engine
2013-12-16 15:56:39 -08:00
f97eeadc02
Change version to 0.7.2-dev
...
Upstream-commit: 64136071c6128fc759f1040186b06fee61d6aab6
Component: engine
2013-12-16 15:43:46 -08:00
92d647574c
Merge pull request #3233 from crosbymichael/bump_0.7.2
...
Bump to 0.7.2
Upstream-commit: 28b162eeb48002e1824a1b43bbc864e93af8e26b
Component: engine
2013-12-16 15:06:42 -08:00
f2efee0f5b
Bump to v0.7.2
...
Upstream-commit: e960152a1e9064d8c2ae57b9ab2a33d9b27276b9
Component: engine
2013-12-16 14:50:07 -08:00
3002a11d90
Improvement upon @SvenDowideit suggestion to make the docs use full-width
...
Moved the style comments source to into the .less file
Upstream-commit: fe956ad4495f0ed566bf20cb9cd10e0c54ccef6b
Component: engine
2013-12-16 14:37:56 -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
f583fe51af
Merge branch 'use-complete-width-of-browser-for-docs' of github.com:SvenDowideit/docker into SvenDowideit-use-complete-width-of-browser-for-docs
...
Upstream-commit: fa48f17493d4f182294fe2228d7f5ecd53447ed5
Component: engine
2013-12-16 13:08:00 -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
6dc8caeed5
Fix and re-enable TestGetContainersTop
...
Upstream-commit: 5cfcb05486d9b45e347324d92350799ab05c65c8
Component: engine
2013-12-16 16:01:55 +01:00
692e7bb3bd
ApplyLayer: Fix TestLookupImage
...
The TestLookupImage test seems to use a layer that contains
/etc/postgres/postgres.conf, but not e.g. /etc/postgres.
To handle this we ensure that the parent directory always
exists, and if not we create it.
Upstream-commit: 78c22c24b353d77fdab3e1616d9986a8ae95a7c2
Component: engine
2013-12-16 14:35:43 +01:00
d5accda95c
Reimplement lxc-ps
...
Instead of calling lxc-ps in top endpoint, we reimplement it by
calling ps and filter for pids running in a given container.
Upstream-commit: 4faba4fae78ab216f2cfd90b1ef23706d933b731
Component: engine
2013-12-16 13:30:35 +01:00
638d177a3b
please, don't use 30% of the screen for whitespace, and thus compress the examples so they are ~80 chars wide - the output of 'docker ps' and 'docker images' becomes needlessly unreadable
...
Upstream-commit: e1efd4cb8c6a5c645285b1f39d4508419e5626c9
Component: engine
2013-12-16 13:24:35 +10: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
ed0aff3956
Merge pull request #3173 from vieux/docker_info_job
...
Move info to job
Upstream-commit: 20197385b29039789f08f35be454b8926d55f720
Component: engine
2013-12-13 17:27:59 -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
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
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
089f5a651b
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 847cf5b5994152b7cd0d9fb86cfe0757afe3473d
Component: engine
2013-12-13 13:15:22 -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
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
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
14b8795f59
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 9fb1ba97b175867da1028a5955ccee5378ffd835
Component: engine
2013-12-13 11:06:20 -08: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
e0758c49a0
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 89beb55c3261ad7224f383884b2e084532b0e3bf
Component: engine
2013-12-13 10:38:26 -08: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
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
