tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,775 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

2775 Commits

Author SHA1 Message Date
Ben Firshman 55fcd1c3e3 Clarify service networks documentation 
When jumping straight to this bit of the docs, it's not clear
that these are options under a service rather than the top-level
`networks` key. Added a service to make this super clear.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-20 15:58:12 -07:00
Ben Firshman a0aea42f75 Merge pull request #3326 from CRogers/patch-1 
Readme should use new docker compose format instead of the old one
 2016-04-20 23:06:35 +01:00
Ben Firshman 6ff3c47630 Merge pull request #3222 from jonlemmon/patch-1 
Rails Docs: Add nodejs to apt-get install command
 2016-04-20 22:57:50 +01:00
Daniel Nephin 8a34ee0eaa Merge pull request #3356 from metal3d/fix-help-acceptance-test 
Fix the tests from jenkins
 2016-04-20 12:18:20 -04:00
Patrice FERLET ba10f1cd55 Fix the tests from jenkins 
Acceptance tests didn't set "help" command to return "0" EXIT_CODE.

close #3354
related #3263

Signed-off-by: Patrice Ferlet <metal3d@gmail.com>
 2016-04-20 13:23:37 +02:00
Aanand Prasad cafe1315b2 Merge pull request #3334 from werehuman/fix-config-hash-change 
Fix #3248: Accidental config_hash change
 2016-04-19 12:42:19 +01:00
Aanand Prasad 984f839d33 Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature 
Added code to support no argument help command
 2016-04-19 12:14:24 +01:00
Aanand Prasad d21e1c5a30 Merge pull request #3335 from johnharris85/master 
Fix CLI docstring to reflect Docopt behaviour.
 2016-04-19 12:13:20 +01:00
Aanand Prasad 52fa010ac7 Merge pull request #3337 from dnephin/check_for_short_id_alias 
Check for short id alias, and don't disconnect if it already exists
 2016-04-19 12:12:43 +01:00
Daniel Nephin d4bebbb1ba Merge pull request #3340 from johnharris85/2922-config-does-not-catch-missing-links 
Fix #2922: Config does not catch missing links
 2016-04-18 10:13:47 -04:00
johnharris85 6d2805917c Account for aliased links 
Fix failing tests
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-17 15:25:06 -04:00
johnharris85 377be5aa1f Adding tests 
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-17 14:01:06 -04:00
johnharris85 68272b0216 Config now catches undefined service links 
Fixes issue #2922
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-17 14:00:07 -04:00
Daniel Nephin 56c6e29819 Unit test for skipping network disconnect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-15 16:28:59 -04:00
Vladimir Lagunov 4702703615 Fix #3248: Accidental config_hash change 
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
 2016-04-15 15:34:30 +03:00
johnharris85 ad306f0479 Fix CLI docstring to reflect Docopt behaviour. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-15 13:30:13 +01:00
Daniel Nephin e1356e1f6f Set networking_config when creating a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-14 18:09:06 -04:00
Daniel Nephin abb5ae7fe4 Only disconnect if we don't already have the short id alias. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-14 16:05:14 -04:00
Callum Rogers e71c62b8d1 Readme should use new docker compose format instead of the old one 
Signed-off-by: Callum Rogers <callumrogers@hotmail.co.uk>
 2016-04-14 10:49:10 +01:00
Aanand Prasad e2cb7b0237 Merge pull request #3299 from dannyprout/2096-only-show-port-clash-warning-when-starting-multiple-containers 
Only show port clash warning if multiple containers are about to be started
 2016-04-14 10:40:02 +01:00
Aanand Prasad aebb3d5d0a Merge pull request #3320 from dnephin/make_it_dev_again 
Update release notes and set version to 1.8.0dev
 2016-04-14 10:22:01 +01:00
Daniel Nephin 50287722f2 Update release notes and set version to 1.8.0dev 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-13 13:27:18 -04:00
Danyal Prout 339ebc0483 Fixes #2096: Only show multiple port clash warning if multiple containers 
are about to be started.

Signed-off-by: Danyal Prout <me@dany.al>
 2016-04-12 20:58:21 +01:00
Tony Witherspoon ae46bf8907 Updated StringIO import to support io module 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-12 12:29:59 -04:00
Tony Witherspoon 276738f733 Updated cli_test.py to validate against the updated help command conditions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-12 11:47:15 -04:00
Daniel Nephin f10bc8072e Merge pull request #3310 from aanand/fix-logs-test 
Attempt to fix flaky logs test
 2016-04-12 10:44:04 -04:00
Aanand Prasad 7781f62ddf Attempt to fix flaky logs test 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-12 12:07:13 +01:00
Aanand Prasad 3d3f331404 Merge pull request #3303 from aanand/clarify-rm-and-down 
Clarify behaviour of rm and down
 2016-04-12 11:31:22 +01:00
Daniel Nephin d05feb1a4d Merge pull request #3302 from aanand/feed-queue-refactor 
feed_queue() refactor
 2016-04-11 12:58:11 -04:00
Aanand Prasad 7cfb5e7bc9 Fix race condition 
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 17:05:52 +01:00
Aanand Prasad 3722bb38c6 Clarify behaviour of rm and down 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 16:31:27 +01:00
Aanand Prasad 15c5bc2e6c Rename a couple of functions in parallel.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:05:30 +01:00
Aanand Prasad 0671b8b8c3 Document parallel helper functions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 12:51:27 +01:00
Aanand Prasad 0e3db185cf Small refactor to feed_queue() 
Put the event tuple into the results queue rather than yielding it from
the function.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 12:37:00 +01:00
Victoria 97467c7dec Merge pull request #3295 from londoncalling/docs-format-followup-PR3275 
added some formatting on the Wordress steps, and made heading levels …
 2016-04-08 16:56:57 -07:00
Victoria Bialas 4192a009da added some formatting on the Wordress steps, and made heading levels in these sample app topics consistent 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-04-08 16:40:07 -07:00
Victoria 80614cff9b Merge pull request #3275 from activatedgeek/patch-1 
Updated Wordpress tutorial
 2016-04-08 16:12:44 -07:00
Sanyam Kapoor d4e9a3b6b1 Updated Wordpress tutorial 
The new tutorial now uses official Wordpress Docker Image.

Signed-off-by: Sanyam Kapoor <1sanyamkapoor@gmail.com>
 2016-04-09 02:05:45 +05:30
Daniel Nephin 3ca8858897 Merge pull request #3292 from dnephin/fix_up_build 
Remove extra ensure_image_exists() which causes duplicate builds.
 2016-04-08 15:45:37 -04:00
Daniel Nephin 83df95d511 Remove extra ensure_image_exists() which causes duplicate builds. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-08 15:21:12 -04:00
Daniel Nephin e5443717fb Merge pull request #3291 from aanand/parallel-execute-refactor 
Parallel execution refactor/fixes
 2016-04-08 15:15:41 -04:00
Daniel Nephin 91a545813a Merge pull request #3276 from shin-/bump_docker_py 
Use docker-py 1.8.0
 2016-04-08 15:15:01 -04:00
Aanand Prasad be27e266da Reduce queue timeout 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 19:07:40 +01:00
Aanand Prasad 5450a67c2d Hold state in an object 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 19:06:07 +01:00
Aanand Prasad 54b6fc4219 Refactor so there's only one queue 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 18:54:02 +01:00
Aanand Prasad ffab27c049 Test events coming out of parallel_execute_stream in error case 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 18:53:16 +01:00
Aanand Prasad 3720b50c3b Extract get_deps test helper 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 18:48:07 +01:00
Aanand Prasad af9526fb82 Move queue logic out of parallel_execute() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 18:30:28 +01:00
Aanand Prasad 141b96bb31 Abort operations if their dependencies fail 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 17:51:09 +01:00
Aanand Prasad bcdf541c8c Refactor setup_queue() 
- Stop sharing set objects across threads
- Use a second queue to signal when producer threads are done
- Use a single consumer thread to check dependencies and kick off new
  producers

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 16:24:29 +01:00