4702703615
Fix #3248 : Accidental config_hash change
...
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
2016-04-15 15:34:30 +03:00
ad306f0479
Fix CLI docstring to reflect Docopt behaviour.
...
Signed-off-by: John Harris <john@johnharris.io>
2016-04-15 13:30:13 +01:00
e1356e1f6f
Set networking_config when creating a container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-14 18:09:06 -04:00
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
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
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
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
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
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
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
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
f10bc8072e
Merge pull request #3310 from aanand/fix-logs-test
...
Attempt to fix flaky logs test
2016-04-12 10:44:04 -04:00
7781f62ddf
Attempt to fix flaky logs test
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-12 12:07:13 +01:00
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
d05feb1a4d
Merge pull request #3302 from aanand/feed-queue-refactor
...
feed_queue() refactor
2016-04-11 12:58:11 -04:00
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
3722bb38c6
Clarify behaviour of rm and down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 16:31:27 +01:00
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
0671b8b8c3
Document parallel helper functions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:51:27 +01:00
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
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
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
80614cff9b
Merge pull request #3275 from activatedgeek/patch-1
...
Updated Wordpress tutorial
2016-04-08 16:12:44 -07:00
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
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
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
e5443717fb
Merge pull request #3291 from aanand/parallel-execute-refactor
...
Parallel execution refactor/fixes
2016-04-08 15:15:41 -04:00
91a545813a
Merge pull request #3276 from shin-/bump_docker_py
...
Use docker-py 1.8.0
2016-04-08 15:15:01 -04:00
be27e266da
Reduce queue timeout
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:07:40 +01:00
5450a67c2d
Hold state in an object
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:06:07 +01:00
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
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
3720b50c3b
Extract get_deps test helper
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 18:48:07 +01:00
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
141b96bb31
Abort operations if their dependencies fail
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 17:51:09 +01:00
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
f5b80640fe
Merge branch '3191_2_help_cli_feature' of https://github.com/twitherspoon/compose into 3191_2_help_cli_feature
2016-04-07 12:46:27 -04:00
9f47e43b5c
Merge branch 'master' into 3191_2_help_cli_feature
2016-04-07 12:43:34 -04:00
5d0aab4a8e
updated cli_test.py to no longer expect raised SystemExit exceptions
...
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
2016-04-07 12:42:14 -04:00
3ef6b17bfc
Use docker-py 1.8.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-06 13:28:45 -07:00
958f96c78a
Merge pull request #3269 from dnephin/fix_logs_and_scale_down
...
Prevent unnecessary inspection of containers
2016-04-06 12:45:46 -04:00
b33d7b3dd8
Prevent unnecessary inspection of containers when created from an inspect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-06 11:14:42 -04:00
129fb5b356
Added code to output the top level command options if docker-compose help with no command options provided
...
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
2016-04-04 13:15:28 -04:00
86530287d6
Merge pull request #2627 from bfirsh/update-roadmap
...
Update roadmap
2016-04-04 12:52:54 +01:00
c1026e815a
Update roadmap
...
Bring it inline with current plans:
- Use in production is not necessarily about the command-line
tool, but also improving file format, integrations, new tools,
etc.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-01 12:55:16 -07:00
c72d62f96d
Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images
...
Update wordpress example to use official images
2016-04-01 20:53:37 +01:00
a63a05964b
Merge pull request #3249 from aanand/better-env-substitution-example
...
Better variable substitution example
2016-04-01 15:12:18 -04:00
9509508f3e
Merge pull request #3226 from shin-/3210-assert-hostname
...
Fix assert_hostname logic in tls_config_from_options
2016-04-01 10:32:13 -07:00
1a7a65f84d
Include docker-py requirements fix
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-31 18:01:51 -07:00
3034803258
Better variable substitution example
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-31 15:45:14 +01:00
Vladimir Lagunov
johnharris85
Daniel Nephin
Callum Rogers
Aanand Prasad
Danyal Prout
Tony Witherspoon
Daniel Nephin
Victoria
Victoria Bialas
Sanyam Kapoor
twitherspoon
Joffrey F
Ben Firshman
Joffrey F