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

158 Commits

Author SHA1 Message Date
Ben Firshman 38a3ee8d63 Use upstream dockerpty 0.3.2 
This reverts commit 60411e9f05.

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
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
Ben Firshman 1820306d0a Merge pull request #529 from chmouel/override-environement 
Allow overriding environements on command line
 2014-10-14 11:27:20 +01:00
Ben Firshman 352062c2dc Use /bin/echo for intermediate container 
In cases where the service is using a minimal container,
/bin/echo can be created but echo cannot.

See #517

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-10-10 12:24:00 +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
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
Aanand Prasad ec5c864cc7 Merge pull request #460 from dnephin/fix_tests_for_docker_1.1 
Fix test failures on docker 1.1.2
 2014-09-30 17:52:38 -07:00
Aanand Prasad 537d435a28 Fix race condition in cli_test.py 
We weren't waiting for the build to finish, causing the rest of the test
to occasionally fail when looking for the image.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-09-26 11:42:16 -07:00
Aanand Prasad d978787fcc Merge pull request #439 from dnephin/faster_integration_tests 
Faster integration testing
 2014-09-24 17:34:52 -07: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
Daniel Nephin e0b0801e87 Do less work during integration testing. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-09 22:00:21 -04:00
Daniel Nephin 71e7103662 Fix some tests failing with docker 1.1.2 and add a comment to recreate_container() explaining what it does. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-09 20:59:28 -04: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
Ben Firshman 2827786886 Merge pull request #364 from docker/non-numeric-link-alias 
Non-numeric link alias
 2014-09-04 20:39:18 +01: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 e224c4caa4 Add integration test for restart command 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-08-13 10:01:27 +08:00
Daniel Nephin 294453433d Remove extra calls to docker server. 
Fix broken integration tests

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-10 11:24:20 -04: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
Aanand Prasad 62a4d214e8 Default link alias which is just the service name 
Closes #37.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:05:42 -07:00
Aanand Prasad 94887a28c7 Make sure we support explicit protocols in port bindings 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-24 11:48:29 -07:00
Aanand Prasad 262efce43e Fix test regression introduced in ed80576236 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-24 11:47:39 -07:00
Mark Steve Samson 7f06d46827 Add test for building with --no-cache 
Signed-off-by: Mark Steve Samson <hello@marksteve.com>
 2014-07-22 11:40:44 +08:00
Aanand Prasad 140ced6a3b Fix and document `dns:` option 
Closes #240.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-17 18:11:50 -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 89341013a0 Fix volumes_from container 
Closes #311.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-11 16:39:23 -07:00
Ben Firshman b573b87a92 Fix race condition in recreate containers 
Container might have stopped between checking `is_running` and
calling `stop()`, which then threw an exception.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 14:53:46 -07:00
Ryan Brainard 44a91e6ba8 Resolve environment without values to values on host 
For parity with the Docker CLI, allow environment variables without
values to be automatically resolved to their values on the host.

Signed-off-by: Ryan Brainard <brainard@heroku.com>

Conflicts:
	tests/integration/service_test.py
 2014-07-11 10:18:05 -07:00
Alexey Lebedeff d83bdd5164 Change working dir through fig.yml 
Closes #144

Signed-off-by: Alexey Lebedeff <binarin@gmail.com>
 2014-07-10 21:22:45 +04: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
Aanand Prasad d04b1724ec Merge pull request #236 from rail44/feature-support-volumes-from 
Support volumes_from option
 2014-07-02 10:48:11 +01:00
Satoshi Amemiya e5916b2fae Support volumes_from option 
Signed-off-by: Satoshi Amemiya <rail.sky@gmail.com>
 2014-07-02 13:27:54 +09:00
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
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
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
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 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 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
Ben Firshman ca7151aeb1 Split tests into unit and integration 2014-04-25 22:58:21 +01:00