tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
560 Commits 24 Branches 268 Tags
Commit Graph

560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Aanand Prasad
262248d8a6 Firm up tests for split_buffer 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
c246897af1 Pass script/test arguments through to nosetests 2014-06-18 14:51:13 +01:00
Aanand Prasad
cfcabce593 Extract stream_output to module 2014-06-18 14:51:12 +01:00
Aanand Prasad
e517061010 Add /venv to .gitignore 2014-06-18 14:51:12 +01:00
Aanand Prasad
feb8ad7b4c Update Dockerfile reference/tutorial links 2014-06-16 23:32:50 +01:00
Chris Corbyn
1b5bf6e12a Merge remote-tracking branch 'upstream/master' into feature/auto_start 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>

Conflicts:
	tests/fixtures/simple-figfile/fig.yml
	tests/unit/project_test.py
 2014-06-12 22:05:51 +00:00
Aanand Prasad
e953a32a82 Merge pull request #248 from orchardup/docker-1.0.0 
Update to docs to Docker 1.0.0
 2014-06-11 12:13:09 -07:00
Ben Firshman
f1390b3cb6 Merge pull request #249 from d11wtq/performance/busybox_fixtures 
Use busybox in fixtures, instead of ubuntu
 2014-06-11 19:59:21 +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
3a342fb25d Use busybox in fixtures, instead of ubuntu 
Signed-off-by: d11wtq <chris@w3style.co.uk>
 2014-06-11 10:25:50 +00:00
Chris Corbyn
e71e82f8ac Add missing fixture file 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-11 10:09:54 +00:00
Ben Firshman
da80eca28c Update to docs to Docker 1.0.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-06-10 14:58:06 -07: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
74e067c6e6 Document --keep-old flag in CLI reference 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:50 +00:00
d11wtq
85b9619799 Document 'auto_start' in fig.yml 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:50 +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
a04143e2a7 Remove unused: from __future__ import unicode_literals. 
This is not being used and it confuses the Command class. Rather
than try to fix the Command class, I've taken the pragmatic
approach and removed the trigger that confuses it.

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:50 +00:00
d11wtq
6c4299039a Write integration tests for --keep-old in the CLI 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:49 +00:00
d11wtq
655d347ea2 Write integration tests on new fig run linking behaviour 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:49 +00:00