tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-06-24 15:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,550 Commits 21 Branches 276 Tags
Commit Graph

190 Commits

Author SHA1 Message Date
Daniel Nephin
71ff872e8e Update unit tests for stream_output to match the behaviour of a docker-py response. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:48:48 -04:00
Daniel Nephin
2943ac6812 Cleanup requirements.txt so we don't have to maintain separate copies for py2 and py3. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:46:08 -04:00
funkyfuture
9aa61e596e Run tests against Python 2.6, 2.7, 3.3, 3.4 and PyPy2 
In particular it includes:
- some extension of CONTRIBUTING.md
- one fix for Python 2.6 in tests/integration/cli_test.py
- one fix for Python 3.3 in tests/integration/service_test.py
- removal of unused imports

Make stream_output Python 3-compatible

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-25 10:41:09 -04:00
Daniel Nephin
809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -04:00
Daniel Nephin
59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Frank Sachsenheim
227584b864 Adds pause and unpause-commands 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
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
Mazz Mosley
f4a8fda283 Handle all exceptions 
If we get back an error that wasn't an APIError, it was causing the
thread to hang. This catch all, while I appreciate feels risky to
have a catch all, is better than not catching and silently failing,
with a never ending thread.

If something worse than an APIError has gone wrong, we want to stop
the incredible journey of what we're doing.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-17 16:31:57 +01:00
Daniel Nephin
b87c09b9fc Merge pull request #1824 from mrfuxi/run-with-ports 
Allow manual port mapping when using "run" command
 2015-08-13 08:29:25 -07:00
Karol Duleba
ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 18:54:42 +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
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
297941e460 rebasing port range changes 
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
 2015-08-07 16:22:39 +01:00
Aanand Prasad
8b5bd945d0 Interpolate environment variables 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-06 11:18:57 +01:00
Aanand Prasad
92ef1f5702 Make compose.config a proper module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-05 15:50:22 +01:00
Luke Marsden
a68ee0d9c2 Support volume_driver in compose 
* Add support for volume_driver parameter in compose yml
* Don't expand volume host paths if a volume_driver is specified
  (i.e., disable compose feature "relative to absolute path
  transformation" when volume drivers are in use, since volume drivers
  can use name where host path is normally specified; this is a
  heuristic)

Signed-off-by: Luke Marsden <luke@clusterhq.com>
 2015-07-31 15:23:15 +01:00
Aanand Prasad
27bd987f28 Add test for trailing slash volume copying bug 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-30 10:31:54 +01:00
Aanand Prasad
9768872507 Fix "Duplicate volume mount" error when config has trailing slashes 
When an image declares a volume such as `/var/lib/mysql`, and a Compose
file has a line like `./data:/var/lib/mysql/` (note the trailing slash),
Compose creates duplicate volume binds when *recreating* the container.
(The first container is created without a hitch, but contains multiple
entries in its "Volumes" config.)

Fixed by normalizing all paths in volumes config.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 18:42:08 +01:00
Aanand Prasad
118a389646 Update API version to 1.19 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-29 15:44:21 +01:00
Mazz Mosley
65cc84140a Merge pull request #1736 from aanand/deprecate-allow-insecure-ssl 
Deprecate --allow-insecure-ssl
 2015-07-23 14:09:17 +01:00
Aanand Prasad
70c7d27c4e Merge pull request #1758 from mnowster/improve-scale-test-coverage 
Improve scale test coverage
 2015-07-23 11:07:48 +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
Mazz Mosley
119901c19b Improve test coverage for scale 
Also includes tiny amount of code cleanup, being explicit with imports.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-23 10:55:57 +01:00
Aanand Prasad
1739448402 Don't use custom name for one-off containers 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-22 15:39:56 +01:00
Aanand Prasad
a3191ab90f Add container_name option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 15:50:09 +01:00
Aanand Prasad
ced94a3504 Make smart recreate the default 
Add --force-recreate flag to enable the old default behaviour of
recreating everything.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-17 11:28:02 +01:00
Mazz Mosley
c7dccccd1f Merge pull request #1704 from aanand/fix-timeout-type 
Make sure up/restart/stop timeout is an int
 2015-07-16 10:50:06 +01:00
Aanand Prasad
0c5c8d1f00 Handle case where /containers/json returns "Labels": null 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 17:13:33 +01:00
Aanand Prasad
ec8bf066ba Make sure up/restart/stop timeout is an int 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-15 16:56:39 +01:00
Aanand Prasad
81707ef1ad Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers 
Show an error on 'run' when there are legacy one-off containers
 2015-07-08 14:48:03 +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
Aanand Prasad
e98caf5cf9 Show an error on 'run' when there are legacy one-off containers 
Also warn the user about the one-off containers in the standard error
message about legacy containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-06 14:45:17 +01:00
Aanand Prasad
fc8f564558 Merge pull request #1632 from mnowster/extends_file_default_behaviour 
Extends file default behaviour and fixes circular reference bug
 2015-07-06 13:28:54 +01:00
Aanand Prasad
f42fd6a3ad Merge pull request #1642 from aanand/fix-1573 
Fix bug where duplicate container is leftover after 'up' fails
 2015-07-03 16:25:53 +01:00
Mazz Mosley
317bbec98c Move make_service_dict out of config 
This top level function is a test helper, so I've moved it into the
config_test file and updated accordingly.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-03 15:06:53 +01:00
Aanand Prasad
0b887b841f Stop 'rm' and 'ps' listing services not defined in the current file 
If you have an alternate YAML file with different services defined,
containers for those services will be shown in `docker-compose ps` even
if you don't pass that file in.

Furthermore, `docker-compose rm` will claim that it's going to remove
them, but actually won't.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-03 14:34:27 +01:00
Aanand Prasad
62b47224f0 Fix bug where duplicate container is leftover after 'up' fails 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-03 10:46:07 +01:00
Daniel Nephin
ae96fc0071 Support reading config from stdin. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-07-02 22:16:22 -04:00
Aanand Prasad
77c939b256 Merge pull request #1142 from calou/master 
Added support of option mac-address
 2015-06-17 14:39:00 -07:00
Sébastien Gruchet
b76ac6e633 Added support to option mac-address 
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Updated doc

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Fixed LINT errors

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed mac-address entry order in config keys

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed attributes order in docs/yml.md

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
 2015-06-17 21:28:17 +02:00
Aanand Prasad
bc14c473c9 Merge pull request #1521 from dano/validate-service-names 
Validate that service names passed to Project.containers aren't bogus.
 2015-06-16 10:45:49 -07:00
Aanand Prasad
5b2a0cc73d Merge pull request #1406 from vdemeester/667-compose-port-scale 
Fixing docker-compose port with scale (#667)
 2015-06-15 10:58:44 -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
Daniel Nephin
60351a8e07 Speed up integration test and make cleanup easier by using labels 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 16:45:28 -04:00
Daniel Nephin
d827809ffb Use labels to filter containers. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 16:45:28 -04:00
Vincent Demeester
a5fd91c705 Fixing docker-compose port with scale (#667) 
Fixes #667 and Closes #735 (taking over it)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-06-10 23:26:33 +02:00
Aanand Prasad
4fd5d58076 Test against Docker 1.7.0 RC2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-10 14:19:36 -04:00
Aanand Prasad
ff151c8ea0 Test that data volumes now survive a crash when recreating 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 13:06:09 -04:00
Dan O'Reilly
c59c9dd951 Add integration test for service name verification 
Add a test to make sure NoSuchService is raised if
a bogus service name is given to 'docker-compose logs'.

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-06-08 17:04:42 -04:00