2f2e946907
Don't set a default network driver, let the server decide.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-30 15:36:15 -04:00
db164cefd3
Remove the duplicate 'Warning' prefix now that the logger adds the prefix.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-30 15:36:15 -04:00
4d613d3ba7
Use colors when logging warnings or errors, so they are more obvious.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-30 15:36:15 -04:00
9370cb033c
Ensure network exists when calling run before up
...
Otherwise the daemon will error out because the network doesn't exist
yet.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-30 15:36:15 -04:00
f67503d9fd
Logs are available for all log drivers except for none.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-29 15:01:33 -04:00
8cc8e61474
Bump 1.5.0rc2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Fill out 1.5.0 release notes
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-27 19:48:54 -04:00
a772a0d7d7
Remove redundant try/except
...
Code cleanup. We no longer need this as the api returns a 304 for any
stopped containers, which doesn't raise an error.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-27 19:33:28 -04:00
6f0096c87b
Move rename functionality into Container
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-27 19:33:28 -04:00
d6fa8596d2
Attach to a container's log_stream before they're started
...
So we're not displaying output of all previous logs for a container, we attach,
if possible, to a container before the container is started.
LogPrinter checks if a container has a log_stream already attached and
print from that rather than always attempting to attach one itself.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-27 19:33:28 -04:00
a9b4fe768d
Fix running one-off containers with --x-networking by disabling linking to self.
...
docker create fails if networking and links are used together.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-27 19:33:28 -04:00
e168fd03ca
Fix unicode in environment variables for python2.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-26 13:05:41 -04:00
f5ad363143
Use inspect network to query for an existing network.
...
And more tests for get_network()
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-26 13:05:40 -04:00
f290faf4ba
Minor refactor to use guard and replace instead of split+join
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 11:29:49 -04:00
725088a18b
Force windows drives to be lowercase.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-21 11:29:49 -04:00
bf672ec340
Fixes #2205 - extends must be copied from override file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-20 11:27:11 -04:00
0e4f9c9a66
Environment keys can contain empty values
...
Environment keys that contain no value, get populated with values taken
from the environment not from the build phase but from running the command `up`.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-19 15:16:19 -04:00
5fdb75b541
Improve error message for type constraints
...
It was missing a space between the different types, when there
were 3 possible type values.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-19 15:16:19 -04:00
24d4a1045a
Fixes #2203 - properly validate files when multiple files are used.
...
Remove the single-use decorators so the functionality can be used directly as a function.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-19 15:16:19 -04:00
514f0650b2
Give the user a better error message (without a stack trace) when there is a yaml error.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-19 12:02:40 -04:00
6048630a11
docker-compose pull SERVICE should not pull SERVICE's dependencies
...
Signed-off-by: Cameron Eagans <me@cweagans.net>
2015-10-16 12:59:57 -04:00
709bd9c363
Bump 1.5.0rc1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 12:59:31 -04:00
0409b287ad
Merge pull request #2191 from dnephin/networking
...
Networking
2015-10-14 12:31:26 -04:00
6b68a84b9b
Merge pull request #2019 from mrfuxi/less-verbose-extends
...
Allow to extend service using shorthand notation. Closes #1989
2015-10-14 17:13:09 +01:00
e2f792c4f4
If -x-networking is used, set the correct API version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 12:09:50 -04:00
d5f5eb1924
Enable use of Docker networking with the --x-networking flag
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-14 11:19:43 -04:00
b9c76dfabd
Merge pull request #2181 from mnowster/2128-split-drive-not-handling-relative-paths
...
2128 split drive not handling relative paths
2015-10-14 11:04:42 -04:00
f4efa29377
Added support for cgroup_parent
...
This change adds cgroup-parent support to compose project. It allows
each service to specify a 'cgroup_parent' option.
Signed-off-by: Mohit Soni <mosoni@paypal.com>
2015-10-14 15:02:42 +01:00
c7ffbf97c8
Extend oneOf error handling. Issue #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-10-14 14:31:35 +01:00
c1d5ecaafe
Workaround splitdrive limitations
...
splitdrive doesn't handle relative paths, so if volume_path contains
a relative path, we handle that differently and manually set drive to ''.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-13 17:27:25 +01:00
bc6b3f970b
container paths don't need to be expanded
...
They should not ever be relative.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-13 17:03:09 +01:00
8efc39e616
Improve boolean warning message.
...
Including examples of more boolean types, eg yes/N as it's not
always immediately clear that they are treated as booleans.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 14:59:08 +01:00
627f1acdc4
Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from
...
1188 support ro options in volumes from
2015-10-07 11:57:14 +01:00
f9028703f4
Pick the first container
...
Rather than inefficiently looping through all the containers that a
service has and overriding each volumes_from value, pick the first
one and return that.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
0ff84a78c6
Use multiple returns rather than overriding.
...
Also added a doc string for clarity.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
467c731869
address PR feedback
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-07 11:27:13 +01:00
fda615008c
Merge pull request #2142 from dnephin/fix_error_cant_connect
...
Fix error when compose can't connect to docker
2015-10-07 11:22:32 +01:00
15d0c60a73
Fix split buffer with inconsistently delimited json objects.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 10:43:07 -04:00
3661e8bc74
Fix build against the swarm cluster by joining buffered output before parsing json.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 10:37:05 -04:00
fe65c0258d
Remove unused attach_socket function from Container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-06 10:37:05 -04:00
5b55a08846
Add support for ro option in volumes_from
...
Fixes #1188
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-06 13:12:55 +01:00
fbaea58fc1
Fix #2133 - fix call to get_client()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-05 15:57:49 -04:00
aefb7a44b2
Refactor command class hierarchy to remove an unnecessary intermediate base class Command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-05 15:49:35 -04:00
2276326d7e
volume path compatibility with engine
...
An expanded windows path of c:\shiny\thing:\shiny:rw
needs to be changed to be linux style path, including the drive,
like /c/shiny/thing /shiny
to be mounted successfully by the engine.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-02 12:01:56 +01:00
58270d8859
Remove duplicate and re-order alphabetically
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-01 16:06:57 +01:00
f4cd5b1d45
Handle windows volume paths
...
When a relative path is expanded and we're on a windows platform,
it expands to include the drive, eg C:\ , which was causing a ConfigError
as we split on ":" in parse_volume_spec and that was giving too many parts.
Use os.path.splitdrive instead of manually calculating the drive.
This should help us deal with windows drives as part of the volume
path better than us doing it manually.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-01 16:06:57 +01:00
e38334efbd
Don't expand volume names
...
Only expand volume host paths if they begin with a dot.
This is a breaking change. The deprecation warning preparing users for
this change has been removed.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-01 14:48:38 +01:00
91b227d133
Allow to extend service using shorthand notation. Closes #1989
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-09-24 18:01:47 +01:00
78c0734cbd
Disable some tests in windows for now.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-23 10:42:57 -04:00
6f12224ec9
Merge pull request #2005 from lnmunhoz/master
...
Fix error message and class name from Boot2Docker to DockerMachine
2015-09-21 17:05:03 +01:00
aa70209ade
Merge pull request #1957 from aanand/stub-run-on-windows
...
WIP: Build Windows binary
2015-09-21 16:21:12 +01:00
Daniel Nephin