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

524 Commits

Author SHA1 Message Date
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
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 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 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
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 1b5335f409 Add developer certificate of origin docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-05-28 11:08:46 +01:00
Ben Firshman 3a2c9c1016 Switch to Apache License 2.0 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-05-28 10:59:21 +01:00
Aanand Prasad cf3eed2cda Merge pull request #227 from orchardup/add-pythonunbuffered-to-django-docs 
Add PYTHONUNBUFFERED=1 to Django tutorial
 2014-05-22 17:12:23 +01:00
Ben Firshman 2ecd366905 Add PYTHONUNBUFFERED=1 to Django tutorial 2014-05-22 14:15:17 +01:00
Ben Firshman d34dc45b78 Merge pull request #223 from orchardup/put-orchard-in-sidebar 
Put Orchard in docs sidebar
 2014-05-14 16:35:37 +01:00
Aanand Prasad 8394e84099 Compress the sidebar a bit 2014-05-14 16:32:39 +01:00
Ben Firshman adda3a7f79 Put Orchard in docs sidebar 2014-05-14 13:05:40 +01:00
Aanand Prasad 52d0f4d9e7 Merge pull request #206 from orchardup/remove-intermediate-build-containers 
Remove intermediate build containers
 2014-05-12 11:59:01 +01:00
Ben Firshman c1a38d787d Fix 0.4.1 release notes 2014-05-12 11:45:55 +01:00
Ben Firshman 7879dfd3fd Fix deploy docs script 2014-05-09 10:59:44 +01:00
Ben Firshman cd1c8b2f09 Update docs to Docker 0.11.1 2014-05-09 10:53:12 +01:00
Ben Firshman 7a9228ad75 Remove intermediate build containers 
Docker does this by default now.
 2014-05-08 15:40:53 +01:00
Aanand Prasad 98ceb62202 Update Fig version on install page 2014-05-08 13:10:13 +01:00
Ben Firshman b99bb64487 Add sanity check to OS X build script 2014-05-08 13:03:21 +01:00
Ben Firshman 580affa5f3 Add sanity check to linux build script 2014-05-08 13:02:50 +01:00
Ben Firshman d600b3498b Remove entrypoint from dockerfile 2014-05-08 13:00:39 +01:00