bea2072b95
Add the git sha to version output
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
83760d0e9e
Handle both SIGINT and SIGTERM for docker-compose run.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
be5b7b6f0e
Handle both SIGINT and SIGTERM for docker-compose up.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-02 17:31:48 -08:00
83581c3a0f
Validate additional files before merging them.
...
Consolidates all the top level config handling into `process_config_file` which
is now used for both files and merge sources.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:54:41 -05:00
36176befb0
Fix #1549 - flush after each line of logs.
...
Includes some refactoring of log_printer_test to support checking for flush(), and so that each test calls the unit-under-test directly, instead of through a helper function.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:54:41 -05:00
de08da278d
Re-order flags in bash completion
...
and remove unnecessary variables from build command.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:54:41 -05:00
4c2eb17ccd
Added --force-rm to compose build.
...
It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.
Signed-off-by: Adrian Budau <budau.adi@gmail.com>
2015-11-12 13:54:41 -05:00
666c3cb1c7
Use exit code 1 when encountering a ReadTimeout
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-12 13:54:40 -05:00
e317d2db9d
Remove service.start_container()
...
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-12 13:54:39 -05: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
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
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
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
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
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
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
e5eaf68490
Remove custom docker client initialization logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-21 15:27:42 +01:00
b9252aa48e
Merge pull request #2032 from villlem/master
...
Flag to skip all pull errors when pulling images
2015-09-21 13:41:08 +01:00
18dbe1b1c0
Merge pull request #2051 from dnephin/extend_compose_files
...
Extend compose files by allowing multiple files
2015-09-21 12:34:22 +02:00
c9083e21c8
Flag to skip all pull errors when pulling images.
...
Signed-off-by: Vojta Orgon <villlem@gmail.com>
2015-09-21 11:59:23 +02:00
fb30498153
Catch WindowsError in call_silently
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-18 18:10:29 +01:00
3e4182a480
Stub 'run' on Windows
...
Adapted from @dopry's work in https://github.com/docker/compose/pull/1900
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-18 18:10:17 +01:00
3e58003bd3
Merge pull request #2041 from ggtools/master
...
Add new --pull option in build.
2015-09-18 16:49:05 +01:00
fe5daf860d
Move find_candidates_in_parent_dirs() into a config module so that config doesn't import from cli.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-17 14:13:50 -04:00
c0c9a7c1e4
Update integration tests for multiple file support
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-17 14:13:50 -04:00
10b3188214
Support multiple config files
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-17 14:13:50 -04:00
258d0fa0c6
Remove some functions from Command class
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-17 14:13:50 -04:00
2121f5117e
Add docopt support for multiple files
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-17 14:13:50 -04:00
bdfb21f017
Fixes #189 - stacktrace when ctrl-c stops logs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-15 20:46:22 -04:00
39786d4da7
Add new --pull option in build.
...
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-09-15 20:19:17 +02:00
7d8ae9aa6d
Refactor LogPrinter to make it immutable and remove logic from the constructor.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 12:56:56 -04:00
413b76e228
Fix warning message when a container uses a non-json log driver
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 12:54:27 -04:00
f7d86d3194
Merge pull request #1944 from funkyfuture/issue-1921
...
Adds pause- and unpause-command to docopt's TLC
2015-09-08 14:05:27 -07:00
b33dd3bc01
Fix error message and class name from Boot2Docker to DockerMachine
...
Signed-off-by: Lucas N. Munhoz <ln.munhoz@gmail.com>
2015-09-08 10:08:38 -03:00
10cb0c921a
Merge pull request #1963 from shin-/1923-catch-timeout
...
Exit gracefully when requests encounter a ReadTimeout exception.
2015-09-04 16:14:32 -07:00
0484e22a84
Add enum34 and use it to create a ConvergenceStrategy enum.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-04 10:45:53 -04:00
db9f577ad6
Extract link names into a function.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-03 14:08:44 -04:00
f9c7346380
HTTP_TIMEOUT as importable constant for consistency
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 16:29:19 -07:00
b110bbe9e3
Refined error message when timeout is encountered.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 14:31:30 -07:00
e634fe3fd6
Deprecation warning when DOCKER_CLIENT_TIMEOUT is used
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 14:28:57 -07:00
48466d7d82
Fix #1961 - docker-compose up should attach to all containers with no service names are specified, and add tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-02 16:08:18 -04:00
b54b932b54
Exit gracefully when requests encounter a ReadTimeout exception.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 11:54:20 -07:00
a4bab13aee
Adds pause- and unpause-command to docopt's TLC
...
solves # 1921
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2015-08-28 19:05:19 +02:00
e777d08854
Merge pull request #1924 from dnephin/python3_fix_for_logs
...
Fix `docker-compose logs` on python3
2015-08-27 14:19:42 +01:00
Daniel Nephin