jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3,131 commits 9 branches 77 tags 9.3 MiB
Commit graph

790 commits

Author SHA1 Message Date
Daniel Nephin
5852db4d72 Set networking_config when creating a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin
250a7a530b Only disconnect if we don't already have the short id alias. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85
4e8b017283 Fix CLI docstring to reflect Docopt behaviour. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-05-04 11:52:56 -07:00
Vladimir Lagunov
a86a195c50 Fix #3248: Accidental config_hash change 
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
9cf483e224 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-05-04 11:52:56 -07:00
Aanand Prasad
1e164ca802 Fix format of 'restart' option in 'config' output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
a2ded237e4 Fix output of 'config' for v1 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin
0d7bf73446 Bump 1.7.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-13 11:37:49 -04:00
Daniel Nephin
ea2d526246 Bump 1.7.0-rc2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
2160c787e3 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 13:26:16 -04:00
Aanand Prasad
ebae76bee8 Rename a couple of functions in parallel.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
720dc893e2 Document parallel helper functions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
d03f4e4b32 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 13:26:16 -04:00
Daniel Nephin
275b54641a Remove extra ensure_image_exists() which causes duplicate builds. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
68b4ef6cf2 Reduce queue timeout 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
de6496c6c9 Hold state in an object 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
79edda6804 Refactor so there's only one queue 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
d3899418b7 Move queue logic out of parallel_execute() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
09e359fc8d Abort operations if their dependencies fail 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
cdef2b5e3b 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 15:52:33 -04:00
Daniel Nephin
73d57a1acb Prevent unnecessary inspection of containers when created from an inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
7dd29e8239 Re-enabling assert_hostname when instantiating docker_client from the environment. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
a2adf31caa 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-04-08 15:52:33 -04:00
Joffrey F
44715f18bd Fix assert_hostname logic in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Daniel Nephin
1ad88662c0 Bump 1.7.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-24 14:31:37 -04:00
Joffrey F
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
Joffrey F
1506f997de Better windows support for Environment class 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F
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
Joffrey F
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
Joffrey F
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
Joffrey F
0ff53d9668 Less verbose environment invocation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F
f48da96e8b Test get_project_name from env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F
1801f83bb8 Environment class cleanup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F
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
Joffrey F
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
Aanand Prasad
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
Joffrey F
2cc87555cb tls_config_from_options unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:57:45 -07:00
Joffrey F
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
Joffrey F
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
Joffrey F
7166408d2a Fixed typos + simplified TLSConfig creation process. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F
1ac33ea7e5 Add support for TLS config command-line options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
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
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