docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,834 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

116 Commits

Author SHA1 Message Date
Aanand Prasad 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
Daniel Nephin 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
Daniel Nephin fbaea58fc1 Fix #2133 - fix call to get_client() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-05 15:57:49 -04:00
Daniel Nephin 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
Daniel Nephin 78c0734cbd Disable some tests in windows for now. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 10:42:57 -04:00
mnowster 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
mnowster aa70209ade Merge pull request #1957 from aanand/stub-run-on-windows 
WIP: Build Windows binary
 2015-09-21 16:21:12 +01:00
Aanand Prasad e5eaf68490 Remove custom docker client initialization logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-21 15:27:42 +01:00
mnowster 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
Aanand Prasad 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
Vojta Orgon 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
Aanand Prasad fb30498153 Catch WindowsError in call_silently 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-18 18:10:29 +01:00
Aanand Prasad 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
Aanand Prasad 3e58003bd3 Merge pull request #2041 from ggtools/master 
Add new --pull option in build.
 2015-09-18 16:49:05 +01:00
Daniel Nephin 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
Daniel Nephin c0c9a7c1e4 Update integration tests for multiple file support 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 10b3188214 Support multiple config files 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 258d0fa0c6 Remove some functions from Command class 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 2121f5117e Add docopt support for multiple files 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Daniel Nephin 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
Christophe Labouisse 39786d4da7 Add new --pull option in build. 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-09-15 20:19:17 +02:00
Daniel Nephin 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
Daniel Nephin 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
Aanand Prasad 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
Lucas N. Munhoz 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
Aanand Prasad 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
Daniel Nephin 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
Daniel Nephin db9f577ad6 Extract link names into a function. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 14:08:44 -04:00
Joffrey F f9c7346380 HTTP_TIMEOUT as importable constant for consistency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 16:29:19 -07:00
Joffrey F b110bbe9e3 Refined error message when timeout is encountered. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 14:31:30 -07:00
Joffrey F 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
Daniel Nephin 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
Joffrey F 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
Frank Sachsenheim 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
Aanand Prasad 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 3a0153859a Resolves #1856, fix regression in #1645. Includes some refactoring to make testing easier. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 16:21:31 -04:00
Daniel Nephin d2718bed99 Allow setting a one-off container name 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 13:33:03 -04:00
Daniel Nephin 9d9550c5b6 Fix log printing for python3 by converting everything to unicode. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 11:24:48 -04:00
Daniel Nephin a348993d2c Remove two unused functions from cli/utils.py 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 16:55:29 -04:00
Daniel Nephin 71ff872e8e Update unit tests for stream_output to match the behaviour of a docker-py response. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:48:48 -04:00
Daniel Nephin 7e4c3142d7 Have log_printer use utf8 stream. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:47:06 -04:00
Daniel Nephin 809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -04:00
Daniel Nephin 59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Aanand Prasad 60ff4549c9 Merge pull request #1766 from funkyfuture/pause_unpause 
Adds pause and unpause-commands
 2015-08-24 16:10:22 +01:00
Frank Sachsenheim 227584b864 Adds pause and unpause-commands 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
Aanand Prasad c699876617 Set log level to DEBUG when `--verbose` is passed 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-20 16:09:28 +01:00
Karol Duleba ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 18:54:42 +01:00
Aanand Prasad 80d90a745a Make sure an exception in any iterator gets raised in the main thread 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/multiplexer.py
 2015-07-29 19:42:33 +01:00
Aanand Prasad a9942b512a Wait for all containers to exit when running 'up' interactively 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00
Aanand Prasad 27378704df Isolate STOP logic in multiplexer module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 19:42:33 +01:00