158 Commits

Author	SHA1	Message	Date
Aanand Prasad	25c70c2af4	Merge pull request #1076 from gilclark/master ... Make volumes_from and net containers first class dependencies	2015-03-13 11:46:13 +00:00
Ian VanSchooten	86b723e227	Provide user override option on command line ... Allows overriding a user on the command line from the one specified in the docker-compose.yml The added tests verify that a specified user overrides a default user in the docker-compose.yml file. Based on commit f2f01e207b491866349db7168e3d48082d7abdda by @chmouel Signed-off-by: Ian VanSchooten <ian@badgelabsllc.com>	2015-03-11 00:11:31 -04:00
Paul Horn	2534a0964f	Add timeout flag to stop, restart, and up ... The commands `stop`, `restart`, and `up` now support a flag `--timeout`. It represents the number of seconds to give the services to comply to the command. In case of `up`, this is only relevant if running in attached mode. Signed-off-by: Paul Horn <knutwalker@gmail.com>	2015-03-10 12:21:58 +01:00
Gil Clark	95f4e2c7c3	Make volumes_from and net containers first class dependencies and ... assure that starting order is correct. Added supporting unit and integration tests as well. Signed-off-by: Gil Clark <gilclark1@gmail.com>	2015-03-06 13:30:56 -08:00
Daniel Nephin	f47431d591	Resolves #927 - fix merging command line environment with a list in the config ... Signed-off-by: Daniel Nephin <dnephin@gmail.com>	2015-03-02 10:23:43 -05:00
KingsleyKelly	fa195bc829	Add -f flag as option on rm. ... Signed-off-by: Kingsley Kelly <kingsley.kelly@gmail.com>	2015-02-27 07:24:43 +00:00
Aanand Prasad	620e29b63f	Rename binary to docker-compose and config file to docker-compose.yml ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-20 21:00:23 +00:00
Aanand Prasad	2af7693e64	WIP: rename Fig to Compose ... Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>	2015-01-20 21:00:23 +00:00