tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
680 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

680 Commits

Author SHA1 Message Date
Aanand Prasad 036adb2de9 Merge pull request #309 from orchardup/update-docs-to-be-0.5.0 
Update docs to be 0.5.0
 2014-07-11 14:29:38 -07:00
Ben Firshman 36f4e30dba Add 0.5.0 to docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:16:39 -07:00
Ben Firshman 9f0cfbdfd2 Document release process 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:16:29 -07:00
Aanand Prasad e117a7822d Merge pull request #307 from orchardup/ship-0.5.0 
Ship 0.5.0
 2014-07-11 14:07:40 -07:00
Ben Firshman 5489465905 Ship 0.5.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 13:21:01 -07:00
Ben Firshman 4afcdbdb3c Add docs for volumes_from 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 12:52:22 -07:00
Ben Firshman 94d82d4acb Merge pull request #308 from orchardup/fix-fig-up-attach 
Regardless of dependencies, `fig up` only attaches to what you specify
 2014-07-11 20:51:54 +01:00
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
Ben Firshman 99d7a474af Merge pull request #297 from ryanbrainard/resolve-env 
Resolve environment without values to values on host
 2014-07-11 18:55:40 +01:00
Ryan Brainard d1052ff666 Add documention for key-only environment 
Signed-off-by: Ryan Brainard <brainard@heroku.com>
 2014-07-11 10:18:17 -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
Ben Firshman 3996947024 Merge pull request #304 from Elemecca/t-domainname 
add support for domainname, qualified hostname
 2014-07-11 17:40:19 +01:00
Ben Firshman b7afaba56a Merge pull request #305 from ryanbrainard/fix-dir-typo 
Fix typo in script dir name
 2014-07-11 17:37:13 +01:00
Ryan Brainard 2ce3685e32 Fix typo in script dir name 
Signed-off-by: Ryan Brainard <brainard@heroku.com>
 2014-07-11 09:13:00 -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
Ben Firshman 4b890bffde Merge pull request #290 from d11wtq/bugfix/multiplexed_non_tty 
BUGFIX: Update dockerpty for non-TTY multiplexing.
 2014-07-11 01:44:31 +01: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
Ben Firshman e1a3fc2536 Merge pull request #303 from mozz100/master 
Use yaml.safe_load instead of yaml.load
 2014-07-10 09:50:51 -07: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 2924b9997a Merge pull request #302 from orchardup/better-fig-up-output-in-docs 
Use concise fig up output in docs
 2014-07-09 17:35:41 -07:00
Ben Firshman 2a9aef1332 Use concise fig up output in docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-09 17:34:39 -07:00
Chris Corbyn 361294d20b Update dockerpty for non-TTY multiplexing. 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-07-05 08:23:21 +00:00
Ben Firshman 9a825c5c35 Merge pull request #279 from orchardup/fix-run-with-no-links 
Stop `fig run` starting everything when a service has no links
 2014-07-02 15:46:22 +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
Aanand Prasad 3c48884dbb Update dockerpty; stub it out in tests 
Its current behaviour occasionally causes tests to hang; until this is
resolved, we'll stub it out. We weren't testing the output of 'run'
anyhow (though we should be).
 2014-06-27 14:41:36 +01:00
Aanand Prasad 7ec63afae9 Merge pull request #272 from d11wtq/bugfix/race_condition 
Update dockerpty to fix discovered race condition.
 2014-06-26 13:07:15 +01:00
Chris Corbyn 8c6b516aa0 Update dockerpty to fix discovered race condition. 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-26 11:41:43 +00:00
Aanand Prasad 50c588176c Merge pull request #270 from d11wtq/bugfix/tty_size 
Use dockerpty instead for pseudo-tty behaviour (fixes TTY size issue #253 & #97)
 2014-06-25 17:00:56 +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
Ben Firshman 723cccdae8 Merge pull request #258 from j0hnsmith/support_net_param 
add net param support
 2014-06-19 12:19:06 +01:00
j0hnsmith 6b8044e92c add net param support 
Signed-off-by: Peter Flood <info@whywouldwe.com>
 2014-06-19 11:57:55 +01:00
Aanand Prasad 1e7e8202af Merge pull request #257 from orchardup/use-ubuntu-image-to-build-docs 
Use ubuntu:13.10 image to build docs
 2014-06-18 17:31:23 +01:00
Ben Firshman c0fdf7bd39 Use ubuntu:13.10 image to build docs 
stackbrew/ubuntu and ubuntu are the same thing now.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-06-18 17:26:38 +01:00
Aanand Prasad 034b66fedb Merge pull request #256 from orchardup/ship-0.4.2 
Ship 0.4.2
 2014-06-18 16:45:21 +01:00
Ben Firshman eed274c632 Ship 0.4.2 2014-06-18 16:32:23 +01:00
Ben Firshman 5b10c4811f Merge pull request #255 from orchardup/fix-unicode 
Fix encoding errors
 2014-06-18 16:00:43 +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