tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-06-29 18:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
605 Commits 22 Branches 277 Tags
Commit Graph

58 Commits

Author SHA1 Message Date
Chris Corbyn
ef2fb77c1d Make fig run COMMAND parameter optional. 
This behaves more like the native docker client, where the absence of a
command means docker runs the CMD in the Dockerfile. If a command is
defined in fig.yml this is used instead.

Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-07-12 02:30:34 +00: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
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
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
Chris Corbyn
0fc9cc65d1 Rename '--only' => '--no-deps' 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-21 10:30:36 +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
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
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
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
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
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
3abce4259f Fix regression in handling of build errors 2014-04-30 11:53:23 +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
94e15a9985 Fix one-off containers not linking to service 
Closes #185.

Need to test this more thoroughly. We need a docker-py mock.
 2014-04-14 22:29:03 +01:00
Ben Firshman
aecaf665f1 Merge pull request #164 from orchardup/friendlier-build-error 
Friendlier build error
 2014-03-28 23:05:46 +00:00
sebastianneubauer
352ad7a38c Scaling down removes containers 
Squashed version of #162.
Closes #121.
 2014-03-26 18:28:10 +00:00
Aanand Prasad
168b1909ae Friendlier build error 
Hide the backtrace and show a comprehensible message.

Closes #160.
 2014-03-25 12:20:05 +00:00
Mark Steve Samson
59cc9c9b68 Add option to remove container in docker run (Closes #137) 2014-03-05 09:03:06 +08:00
Ben Firshman
5be8a37b7e Pass through standard remove_container options 2014-03-04 11:00:09 +00:00
Ben Firshman
2ca0e7954a Add --force option to fig rm 2014-03-04 11:00:06 +00:00
Mark Steve Samson
96a92a73f1 Fix KeyError when -v is not specified in fig rm 2014-03-04 13:13:23 +08:00
Ben Firshman
3e7360c2c6 Improve error when service is not a dict 
Fixes #127
 2014-03-03 16:21:42 +00:00
Ben Firshman
c2cd55e010 Merge pull request #113 from orchardup/alternate-fig-file 
Alternate fig file can be specified with -f
 2014-03-03 11:12:09 +00:00
Mark Steve Samson
41bacae171 Provide option to remove volumes in fig rm 2014-03-03 17:55:00 +08:00
Aanand Prasad
9d1383ba26 Alternate fig file can be specified with -f 2014-03-01 11:29:23 +00:00
Ben Firshman
05e15e27ef Use sys.exit instead of global 2014-02-19 22:42:21 +00:00
Aanand Prasad
fbff8983e4 Merge pull request #83 from dustinlacewell/print-logs-during-attach 
Tell fig up to print logs before attaching
 2014-02-12 11:35:24 -08:00
Dustin Lacewell
511a9beede Tell fig up to print logs before attaching 2014-02-05 17:19:18 -08:00
Cameron Maske
ae7573b9b8 Fix for #48. 
Rework of how services are sorted based on dependencies using a topological sort.
Includes error handling to detect circular/self imports (should raise a DependecyError).
Added in logging to the CLI to log out any DependencyErrors.
Removed the compact module as it is no longer used.
 2014-01-29 18:38:25 +00:00
Aanand Prasad
405079f744 Use raw socket in 'fig run', simplify _attach_to_container 2014-01-20 15:52:07 +00:00
Ben Firshman
fc1bbb45b1 Add option to disable pseudo-tty on fig run 
Also disable tty if stdin is not a tty.
 2014-01-19 20:33:06 +00:00
Ben Firshman
56c6efdfce Add scale command 
Closes #9
 2014-01-16 18:09:46 +00:00
Aanand Prasad
af1b0ed088 Account for length of the ellipsis string when truncating commands 2014-01-16 14:07:17 +00:00
Ben Firshman
c4f5ed839f Shorten long commands in ps 2014-01-16 14:02:52 +00:00
Ben Firshman
b4c905dc83 Merge pull request #14 from orchardup/vendor-docker-py 
Vendor docker-py
 2014-01-16 05:49:15 -08:00
Aanand Prasad
804e2cdcb1 Merge pull request #16 from orchardup/add-help-command 
Add help command
 2014-01-16 05:40:48 -08:00
Aanand Prasad
21528f08d4 Vendor docker-py 
From 9dc03c5737
 2014-01-16 13:30:01 +00:00
Ben Firshman
b1e7f548f4 Add help command 2014-01-16 13:26:25 +00:00
Ben Firshman
cdcea98290 Copy readme commands docs to CLI docstrings 2014-01-16 13:17:00 +00:00
Aanand Prasad
5db6c9f51b Rework 'fig up' to use recreate_containers() 2014-01-16 12:32:15 +00:00
Aanand Prasad
b92e998929 'fig logs' shows output for stopped containers 2014-01-14 12:42:30 +00:00
Christopher Grebs
31f0907732 Add unicode_literals to main module 2014-01-06 17:58:50 +00:00
Christopher Grebs
b101118d1e Add future import for print function 2014-01-06 17:58:50 +00:00
Christopher Grebs
30ea4508c3 Use print function 2014-01-06 17:58:50 +00:00
Christopher Grebs
3c91315426 Fix exception alias syntax 2014-01-06 17:58:49 +00:00