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

2724 Commits

Author SHA1 Message Date
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
Ilya Skriblovsky f933381a12 Dependency-ordered start/stop/up 
Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
 2016-03-14 22:55:42 +03:00
Aanand Prasad e5cd869c61 Merge pull request #3095 from dnephin/refactor_command_dispatch 
Refactor command dispatch and fix api version mismatch error
 2016-03-14 16:18:29 +00:00
Aanand Prasad 9853b876af Merge pull request #3101 from bfirsh/less-scary-swarm-compose-docs 
Better Compose in production docs
 2016-03-14 16:12:46 +00:00
Ben Firshman 1485a56c75 Better Compose in production docs 
The Compose/Swarm integration has been working really well for
users, so it seems pretty safe to remove the scary warnings about
it not being ready.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-03-10 08:55:07 -08:00
Daniel Nephin 99d68be815 Merge pull request #3011 from mdaue/2804 
Fix #2804: Add ipv4 and ipv6 static addressing
 2016-03-09 16:28:15 -08:00
Matt Daue ee136446a2 Fix #2804: Add ipv4 and ipv6 static addressing 
- Added ipv4_network and ipv6_network to the networks section in the
  service section for each configured network
- Added feature documentation
- Added unit tests

Signed-off-by: Matt Daue <mattdaue@gmail.com>
 2016-03-09 18:37:52 -05:00
Daniel Nephin 8a86e204a0 Merge pull request #3063 from albers/completion-multiple-compose-files 
add support for multiple compose files to bash completion
 2016-03-09 11:12:34 -08:00
Joffrey F 7a30fc0983 Merge pull request #3089 from ltiao/patch-1 
Fixed indentation level in example.
 2016-03-09 10:56:50 -08:00
Joffrey F 7033042656 Merge pull request #3039 from dbonev/3020-build-arguments-object-syntax 
Allowing null for build args
 2016-03-09 10:55:05 -08:00
Daniel Nephin 7de9b08ca5 Merge pull request #3066 from shin-/3062-dont-log-noop-volume-create 
Don't call create on existing volumes
 2016-03-08 15:04:59 -08:00
Daniel Nephin 0a091055d2 Improve handling of connection errors and error messages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 15:39:11 -05:00
Daniel Nephin 886328640f Convert some cli tests to pytest. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 14:42:51 -05:00
Daniel Nephin 9f9dcc098a Make TopLevelCommand use the project field. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 14:36:53 -05:00
Daniel Nephin 53bea8a720 Refactor command dispatch to improve unit testing and support better error messages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 14:23:27 -05:00
Daniel Nephin a6649b308e Merge pull request #3094 from aanand/fix-version-in-docs-example 
Fix version in aliases example
 2016-03-08 11:18:45 -08:00
Aanand Prasad e700d7ca6a Fix version in docs example 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-08 18:15:18 +01:00
Louis Tiao 88a719b4b6 Fixed indentation level in example. 
Signed-off-by: Louis Tiao <louistiao@gmail.com>
 2016-03-08 15:53:55 +11:00
Joffrey F d2b065e615 Don't raise ConfigurationError for volume driver mismatch 
when driver is unspecified

Add testcase

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-07 18:07:41 -08:00
Joffrey F 698998c410 Don't call create on existing volumes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-07 18:00:27 -08:00
Dimitar Bonev 81b7fba33e Allowing null for build args 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-03-05 15:57:06 +02:00
Aanand Prasad 9e242cdc75 Merge pull request #3032 from dnephin/multiple_files_from_env_var 
Support multiple files in COMPOSE_FILE env var
 2016-03-03 17:23:22 +00:00
Aanand Prasad 4ae71f41dd Merge pull request #2832 from aanand/refactor-cli-unit-tests 
Refactor CLI initialization and unit tests
 2016-03-02 16:10:44 -08:00
Daniel Nephin 53a3d14046 Support multiple files in COMPOSE_FILE env var. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 18:47:58 -05:00
Aanand Prasad 20caf02bf6 Create real Project objects in CLI unit tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:11:34 -08:00
Aanand Prasad 4644f2c0f9 Remove environment-overriding unit test for 'run' 
There's already an acceptance test for it

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:11:32 -08:00
Aanand Prasad 575b48749d Remove unused global_options arg from dispatch() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:09:48 -08:00
Aanand Prasad 2c75a8fdf5 Extract helper methods for building config objects from dicts 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:09:48 -08:00
Aanand Prasad f75408923e Merge pull request #3053 from dnephin/handle_booleans_in_mappings 
Don't allow booleans for mapping types
 2016-03-02 15:04:20 -08:00