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

198 Commits

Author SHA1 Message Date
Aanand Prasad bc1f6c97d8 Merge pull request #898 from aanand/support-fig-yml 
Support fig.yml
 2015-01-29 13:47:49 -05:00
Aanand Prasad 7c087f1c07 Support fig.y(a)ml and show a deprecation warning 
Closes #864

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 13:14:44 -05:00
Aanand Prasad 9bc7604e0e Make sure we're testing uppercase directories properly 
(OS X is case-sensitive so we can't have fixture dirs which are
identically named if you ignore case)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 17:19:27 -05:00
Aanand Prasad de07e0471e Show a nicer error when the env file doesn't exist 
Closes #865

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:20:01 -05:00
Aanand Prasad 6c45b6ccdb Make sure we're testing blank lines and comments in env files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:18:02 -05:00
Aanand Prasad 1476027410 Fix test for image-declared volumes 
A stray 'fig' got lost in the merge post-rename, meaning the containers
weren't being cleaned up properly.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-27 14:46:58 -05:00
Aanand Prasad 620e29b63f Rename binary to docker-compose and config file to docker-compose.yml 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 2af7693e64 WIP: rename Fig to Compose 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad cbd3ca07c4 Handle Swarm-style prefixed names in Container.from_ps() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:38:06 +00:00
Aanand Prasad edb6b24b8f Handle Swarm-style prefixed names in Service.containers() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:38:06 +00:00
Aanand Prasad 608f29c7cb Unit tests for Service.containers() and get_container_name() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:38:06 +00:00
Aanand Prasad 17a8a7be4b (Failing) test for preservation of volumes declared in images 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:16:18 +00:00
Daniel Nephin 2dd1cc80ca Revert "Merge pull request #711 from dnephin/fix_volumes_on_recreate" 
This reverts commit 55095ef488, reversing
changes made to 72095f54b2.

Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2015-01-20 12:03:03 -08:00
Daniel Nephin 7eb476e61d Resolves #447, fix volume logic for recreate container 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-14 16:20:59 -05:00
Daniel Nephin 26f45efea2 Remove unused intermediate_container from return value. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-12 22:16:54 -08:00
Aanand Prasad 4827e60641 Merge pull request #568 from Aigeruth/fix/project_name 
Convert project_name to lowercase
 2015-01-12 16:23:09 +00:00
Christophe Labouisse aa0c43df96 Add cpu_shares option in fig.yml 
This options maps exactly the docker run option with the same name.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-01-11 20:10:48 +01:00
Daniel Nephin 3ee8437eaa Fix the failing test. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-08 10:55:40 -05:00
Daniel Nephin b903217a4a Merge pull request #544 from LuminosoInsight/external-links 
Allow links to containers outside of the project
 2015-01-08 10:39:00 -05:00
Daniel Nephin 3056ae4be3 Add a no-build option to fig up, to save time when services were already freshly built. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-12-31 13:47:24 -05:00
Daniel Nephin 5b777ee5f1 Cleanup service unit tests and restructure some service create logic. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-12-31 13:39:41 -05:00
Jason Bernardino Alonso 4257707244 Accept an external_links list in the service configuration dictionary to create links to containers outside of the project 
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
Signed-off-by: Mauricio de Abreu Antunes <mauricio.abreua@gmail.com>
 2014-12-30 15:31:33 -05:00
Aanand Prasad 70c3676084 Merge pull request #763 from bfirsh/pass-through-detach-to-create-container 
Don't attach stdin and stdout when in detach mode
 2014-12-30 16:05:53 +00:00
Ben Firshman e89826fe43 Don't attach stdin and stdout when in detach mode 
This is primarily to make it work with Swarm, which checks that
AttachStd{in,out,err} is false when creating containers.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-30 14:13:36 +00:00
Aanand Prasad 0e172228d1 Merge pull request #485 from squebe/run-service-ports 
Added map service ports option for run command.
 2014-12-19 14:17:57 -08:00
Mohammad Salehe 5182bd0968 Add dns_search support in yml config 
Signed-off-by: Mohammad Salehe <salehe@gmail.com>
 2014-12-15 16:37:31 +03:30
Aanand Prasad 05544ce241 Stronger integration tests for volume binds 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-12-12 17:53:57 -08:00
Stephen Quebe cc834aa564 Added map service ports option for run command. 
When using the fig run command, ports defined in fig.yml can be mapped
to the host computer using the -service-ports option.

Signed-off-by: Stephen Quebe <squebe@gmail.com>
 2014-12-11 20:30:38 -05:00
Daniel Nephin 8f8e322de2 Include image name for env_file tests. 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-12-11 14:25:26 -08:00
Daniel Nephin 64762c9dea Merge pull request #716 from bfirsh/pull-latest-tag-by-default 
Pull latest tag by default
 2014-12-11 15:58:40 -05:00
Ben Firshman 8ebec9a67f Pull latest tag by default 
This was changed in Docker recently:

https://github.com/docker/docker/pull/7759

This means we aren't pulling loads of tags when we only use the
latest.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-11 12:37:04 -08:00
Daniel Nephin 3c0f297ba6 Some minor cleanup from yelp/fig 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-12-11 10:08:39 -08:00
Ben Langfeld 98b6d7be78 Add support for 'env_file' key 
Signed-off-by: Ben Langfeld <ben@langfeld.me>
 2014-12-08 23:42:09 +00:00
Tyler Fenby 5c58180538 Add capability add/drop introduced in Docker 1.2 
Signed-off-by: Tyler Fenby <tylerfenby@gmail.com>
 2014-12-08 12:32:52 -05:00
Ben Firshman e9d946b038 Merge pull request #594 from popox/restart-option 
Add restart option to Fig.
 2014-12-08 08:43:27 -08:00
Daniel Nephin 65ae22e79a Merge pull request #611 from raulcd/604_support_reloading_containers 
Add signal in the kill CLI commando to send a specific signal to the service
 2014-11-13 10:28:14 -05:00
Paul B 04da6b035e Add restart option to Fig. Related to #478 
Signed-off-by: Paul Bonaud <paul@bonaud.fr>
 2014-11-08 12:10:11 +01:00
Andrew Burkett 4f6d02867b Move to build_port_bindings(). Added Tests 
Signed-off-by: Andrew Burkett <burkett.andrew@gmail.com>
 2014-11-06 18:11:09 -08:00
Raúl Cumplido 9abdd337b5 Add signal in the kill CLI commando to send a specific signal to the service 
Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
 2014-11-04 12:22:39 +00:00
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
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
Gabor Nagy c838f7da18 Convert project_name to lowercase 
Signed-off-by: Gabor Nagy <mail@aigeruth.hu>
 2014-10-21 13:40:19 +02: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
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