King Chung Huang 0e5acfa16c Merge deploy key in service dicts ... Update merge_service_dicts() to merge deploy mappings. Compose file version 3 added the deploy key to service dicts to specify configs related to Docker services. Signed-off-by: King Chung Huang <kinghuang@mac.com>		2017-03-24 15:03:53 -06:00
..
cli	Ignore unicode error in subprocess call	2017-03-23 16:43:15 -07:00
config	Merge deploy key in service dicts	2017-03-24 15:03:53 -06:00
__init__.py	Bump to next dev version	2017-02-08 13:47:08 -08:00
__main__.py	Use json to encode invalid values in configuration errors so that the user sees a proper repr of the value.	2016-01-07 13:09:24 -05:00
bundle.py	referencing right segment of code	2017-02-08 18:50:26 +08:00
const.py	Support V3.2	2017-03-15 11:40:31 -04:00
container.py	Only allow log streaming if logdriver is json-file or journald	2016-09-13 11:56:26 -07:00
errors.py	Expand depends_on to allow different conditions (service_start, service_healthy)	2017-01-04 11:28:30 -08:00
network.py	Ensure network config matches remote for all properties	2017-03-13 15:48:38 -07:00
parallel.py	Merge pull request #4428 from edsrzf/parallel-pull	2017-03-01 14:38:22 -08:00
progress_stream.py	progress_stream: Avoid undefined ANSI escape codes	2016-11-25 10:16:37 +00:00
project.py	support --build-arg for build command	2017-03-07 17:09:35 -08:00
service.py	Prevent service to create a container if it is referencing itself in an external link	2017-03-08 18:29:09 -08:00
state.py	Implement smart recreate behind an experimental CLI flag	2015-05-18 18:39:18 +01:00
timeparse.py	Add a vendored and modified pytimeparse	2016-11-16 12:10:32 -05:00
utils.py	Implement 'healthcheck' option	2016-11-18 14:47:02 +00:00
volume.py	Add default labels to networks and volumes created by Compose	2016-12-19 20:43:35 -08:00