tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,053 Commits 25 Branches 265 Tags 53 MiB
Commit Graph

3053 Commits

Author SHA1 Message Date
Aanand Prasad 4f5123bda9 Merge pull request #3168 from dnephin/fix_tty_timeout 
Handle all timeout errors consistently
 2016-03-22 10:14:52 +00:00
Aanand Prasad aaa7b09369 Merge pull request #3181 from dnephin/fix_partial_change_test_failure 
Fix flaky partial_change state test
 2016-03-22 10:14:28 +00:00
Aanand Prasad a20b84e6d2 Merge pull request #3178 from aanand/2774-off-one-offs 
Remove one-off containers in `rm` and `down`
 2016-03-22 10:12:21 +00:00
Daniel Nephin 5c968f9e15 Fix flaky partial_change state test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-21 19:07:50 -04:00
Daniel Nephin 6718e82966 Merge pull request #3179 from dnephin/fix_tmpfs_test_failure 
Only allow tmpfs with the v2 format
 2016-03-21 18:40:51 -04:00
Daniel Nephin be1476f24b Only allow tmpfs on v2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-21 14:41:28 -04:00
Aanand Prasad 2bf5e46857 Stop and remove still-running one-off containers in 'down' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-21 18:08:07 +00:00
Aanand Prasad a2317dfac2 Remove one-off containers in 'docker-compose down' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-21 16:15:49 +00:00
Aanand Prasad 81f6d86ad9 Warn when --all is not passed to rm 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-21 15:14:31 +00:00
Aanand Prasad 1bc9469674 Don't allow boolean values for one_off in Project methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-21 14:42:57 +00:00
Joffrey F 5826a2147b Use enum to represent 3 possible states of the one_off filter 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 12:12:52 +00:00
Joffrey F 187ea4cd81 Add --all option to rm command - remove one-off containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 12:12:52 +00:00
Aanand Prasad 28120148f4 Merge pull request #3137 from dnephin/add_tmpfs_to_config 
Add support for docker run --tmpfs flag.
 2016-03-21 12:10:12 +00:00
Kalle Møller 7fc40dd7cc Adding ssl_version to docker_clients kwargs 
Select tls version based of COMPOSE_TLS_VERSION

Changed from SSL to TLS

Also did docs - missing default value

Using getattr and raises AttributeError in case of unsupported version

Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
 2016-03-19 01:15:03 +01:00
Daniel Nephin dfac48f3f5 Make a new flaky test less flaky. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:20:03 -04:00
Daniel Nephin 089ec66522 Include network settings as part of the service config hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:20:03 -04:00
Philip Walls 85c7d3e5ce Add support for docker run --tmpfs flag. 
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
 2016-03-18 18:19:48 -04:00
Daniel Nephin f1dce50b3d Handle all timeout errors consistently. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:19:35 -04:00
Daniel Nephin 25cbc2aae9 Fix flaky network test. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:19:16 -04:00
Daniel Nephin d5ef0dfa92 Merge pull request #3162 from albers/completion-workdir 
bash completion for `docker-compose run --workdir`
 2016-03-18 11:25:41 -04:00
Harald Albers e3c1b5886a bash completion for `docker-compose run --workdir` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-18 10:47:17 +01:00
Daniel Nephin 3a63a0815d Merge pull request #3158 from aanand/windows-install-docs 
Windows install docs
 2016-03-17 14:40:22 -04:00
Aanand Prasad 50fe014ba9 Remove hardcoded host from Engine install URLs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 18:10:32 +00:00
Aanand Prasad 10dfd54ebe Update install page with link to Windows Toolbox install instructions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 18:09:38 +00:00
Aanand Prasad 72ed4d3f97 Merge pull request #3152 from aanand/update-mac-install-url 
Update Mac Engine install URL in error message
 2016-03-17 17:56:34 +00:00
Joffrey F 312d764c9c Merge pull request #3156 from graingert/fix-type-error-in-exc-handling 
Fix TypeError in Exception handling
 2016-03-17 08:51:33 -07:00
Daniel Nephin b2b58402b3 Merge pull request #3154 from aanand/move-ip-docs-to-reference 
Move ipv4_address/ipv6_address docs to reference section
 2016-03-17 11:44:42 -04:00
Thomas Grainger 20bf05a6e3 Fix TypeError in Exception handling 
Traceback (most recent call last):
  File "/tmp/tmp.02tgGaAGtW/docker-compose/bin/docker-compose", line 11, in <module>
    sys.exit(main())
  File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 68, in main
    log_api_error(e)
  File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 89, in log_api_error
    if 'client is newer than server' in e.explanation:
TypeError: 'str' does not support the buffer interface

Signed-off-by: Thomas Grainger <tagrain@gmail.com>
 2016-03-17 15:13:01 +00:00
Aanand Prasad 7424938fc8 Move ipv4_address/ipv6_address docs to reference section 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 11:32:36 +00:00
Aanand Prasad 92d69b0cb6 Update Mac Engine install URL in error message 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 09:56:44 +00:00
Aanand Prasad 371ea479f5 Merge pull request #3075 from dnephin/reactive_logs 
Display logs for new containers started after the command is run
 2016-03-16 21:03:25 +00:00
Aanand Prasad abddabfb0a Merge pull request #3135 from dnephin/fix_down_idempotency 
Make down idempotent, continue to remove resources if one is missing
 2016-03-16 20:26:18 +00:00
Joffrey F dd40331b44 Merge pull request #3102 from shin-/1477-a-modest-proposal 
Add flag to up/down to remove orphaned containers
 2016-03-16 10:58:15 -07:00
Aanand Prasad 1696506ff4 Merge pull request #3136 from dnephin/add_workdir_to_run 
Add workdir to run
 2016-03-16 12:45:00 +00:00
Joffrey F 20c29f7e47 Add flag to up/down to remove orphaned containers 
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-15 16:11:49 -07:00
Daniel Nephin 52b791a264 Split off build_container_options() to reduce the complexity of run 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 15:29:24 -04:00
Simon van der Veldt 658803edf8 Add -w or --workdir to compose run to override workdir from commandline 
Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
 2016-03-15 15:28:32 -04:00
Daniel Nephin bf96edfe11 Reduce the args of some functions by including presenters as part of the thread_args. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 15:15:00 -04:00
Daniel Nephin e5529a89e1 Make down idempotent, continue to remove resources if one is missing. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:26:29 -04:00
Daniel Nephin e8a93821d4 Fix race condition where a container stopping and starting again would cause logs to miss logs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:11 -04:00
Daniel Nephin 8d9adc0902 Fix flaky log test by using container status, instead of boolean state. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 3f7e5bf768 Filter logs by service names. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 48ed68eeaa Fix geneartors for python3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 4312c93eae Add an acceptance test to show logs behaves properly for stopped containers. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 4cad2a0c5f Handle events for removed containers. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 44c1747127 Add tests for reactive log printing. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 65797558f8 Refactor log printing to support containers that are started later. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Aanand Prasad 94b1862579 Merge pull request #2679 from IlyaSkriblovsky/dependency-ordered-start-stop 
Parallel up/start/stop
 2016-03-15 11:51:44 +00:00
Ilya Skriblovsky 34de1f0a4c Removed unused parallel.parallel_stop 
Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
 2016-03-14 22:56:58 +03:00
Ilya Skriblovsky 5df774bd10 Fixed testing error handling by `up` 
Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
 2016-03-14 22:55:42 +03:00