b67f110620
Explain the explanation about file versions
...
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:40:16 -07:00
27628f8655
Make validation error less robotic
...
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"
is now:
"ERROR: The Compose file './docker-compose.yml' is invalid because:"
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:38:09 -07:00
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
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
d21e1c5a30
Merge pull request #3335 from johnharris85/master
...
Fix CLI docstring to reflect Docopt behaviour.
2016-04-19 12:13:20 +01:00
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
6d2805917c
Account for aliased links
...
Fix failing tests
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 15:25:06 -04:00
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
56c6e29819
Unit test for skipping network disconnect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-15 16:28:59 -04:00
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
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
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
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
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
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
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
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
9f47e43b5c
Merge branch 'master' into 3191_2_help_cli_feature
2016-04-07 12:43:34 -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
78a8be07ad
Re-enabling assert_hostname when instantiating docker_client from the
...
environment.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 11:11:19 -07:00
71c86acaa4
Update docker-py version to include match_hostname fix
...
Removed unnecessary assert_hostname computation in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 18:01:27 -07:00
7116aefe43
Fix assert_hostname logic in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-28 17:39:20 -07:00
12ad3ff301
Injecting os.environ in Environment instance happens outside of init method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
1506f997de
Better windows support for Environment class
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
b99037b4a6
Add support for DOCKER_* variables in .env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
c7afe16419
Account for case-insensitive env on windows platform
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
36f1b4589c
Limit occurrences of creating an environment object.
...
.env file is always read from the project_dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
0ff53d9668
Less verbose environment invocation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
f48da96e8b
Test get_project_name from env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
1801f83bb8
Environment class cleanup
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
b9ca5188a2
Remove Environment singleton, instead carry instance during config processing
...
Project name and compose file detection also updated
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c69d8a3bd2
Implement environment singleton to be accessed throughout the code
...
Load and parse environment file from working dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c3eca82749
Merge pull request #3128 from dnephin/add_network_settings_to_config_hash
...
Include network settings as part of the service config hash.
2016-03-23 17:01:32 +00:00
2cc87555cb
tls_config_from_options unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:57:45 -07:00
442dff72b4
Improve assert_hostname setting in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
26f3861791
Specifying --tls no longer overrides all other TLS options
...
Add an option to skip hostname verification
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
7166408d2a
Fixed typos + simplified TLSConfig creation process.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
Ben Firshman