tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
574 Commits 23 Branches 268 Tags
Commit Graph

190 Commits

Author SHA1 Message Date
Aanand Prasad
d528f9f642 Regardless of dependencies, fig up only attaches to what you specify 
Without this, if you go:

    $ fig up -d db
    $ fig up web

you'll get output for both db and web, and Ctrl-C will kill them both.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-11 11:58:59 -07:00
Ryan Brainard
44a91e6ba8 Resolve environment without values to values on host 
For parity with the Docker CLI, allow environment variables without
values to be automatically resolved to their values on the host.

Signed-off-by: Ryan Brainard <brainard@heroku.com>

Conflicts:
	tests/integration/service_test.py
 2014-07-11 10:18:05 -07:00
Sam Hanes
699bbe9ca2 Split the domainname out of qualified hostnames. 
Docker doesn't like it when a fully qualified hostname is passed in
the `hostname` parameter. When an FQDN is provided with `-h` the
official CLI puts the first component in `hostname` and the rest in
`domainname`. This change replicates that behavior when the user
specifies an FQDN in `hostname` in their `fig.yml`.

Signed-off-by: Sam Hanes <sam@maltera.com>
 2014-07-10 20:18:09 -07:00
Sam Hanes
789e1ba82b Add domainname to allowed container config. 
Signed-off-by: Sam Hanes <sam@maltera.com>
 2014-07-10 15:56:26 -07:00
Ben Firshman
1a9614c35e Merge pull request #293 from binarin/master 
Change working dir through fig.yml
 2014-07-10 10:31:57 -07:00
Alexey Lebedeff
d83bdd5164 Change working dir through fig.yml 
Closes #144

Signed-off-by: Alexey Lebedeff <binarin@gmail.com>
 2014-07-10 21:22:45 +04:00
Richard Morrison
251aa7efb6 Use yaml.safe_load instead of yaml.load 
http://pyyaml.org/wiki/PyYAMLDocumentation#LoadingYAML

Signed-off-by: Richard Morrison <richard@rmorrison.net>
 2014-07-10 15:15:55 +01:00
Aanand Prasad
944e15fa65 Stop fig run starting everything when a service has no links 
This was thanks to the semantics of project.up(), which starts everything
if you pass it an empty list of service names. (That logic should
probably be moved out to main.py.)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-02 11:51:12 +01:00
Aanand Prasad
d04b1724ec Merge pull request #236 from rail44/feature-support-volumes-from 
Support volumes_from option
 2014-07-02 10:48:11 +01:00
Satoshi Amemiya
e5916b2fae Support volumes_from option 
Signed-off-by: Satoshi Amemiya <rail.sky@gmail.com>
 2014-07-02 13:27:54 +09:00
Mark Steve Samson
4f7cbc3812 Support for host address in port bindings (Closes #267) 2014-06-27 15:07:22 +01:00
Chris Corbyn
3770aac1af Use dockerpty instead for pseudo-tty behaviour. 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-25 15:54:52 +00:00
Aanand Prasad
256dccc554 Merge pull request #268 from orchardup/update-docker-py-0.3.2 
Update to docker-py 0.3.2
 2014-06-25 14:16:48 +01:00
Ben Firshman
d0f65906ed Update to docker-py 0.3.2 
From 59ced5700c

Now only supports Docker 1.0.0 / remote API v1.12.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-06-25 11:56:20 +01:00
Ben Firshman
95aa61cfe5 Merge pull request #246 from d11wtq/feature/auto_start 
Feature: `fig up` and `fig run` now start linked containers (closes #31).
 2014-06-24 14:46:47 +01:00
Chris Corbyn
247691ca44 Remove auto_start option from fig.yml. 
This option is redundant now that services can be started along with links.

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-21 10:39:36 +00:00
Chris Corbyn
0fc9cc65d1 Rename '--only' => '--no-deps' 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-21 10:30:36 +00:00
Ben Firshman
eb69225444 Merge pull request #209 from orchardup/better-invalid-service-name-error 
Better error message when service names are invalid
 2014-06-20 12:32:07 +01:00
Aanand Prasad
cafe68a92d Better error message when service names are invalid 2014-06-20 12:10:18 +01:00
j0hnsmith
6b8044e92c add net param support 
Signed-off-by: Peter Flood <info@whywouldwe.com>
 2014-06-19 11:57:55 +01:00
Ben Firshman
eed274c632 Ship 0.4.2 2014-06-18 16:32:23 +01:00
Tobias Bradtke
2bd6e3d0a5 Do not encode chunk, just write as is. 2014-06-18 15:31:45 +01:00
Aanand Prasad
d0b5bcf26a Pass byte strings straight through LogPrinter 2014-06-18 14:51:13 +01:00
Aanand Prasad
9eb3697b40 Encode all progress stream output as UTF-8 
Closes #231.
 2014-06-18 14:51:13 +01:00
Aanand Prasad
cfcabce593 Extract stream_output to module 2014-06-18 14:51:12 +01:00
d11wtq
6e485df084 Rename --no-links to --only 
Signed-off-by: d11wtq <chris@w3style.co.uk>
 2014-06-11 10:50:45 +00:00
d11wtq
1d1e23611b Rename --keep-old to --no-recreate 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:51 +00:00
d11wtq
ab1fbc96c3 Move keep_old check up into Project 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:50 +00:00
d11wtq
c0231bdb70 Rename _prepend_with_links() -> _inject_links() 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:47 +00:00
d11wtq
ac541e208f Remove obsolete method _get_linked_service_names() 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:47 +00:00
d11wtq
3d8ce448b8 Spike: Re-use existing containers for fig run 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:47 +00:00
d11wtq
949df97726 Fix issue with infinite recursion when service_names is empty 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:46 +00:00
d11wtq
14cbe40543 Update doc string to reflect new behaviour. 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:46 +00:00
d11wtq
9dd53ecdaa Fix bug with duplicate service entries in fig up 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:46 +00:00
d11wtq
6bfe5e049d Spike: Implement --no-links for fig up 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:46 +00:00
d11wtq
b672861ffd Spike: Start linked containers on fig run by default 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:45 +00:00
d11wtq
b081077f2b Remove FIXME, as there's nothing to fix :) 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:45 +00:00
d11wtq
0c12db06ec Move 'auto_start' option default to Service and add unit tests 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:44 +00:00
d11wtq
edf6b56016 Spike: Add --up option to fig run 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:43 +00:00
d11wtq
8b4ed0c1a8 Spike: Add 'auto_start' option to fig.yml 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:27 +00:00
Ben Firshman
7a9228ad75 Remove intermediate build containers 
Docker does this by default now.
 2014-05-08 15:40:53 +01:00
Ben Firshman
257a171c0c Ship 0.4.1 2014-05-08 12:43:09 +01:00
Ben Firshman
c3c8395cef Merge pull request #215 from marksteve/docker-0.11 
Docker 0.11
 2014-05-08 10:10:19 +01:00
Mark Steve Samson
38c008e527 Fix index error when getting ghost state of containers 2014-05-08 12:39:15 +08:00
Jef Mathiot
5878fe3834 Add the ability to configure the project name 2014-05-02 18:00:58 +02:00
Ben Firshman
983337401c Return correct exit code from fig run 
Closes #197
 2014-05-01 18:17:12 +01:00
Aanand Prasad
d1d4f47764 Ship 0.4.0 2014-04-30 11:53:39 +01:00
Aanand Prasad
3abce4259f Fix regression in handling of build errors 2014-04-30 11:53:23 +01:00
Ben Firshman
fff5e51426 Make log messages line up with each other 2014-04-29 09:31:57 +01:00
Ben Firshman
a724aa5717 Use name without project for log printing 2014-04-29 09:22:20 +01:00