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

60 Commits

Author SHA1 Message Date
Karol Duleba 56f03bc20a Allow to specify image by digest. Fixes #1670 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-19 21:13:34 +01:00
Aanand Prasad ed31673069 Merge pull request #1827 from mnowster/port-ranges 
Port ranges
 2015-08-12 11:17:22 +01:00
Aanand Prasad fb4c9fbb8b Merge pull request #1808 from mnowster/129-validate-compose-yml 
129 validate compose yml
 2015-08-12 11:15:47 +01:00
Aanand Prasad 982a845635 Fix mem_limit and memswap_limit regression 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-11 14:17:30 +01:00
Aanand Prasad dfa4bf4452 Ignore containers that don't have a name 
If a container is in the process of being removed, or removal has
failed, it can sometimes appear in the output of GET /containers/json
but not have a 'Name' key. In that case, rather than crashing, we can
ignore it.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-10 16:29:12 +01:00
Yuval Kohavi 0fdd977b06 fixed merge issue from previous commit 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-08-07 16:22:39 +01:00
Yuval Kohavi 297941e460 rebasing port range changes 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-08-07 16:22:39 +01:00
Mazz Mosley 76e6029f21 Replace service tests with config tests 
We validate the config against our schema before a service is created
so checking whether a service name is valid at time of instantiation of
the Service class is not needed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Mazz Mosley da36ee7cbc Perform schema validation 
Define a schema that we can pass to jsonschema to validate against the
config a user has supplied. This will help catch a wide variety of common
errors that occur.

If the config does not pass schema validation then it raises an exception
and prints out human readable reasons.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-07 12:06:34 +01:00
Aanand Prasad 04a773f1c8 Deprecate --allow-insecure-ssl 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-23 10:56:21 +01:00
Aanand Prasad 89f6caf871 Allow any volume mode to be specified 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 16:14:09 +01:00
Aanand Prasad 8b033d3946 Merge pull request #1665 from mnowster/1648-support-log-opt 
1648 support log opt
 2015-07-07 17:08:04 +01:00
Mazz Mosley 6f31e8ebe9 Add support for log_opt 
When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-07 16:26:43 +01:00
Aanand Prasad 531265bc84 Fix smart recreate when 'image' is changed to something nonexistent 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-07 16:01:44 +01:00
Mazz Mosley fc26982132 Add in memswap_limit run option 
By allowing the memswap_limit option to be defined we also need to
check that mem_limit is set, you can't have swap without a limit.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-06 17:08:57 +01:00
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