276e43ca6b
Fix service dict merging when only one dict has a volumes key
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-24 13:26:36 -07:00
b7046777d1
Merge pull request #1161 from aanand/revert-labels-and-dependencies
...
Revert labels and dependencies
2015-03-24 13:05:46 -07:00
1c14fc06da
Update docker-py and requests version ranges
...
Leave the pinned versions in requirements.txt alone, as there's an
incompatibility between PyInstaller and requests 2.5.2 and 2.5.3, and by
extension with docker-py 1.1.0.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-23 15:04:18 -07:00
f4ef2c09d6
Revert "Remove restriction for requests version, update docker-py requirement"
...
This reverts commit 81a32a266f
2015-03-23 15:04:15 -07:00
16495c577b
Revert "Use dev version of Docker"
...
This reverts commit d209ded13c
2015-03-23 15:04:10 -07:00
965426e39b
Revert "Add 'labels:' config option"
...
This reverts commit 721327110d
2015-03-23 15:04:04 -07:00
02f119e4b7
Merge pull request #1145 from aanand/labels
...
Implement `labels` option
2015-03-20 18:53:26 -07:00
721327110d
Add 'labels:' config option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -07:00
d209ded13c
Use dev version of Docker
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 18:12:04 -07:00
49c2080bcd
Merge pull request #1088 from aanand/extends
...
`extends` – Inherit services from other services
2015-03-20 16:00:50 -07:00
37efdb1f8b
Make volume host paths relative to file, merge volumes when extending
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:45:16 -07:00
4c582e4352
Implement `extends`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:45:16 -07:00
5dca6c232e
Merge pull request #972 from aanand/set-host-config-at-create-time
...
Make Swarm schedule containers on the same node when they are linked together
2015-03-20 15:43:52 -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
9931cd2c4c
Merge pull request #1140 from jfrazelle/add-to-readme
...
Add build status \o/
2015-03-20 01:03:37 +00:00
0226675766
Add build status \o/
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2015-03-19 17:50:15 -07:00
ae9c965823
Merge pull request #1128 from aanand/jenkins-dco
...
Validate DCO in script/test-versions
2015-03-18 14:49:40 +00:00
d7a90092c2
Merge pull request #1118 from funkyfuture/issue-1082
...
Change port in ports-composefile to 49152
2015-03-17 21:39:34 -04:00
85fb8956f3
Validate DCO in script/test-versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-17 18:02:22 -07:00
1e5b9dc2eb
Merge pull request #1005 from aanand/docker-in-docker
...
Run tests using Docker-in-Docker so we can test multiple versions
2015-03-17 15:13:59 +00:00
d21b8f1ba3
Merge pull request #1112 from bfirsh/remove-wercker-from-readme
...
Remove wercker status from readme
2015-03-16 23:53:18 +00:00
4c5a80f253
Change port in ports-composefile to 49152
...
This shall lower the propability to interfere with another service (e.g. the
WebUI of an application) that is running on the machine where tests are run.
Signed-off-by: funkyfuture <funkyfuture@riseup.net>
2015-03-17 00:21:29 +01:00
198598c936
Remove wercker status from readme
...
Because it doesn't really work anymore and looks scary when it's broken.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-03-13 19:36:54 +00: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
dae451019b
Merge pull request #1099 from aanand/fix-env-file-resolution
...
Fix env file resolution
2015-03-13 16:49:10 +00:00
dfc729b8f2
Merge pull request #1108 from aanand/fix-deps-tests
...
Fix Project.up() tests
2015-03-13 16:38:25 +00:00
eb7ea76d6c
Merge pull request #1100 from vmalloc/patch-3
...
Remove restriction for requests version, update docker-py requirement
2015-03-13 16:22:40 +00:00
3c8ef6a94c
Fix Project.up() tests
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:51:26 +00:00
081afd9bbf
Merge pull request #1097 from aanand/script-shell
...
Add script/shell
2015-03-13 14:43:47 +00:00
528bed9ef6
Fix environment resolution
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-13 14:22:28 +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
81a32a266f
Remove restriction for requests version, update docker-py requirement
2015-03-13 14:39:11 +02: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
7b1f01bb52
Add script/shell
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-12 14:02:14 +00:00
c23189a5fa
Merge pull request #971 from IanVS/master
...
Provide user override option on command line
2015-03-11 10:16:43 -04: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 f2f01e207b
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
42e6296b0e
Kick everything off from a single container
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-09 17:53:54 +00:00
74440b2f92
Run tests using Docker-in-Docker so we can test multiple versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-09 17:53:54 +00: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
9e9a66f0f8
Merge pull request #965 from albers/bash-completion
...
Favour yml and yaml extensions in bash completion for -f
2015-03-06 15:20:12 +00:00
300234429c
Merge pull request #1034 from bfirsh/remove-d11wtq-as-maintainer
...
Remove @d11wtq as a maintainer
2015-03-05 11:14:50 +00:00
3384bc5fcf
Merge pull request #1059 from bfirsh/fix-missing-space-in-docs
...
Fix missing space in rails docs
2015-03-05 11:14:37 +00:00
08f936b2e7
Fix missing space in rails docs
...
From #1031
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-03-04 10:27:25 +00:00
df925bc759
Merge pull request #1031 from fredlf/edit-qs-guides
...
Edits and revisions to Compose Quickstart guides
2015-03-04 10:26:32 +00:00
33c7b3f752
Merge pull request #1052 from albers/bash-completion-rm-f
...
Add -f flag to bash completion for docker-compose rm
2015-03-02 18:15:12 +00:00
ac7a97f420
Add -f flag to bash completion for docker-compose rm
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-03-02 18:33:34 +01:00
d5fcb0de67
Merge pull request #970 from dnephin/fix_environment_as_list_bug
...
Fix merging command line environment with config environment
2015-03-02 15:28:05 +00: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
8610adcaf3
Merge pull request #997 from abesto/use-latest-docker-py
...
Use docker-py 1.0.0
2015-03-02 14:15:18 +00:00
Aanand Prasad
Ben Firshman
Jessica Frazelle
Daniel Nephin
funkyfuture
Rotem Yaari
Ian VanSchooten
Paul Horn
Gil Clark
Harald Albers