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

145 Commits

Author SHA1 Message Date
Mazz Mosley f33f673b49 Allow _.- chars in service names 
As VALID_CHARS is shared with project names, these chars are also
now allowed within project names.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 17:57:50 +01:00
Mazz Mosley 8cf84ea552 Fix missing image names 
These tests were indeed raising a config error, but not for the reason
intended/tested for. I've added in the image name so the config error
raise is correctly testing the Service name.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-01 17:57:50 +01:00
Aanand Prasad bef0926c58 Explicitly set pull=False when building 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 17:43:16 -07:00
Daniel Nephin 06db577105 Move converge() to a test module, and use a short timeout for tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 17:18:27 -04:00
Travis Thieman c24d5380e6 Extend up -t to pass timeout to stop running containers 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-06-14 16:45:28 -04:00
Aanand Prasad 08bc4b830b Fix volume binds de-duplication 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-12 16:57:22 -04:00
Aanand Prasad ef4eb66723 Implement smart recreate behind an experimental CLI flag 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-18 18:39:18 +01:00
Daniel Nephin ed50a0a3a0 Resolves #1066, use labels to identify containers 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:47:26 -04:00
Daniel Nephin 417d9c2d51 Use individual volumes for recreate instead of volumes_from 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-11 13:01:43 -04:00
Daniel Nephin 6829efd4d3 Resolves #874, Rename instead of use an intermediate. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-07 21:53:41 -04:00
Daniel Nephin 3dd860f0ba Fix #923, support image with ids instead of names. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-04-29 10:13:18 -04:00
Michael Chase-Salerno 24a6c240fc Testcase for #1224, check that image or build is specified 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-15 21:38:24 +00:00
Michael Chase-Salerno 15b763acdb Fix for #1224, check that image or build is specified 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-15 02:03:02 +00:00
Aanand Prasad fd568b389d Fix home directory and env expansion in volume paths 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-07 16:23:45 +01:00
akoskaaa f9ea5ecf40 [pep8] make test files and config files pep8 valid 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 20:20:38 -07:00
Aanand Prasad 4ecf5e01ff Extract YAML loading and parsing into config module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:21:58 +00:00
Daniel Nephin f47431d591 Resolves #927 - fix merging command line environment with a list in the config 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-03-02 10:23:43 -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 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 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
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 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
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
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
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 431fdaa0f1 Merge pull request #490 from LuminosoInsight/insecure-pull 
Allow pulls from an insecure registry
 2014-10-01 10:52:54 -07:00
Moss Collum 3408e0d463 Add unit test for Service.pull 
Signed-off-by: Moss Collum <mcollum@luminoso.com>
 2014-10-01 11:09:19 -04:00
Aanand Prasad 267be12bb2 Merge pull request #456 from dnephin/volumes_from_service 
Fix volumes_from a service with no containers
 2014-09-30 18:33:39 -07: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 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 f5d43b6452 Resolves #455 - volumes_from a service with no containers. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-04 22:21:49 -04: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 24044fa704 Some additional validation for container ports, and a couple extra test cases. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-31 02:00:58 -04:00
Daniel Nephin 07fa169fd2 Resolves #260, #301 and #449 
Adds ~ support and ro mode support for volumes, along with some additional validation.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-31 02:00:52 -04: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
Sam Hanes 699bbe9ca2 Split the domainname out of qualified hostnames. 
Docker doesn't like it when a fully qualified hostname is passed in
the `hostname` parameter. When an FQDN is provided with `-h` the
official CLI puts the first component in `hostname` and the rest in
`domainname`. This change replicates that behavior when the user
specifies an FQDN in `hostname` in their `fig.yml`.

Signed-off-by: Sam Hanes <sam@maltera.com>
 2014-07-10 20:18:09 -07:00
Mark Steve Samson 4f7cbc3812 Support for host address in port bindings (Closes #267) 2014-06-27 15:07:22 +01:00
Ben Firshman ca7151aeb1 Split tests into unit and integration 2014-04-25 22:58:21 +01:00