Aanand Prasad 4911c77134 Merge pull request #1489 from dnephin/faster_integration_tests ...

Faster integration tests
(cherry picked from commit 5231288b4e)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py

2015-07-14 17:28:54 +01:00

..

build-ctx

Merge pull request #1489 from dnephin/faster_integration_tests

2015-07-14 17:28:54 +01:00

build-path

Interpret 'build:' as relative to the yml file

2015-03-31 18:47:26 -03:00

commands-composefile

Rename binary to docker-compose and config file to docker-compose.yml

2015-01-20 21:00:23 +00:00

dockerfile_with_entrypoint

Merge pull request #1489 from dnephin/faster_integration_tests

2015-07-14 17:28:54 +01:00

dockerfile-with-volume

Merge pull request #1489 from dnephin/faster_integration_tests

2015-07-14 17:28:54 +01:00

env

Make sure we're testing blank lines and comments in env files

2015-01-28 16:18:02 -05:00

env-file

Fix environment resolution

2015-03-13 14:22:28 +00:00

environment-composefile

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

extends

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

links-composefile

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

longer-filename-composefile

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

multiple-composefiles

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

no-composefile

WIP: rename Fig to Compose

2015-01-20 21:00:23 +00:00

ports-composefile

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

ports-composefile-scale

Merge pull request #1406 from vdemeester/667-compose-port-scale

2015-06-15 11:22:08 -07:00

simple-composefile

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

simple-dockerfile

Merge pull request #1489 from dnephin/faster_integration_tests

2015-07-14 17:28:54 +01:00

UpperCaseDir

Use 'top' instead of 'sleep' as a dummy command

2015-05-21 16:24:29 +01:00

user-composefile

Provide user override option on command line

2015-03-11 00:11:31 -04:00

volume-path

Make volume host paths relative to file, merge volumes when extending

2015-03-20 15:45:16 -07:00