tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-31 11:14:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,290 Commits 22 Branches 289 Tags
Commit Graph

207 Commits

Author SHA1 Message Date
Daniel Nephin
a8ac6e6f93 Add a warning when the host volume config is being ignored. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 13:48:53 -05:00
Daniel Nephin
ce322047a0 Move config hash tests to service_test.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -05:00
Daniel Nephin
3d9e3d0877 Remove service.start_container() 
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 10:17:09 -05:00
Daniel Nephin
a71d9af522 Disable a test against docker 1.8.3 because it fails due to a bug in docker engine. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 17:54:38 -04:00
Mazz Mosley
bee063c07d Fix tests 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Aanand Prasad
627f1acdc4 Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from 
1188 support ro options in volumes from
 2015-10-07 11:57:14 +01:00
Mazz Mosley
467c731869 address PR feedback 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Vincent Demeester
5b55a08846 Add support for ro option in volumes_from 
Fixes #1188

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-06 13:12:55 +01:00
Daniel Nephin
e230142a25 Reduce the scope of sys.stdout patching. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-03 01:24:28 -04:00
Daniel Nephin
c37a0c38a2 Fix a test case that assumes busybox image id. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-22 12:28:59 -04:00
Mazz Mosley
42c890796b Use docker.client.create_host_config 
create_host_config from docker.utils will be deprecated so that
the new create_host_config has access to the _version so
we can ensure that network_mode only gets set to 'default' by
default if the version is high enough and won't explode.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-17 17:11:00 +01:00
Mazz Mosley
2f45649611 Handle invalid log_driver 
Now docker-py isn't hardcoding a list of valid log_drivers, we
can expect an APIError in response rather than a ValueError
if we send an invalid log_driver.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-15 15:47:39 +01:00
Aanand Prasad
d1dd06a7e2 Update docker-py to 1.4.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-09-11 15:42:20 -07:00
Daniel Nephin
61415cd8bc Fixes #1955 - Handle unexpected errors, but don't ignore background threads. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-11 17:41:10 -04:00
Daniel Nephin
db9f577ad6 Extract link names into a function. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-03 14:08:44 -04:00
Mazz Mosley
6a399a5b2f Update tests to be compatible with validation 
Some were missing build '.' from their dicts, others were the
incorrect type and one I've moved from integration to unit.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-02 15:43:52 +01:00
Daniel Nephin
235fe21fd0 Prevent flaky test by changing container names. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-31 14:57:06 -04:00
Daniel Nephin
54973e8200 Remove flake8 ignores and wrap the longest lines to 140 char. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 12:53:11 -04:00
Daniel Nephin
bd7c032a00 Fix service integration tests. 
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
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
Aanand Prasad
8b5bd945d0 Interpolate environment variables 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-06 11:18:57 +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
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
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
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
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
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
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
Aanand Prasad
db2d02dc0b Remove Service.start_or_create_containers() 
It's only used in a single test method.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 10:59:03 -04:00
André Martins
ae63d35660 Modified scale awareness from exception to warning 
Signed-off-by: André Martins <martins@noironetworks.com>
 2015-05-26 23:59:45 +01:00
Aanand Prasad
b0cb31c186 Use 'top' instead of 'sleep' as a dummy command 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 16:24:29 +01:00
lsowen
ea7ee301c0 Add security_opt as a docker-compose.yml option 
Signed-off-by: Logan Owen <lsowen@s1network.com>
 2015-05-19 13:47:41 -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
delbert@umn.edu
df87bd91c8 Added devices configuration option 
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
 2015-05-11 10:50:58 -05: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
0f2f9db6d8 Merge pull request #1388 from vdemeester/1303-log-driver-support 
Add support for log-driver as a docker-compose.yml option
 2015-05-07 12:00:42 -04:00
Vincent Demeester
f626fc5ce8 Add support for log-driver in docker-compose.yml 
Closes #1303

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-05-06 13:18:58 +02:00
CJ
b06294399a See #1335: Added --read-only 
Signed-off-by: CJ <lim@chernjie.com>
 2015-05-02 23:39:39 +08:00