Andy Rothfusz
2deb0c3365
Merge pull request #3248 from lsm5/docker-fedora-conflict
...
Docker fedora conflict
2013-12-17 11:01:37 -08:00
Andy Rothfusz
391676b598
Merge pull request #3221 from jamtur01/introlink
...
Updated Introduction link
2013-12-17 10:36:00 -08:00
Guillaume J. Charmes
5204feeaa9
Merge pull request #3237 from tianon/hack-fix-cover-detection
...
Fix "go tool cover" detection to only add -cover and -coverprofile if we...
2013-12-17 10:09:40 -08:00
Lokesh Mandvekar
25be0b1e98
Fedora first letter capitalize and misc. rewording
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-17 11:32:40 -06:00
Michael Crosby
c56b045270
Merge pull request #3239 from tianon/old-go-not-supported
...
Purge more hack references to Go 1.1.2
2013-12-17 09:08:42 -08:00
Guillaume J. Charmes
d9a1cc7e2b
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
2013-12-17 09:06:52 -08:00
Lokesh Mandvekar
30b4a0f76a
docker and docker-io conflict update for epel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-17 10:56:31 -06:00
Lokesh Mandvekar
7d95145b76
update fedora doc: docker and docker-io conflict
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
2013-12-17 10:33:52 -06:00
Tianon Gravi
5e9b4a23e6
Purge more hack references to Go 1.1.2 (since it requires backported archive/tar patches now, and Go 1.2 is _widely_ packaged successfully)
2013-12-16 23:57:54 -07:00
Tianon Gravi
eddda577a4
Fix "go tool cover" detection to only add -cover and -coverprofile if we both have cover support in Go, and if we have the cover tool downloaded
2013-12-16 22:54:06 -07:00
Michael Crosby
124da338fd
Merge pull request #3207 from alexlarsson/fix-applylayer
...
Re-enable TestApplyLayer and make it work
2013-12-16 16:55:48 -08:00
Thatcher
945a1f06f9
Merge pull request #3232 from dhrp/Full-width-documentation
...
Full width documentation
2013-12-16 15:56:39 -08:00
Michael Crosby
64136071c6
Change version to 0.7.2-dev
2013-12-16 15:43:46 -08:00
Guillaume J. Charmes
28b162eeb4
Merge pull request #3233 from crosbymichael/bump_0.7.2
...
Bump to 0.7.2
2013-12-16 15:06:42 -08:00
Michael Crosby
e960152a1e
Bump to v0.7.2
2013-12-16 14:50:07 -08:00
Thatcher Peskens
fe956ad449
Improvement upon @SvenDowideit suggestion to make the docs use full-width
...
Moved the style comments source to into the .less file
2013-12-16 14:37:56 -08:00
Guillaume J. Charmes
47375ddf54
Merge pull request #3230 from crosbymichael/allow-untag
...
Allow untag operations with no container validation
2013-12-16 14:34:56 -08:00
Michael Crosby
f0d6a91a1b
Merge pull request #3217 from SvenDowideit/deal-with-changing-paths-for-lxc-start
...
lxc-start-unconfined softlink can go bad
2013-12-16 13:38:03 -08:00
Michael Crosby
62213ee314
Allow untag operations with no container validation
2013-12-16 13:29:43 -08:00
Thatcher Peskens
fa48f17493
Merge branch 'use-complete-width-of-browser-for-docs' of github.com:SvenDowideit/docker into SvenDowideit-use-complete-width-of-browser-for-docs
2013-12-16 13:08:00 -08:00
Guillaume J. Charmes
41d972baf1
Merge pull request #3219 from unclejack/vagrant_fix_version_check
...
install vbox guest additions if the latest aren't already installed
2013-12-16 12:49:32 -08:00
Guillaume J. Charmes
b3ad330782
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
2013-12-16 10:53:10 -08:00
Johannes 'fish' Ziemke
5cfcb05486
Fix and re-enable TestGetContainersTop
2013-12-16 16:01:55 +01:00
Alexander Larsson
78c22c24b3
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.
2013-12-16 14:35:43 +01:00
Johannes 'fish' Ziemke
4faba4fae7
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.
2013-12-16 13:30:35 +01:00
Sven Dowideit
e1efd4cb8c
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
2013-12-16 13:24:35 +10:00
Tianon Gravi
606cacdca0
Merge pull request #3222 from gurjeet/zfs_driver_owner
...
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 07:09:00 -08:00
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
