tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
768 Commits 21 Branches 267 Tags 56 MiB
Commit Graph

78 Commits

Author SHA1 Message Date
Aanand Prasad 60411e9f05 Vendor dockerpty at c8b493553477c9a57d163c71c97b2102f44a6ce7 
Include TLS fixes and relative imports:

c8b4935534

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 16:24:39 +01:00
Chmouel Boudjnah 92249364b6 Allow overriding environements on command line 
Add a new command line option -e to override environement variables when
running a service.

Signed-off-by: Chmouel Boudjnah <chmouel@chmouel.com>
 2014-10-09 16:33:41 +02:00
Ben Firshman d2385e3c2c Fix fig run entrypoint option 
Slipped through because Wercker didn't report build status.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-01 14:19:23 -07:00
Aanand Prasad 431fdaa0f1 Merge pull request #490 from LuminosoInsight/insecure-pull 
Allow pulls from an insecure registry
 2014-10-01 10:52:54 -07:00
Ben Firshman 0dc19cb885 Order "fig run" options alphabetically 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-01 09:28:28 -07:00
satoru 62b9c64311 Add support for the --entrypoint option of docker run 
Signed-off-by: Satoru Logic <satorulogic@gmail.com>
 2014-10-01 09:28:28 -07:00
Jason Bernardino Alonso 1c5194e2ec Allow pulls from an insecure registry 
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
 2014-09-26 16:36:36 -04:00
Daniel Nephin 192fce9153 Resolves #43 - sort containers in ps output by name, so services are grouped together. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-14 16:06:23 -04:00
Ben Firshman fc4c35e977 Merge pull request #411 from Banno/fig-pull 
adding "fig pull [SERVICE]" to pull service images
 2014-09-10 23:57:20 +01:00
Ben Firshman ce8ef23c09 Merge pull request #393 from marksteve/restart 
Implement restart command (Closes #98)
 2014-09-08 17:47:08 +01:00
Daniel Nephin 7fd37c89b9 Remove fig.packages replace with real deps. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-05 11:44:49 -07:00
Daniel Nephin c48ee5caef Add a new fig command for retrieving the locally bound port of a service. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-04 22:09:12 -04:00
Luke Amdor e51851c884 adding "fig pull [SERVICE]" to pull service images 
Fixes #158

Signed-off-by: Luke Amdor <luke.amdor@gmail.com>
 2014-08-15 09:24:15 -05:00
Mark Steve Samson 9d55e01e2a Implement restart command (Closes #98) 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-08-12 10:07:20 +08:00
Daniel Nephin df7c2cc43f Resolves #369, add verbose output on --verbose flag 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-09 21:05:54 -04:00
Tim Freund 69c241ba12 Enable monochrome output in the 'up' and 'logs' commands 
Some systems, like Jenkins or other build servers, cannot correctly
render ANSI color codes.  The '--no-color' option enables monochrome
output in the 'up' and 'logs' commands to improve readability in those
systems.

Signed-off-by: Tim Freund <tim@freunds.net>
 2014-08-08 16:15:27 -04:00
Daniel Nephin 50a24bc3bf Add flake8 and fix errors. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-27 08:51:17 -07:00
Chris Corbyn 0dc55fda45 Merge pull request #322 from dnephin/fix_cli_for_py26 
Fix cli for python 2.6
 2014-07-27 18:35:40 +10:00
Mark Steve Samson 47bbc35b74 Add `--no-cache` option to `fig build` (Closes #152) 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-07-20 11:28:28 +08:00
Daniel Nephin 779f4bda01 Fix cli for python 2.6 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-15 13:07:46 -07:00
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