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
803 Commits 23 Branches 268 Tags
Commit Graph

138 Commits

Author SHA1 Message Date
Ben Firshman
8773f51583 Don't select stdin when interactive=False 
Patch from https://github.com/d11wtq/dockerpty/pull/24

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-11-04 10:25:27 +00:00
Ben Firshman
38a3ee8d63 Use upstream dockerpty 0.3.2 
This reverts commit 60411e9f05ac2b9245053491cef7c3cda9e923f1.

Closes #556

Signed-off-by: Ben Firshman <ben@firshman.co.uk>

Conflicts:
	requirements.txt
	setup.py
 2014-11-04 10:23:42 +00:00
Michael A. Smith
782a46fd60 Fixes #602 Allowing help $cmd with no figfile 
Signed-off-by: Michael A. Smith <michael@smith-li.com>
 2014-11-02 06:22:16 -05:00
Ben Firshman
9813a8d5be Merge pull request #562 from tjrivera/insecure-registry 
Allow dependent image pull from insecure registry
 2014-10-22 18:45:03 +01:00
Tyler Rivera
491181ec31 Allow dependent image pull from insecure registry 
PR #490 Provides the ability to pull from an insecure registry by passing --allow-insecure-ssl. This commit extends the work done in #490 and adds the ability to pass --allow-insecure-ssl to the up and run commands which will attempt to pull dependent images if they do not exist.

Signed-off-by: Tyler Rivera <riverat2@email.chop.edu>
 2014-10-22 10:57:43 -04:00
Aanand Prasad
67d4b7c587 Merge pull request #574 from bfirsh/update-tagline 
Update tagline to match website
 2014-10-22 12:46:16 +01:00
Ben Firshman
75b3dcf5fd Update tagline to match website 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-22 12:41:01 +01:00
Daniel Nephin
7544580b4b Resolves #553, Resolves #546 - bug fixes with unit tests 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-10-18 13:54:10 -04:00
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
Aanand Prasad
b318585f3c TLS support, with same env vars as docker client 
Thanks to @jkingyens for the bulk of the work.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-16 10:41:26 +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
Aanand Prasad
b969988ccb Remove references to docker-osx 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 14:21:49 +01: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
Daniel Nephin
fac49b62b6 Support setting project name from the environment. 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-09-29 18:01:08 -04: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
Daniel Nephin
8157f0887d Fix the return value of get_tty_width() it should return an int. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-25 22:20:07 -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
b0f398caaa Resolves #386, tty width on jenkins 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-07 12:30:01 -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
Aanand Prasad
91fe414522 Fix regression of default behaviour in Command.project_name 
Needed an `os.abspath` in there. Added more tests, too.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-14 11:32:10 -07:00
Ben Firshman
7fb43cc85f Merge pull request #283 from d11wtq/feature/optional-command 
Make fig run COMMAND parameter optional.
 2014-07-14 18:33:18 +01:00
Ryan Brainard
e9c2f2c5fb Default project_name to dirname of fig.yml 
Signed-off-by: Ryan Brainard <brainard@heroku.com>
 2014-07-12 23:38:20 -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
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
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
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
0fc9cc65d1 Rename '--only' => '--no-deps' 
Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
 2014-06-21 10:30:36 +00: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
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