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
5,256 Commits 23 Branches 268 Tags
Commit Graph

1355 Commits

Author SHA1 Message Date
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
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
j0hnsmith
6b8044e92c add net param support 
Signed-off-by: Peter Flood <info@whywouldwe.com>
 2014-06-19 11:57:55 +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
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
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
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
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
d11wtq
94a3164248 Re-add missing import for patch 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:49 +00:00
d11wtq
18728a64b9 Write tests for --no-links changes to fig up 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:48 +00:00
d11wtq
d8b0fa294e Add integration tests for Project.up() w/ start_links and keep_old 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:48 +00:00
d11wtq
a6c8319b5d Add integration tests for Service.recreate_containers() with keep_old 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:48 +00:00
d11wtq
5d92f12f8e Add unit tests for include_links in get_services() 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:48 +00:00
d11wtq
13a296049b Update cli integration test for 'auto_start' behaviour 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:45 +00:00
d11wtq
22c531dea7 Add unit tests for Project.get_services() 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:44 +00:00
d11wtq
dfc74e2a77 Write integration test for 'auto_start' behaviour 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-09 01:31:44 +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
Ben Firshman
10725136d8 Add tests for names on containers 2014-04-29 09:20:29 +01:00
Ben Firshman
ca7151aeb1 Split tests into unit and integration 2014-04-25 22:58:21 +01:00
Aanand Prasad
6e932794f7 Fix regression when mounting volumes 
Caused by
77fec67c60
 2014-04-25 12:28:00 +01:00
Aanand Prasad
9e1dfcfb37 Update docker-py APIError imports 2014-04-23 18:20:33 +01:00
Aanand Prasad
80991f1521 Set "VolumesFrom" when starting containers 
This is necessary when working with Docker 0.10.0 and up. Fortunately,
we can set it both when creating and starting, and retain compatibility
with 0.8.x and 0.9.x.

recreate_containers() is now responsible for starting containers, as
well as creating them. This greatly simplifies usage of the Service
class.
 2014-04-23 15:46:26 +01:00
Ben Firshman
2b245bdf9e Update to docker-py 0.3.1 
From 7f55a101f8

This now requires Docker 0.9 or greater.
 2014-04-15 10:41:06 +01:00
sebastianneubauer
352ad7a38c Scaling down removes containers 
Squashed version of #162.
Closes #121.
 2014-03-26 18:28:10 +00:00
Kevin van Zonneveld
0f5a56b3c2 Add support for privileged containers #123 
This is required for mounting external volumes and
addresses errors such as `mount.nfs: Operation not permitted`

Be gentle, I don't normally use Python :)
 2014-03-13 14:31:05 +01:00
Aanand Prasad
13c7380113 Only fig run containers link back to the service they're part of 
Fixes #107.
 2014-03-06 18:59:24 +00:00
Aanand Prasad
2d98071e55 Support 'expose' config option, like docker's --expose 
Exposes ports to linked services without publishing them to the world.
 2014-03-04 18:06:52 +00:00
Aanand Prasad
6a3d1d06b5 Check NetworkSettings.Ports instead of HostConfig.PortBindings in tests 
The latter appears to be unreliable.
 2014-03-04 17:58:42 +00:00
Ben Firshman
044c348faf Add test for fig rm 2014-03-04 11:00:09 +00:00
Ben Firshman
465c7d569c Improve CLI test names 2014-03-04 11:00:09 +00:00
Aanand Prasad
a00ec9d1f8 Fix: image-defined entrypoint not overridden by intermediate container 
This was causing recreation to hang.
 2014-03-03 18:06:06 +00:00
Ben Firshman
3e7360c2c6 Improve error when service is not a dict 
Fixes #127
 2014-03-03 16:21:42 +00:00
Ben Firshman
bf47aa97b4 Fix tests importing six 2014-03-03 12:25:38 +00:00
Aanand Prasad
c07e96cf2b Merge pull request #120 from marksteve/link-name 
Add custom link names (Closes #72)
 2014-03-03 11:22:57 +00:00
Mark Steve Samson
193558a4bc Add link names test 2014-03-03 08:54:47 +08:00
Mark Steve Samson
e38e866626 Fix links related test 2014-03-02 00:30:33 +08:00
Aanand Prasad
9d1383ba26 Alternate fig file can be specified with -f 2014-03-01 11:29:23 +00:00
Ben Firshman
b9c8e3e057 Fix scale not binding ports 2014-02-17 21:33:05 +00:00
Ben Firshman
5d4210ceb3 Fix tests when there is an image with int tag 2014-02-17 21:32:48 +00:00