965426e39b
Revert "Add 'labels:' config option"
...
This reverts commit 721327110d
2015-03-23 15:04:04 -07:00
721327110d
Add 'labels:' config option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -07:00
eef4bc3917
Specify all HostConfig at create time
...
This is required for Swarm integration: the cluster needs to know
about config like `links` and `volumes_from` at create time so that it
can co-schedule containers.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:14:07 -07:00
8b5a882459
Merge pull request #867 from knutwalker/feature/timeout-flag
...
Add timeout flag to stop, restart, and up
2015-03-13 17:41:16 +00:00
4ecf5e01ff
Extract YAML loading and parsing into config module
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:21:58 +00:00
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
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
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
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
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
db3b4731cd
Merge pull request #1044 from usrenmae/py3-compat
...
Move several steps closer to python3 compatibility
2015-03-02 12:08:39 +00:00
f1fc1d7a16
Move several steps closer to python3 compatibility
...
Signed-off-by: Igor Ch <usrenmae@gmail.com>
2015-02-28 23:26:20 +02:00
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
c39a0b0a2d
Update pep8, fix errors and freeze requirements-dev.txt
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-11 19:00:13 +00:00
7c087f1c07
Support fig.y(a)ml and show a deprecation warning
...
Closes #864
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-29 13:14:44 -05:00
16d6018419
Fix typos
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:28:49 +00:00
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
2af7693e64
WIP: rename Fig to Compose
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-01-20 21:00:23 +00:00
Aanand Prasad
Ben Firshman
Ian VanSchooten
Paul Horn
Gil Clark
Daniel Nephin
Igor Ch
KingsleyKelly