tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,057 Commits 23 Branches 268 Tags
Commit Graph

1059 Commits

Author SHA1 Message Date
Joffrey F
bef2308530 Fix condition name in config tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:28:30 -08:00
Joffrey F
04394b1d0a Expand depends_on to allow different conditions (service_start, service_healthy) 
Rework "up" and "start" to wait on conditional state of dependent services
Add integration tests

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:28:30 -08:00
Joffrey F
ba47fb99ba Add default labels to networks and volumes created by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:43:35 -08:00
Joffrey F
e6b2949edc Merge pull request #4216 from lawliet89/userns_mode 
Implement `userns_mode` HostConfig for services
 2016-12-19 18:12:15 -08:00
Joffrey F
fb165d9c15 Add v3_only marker to healthcheck test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-16 12:21:59 -08:00
Joffrey F
04e5925a23 Use docker SDK 2.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-14 15:36:08 -08:00
Joffrey F
635a281777 Merge pull request #4163 from aanand/add-healthcheck 
Implement 'healthcheck' option
 2016-12-14 15:35:05 -08:00
Daniel Nephin
e04a12b5ca Increase minimum version for v3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-07 11:16:40 -05:00
Yong Wen Chua
62f8b1402e Implement userns_mode HostConfig for services 
Fixes #3349

This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2016-12-05 14:25:56 +08:00
Danny Guo
fbcc1510cc Handle giving help a nonexistent command 
The CLI would show an unhandled exception when running:
$ docker-compose help foobar

Now, it lists the commands.

Signed-off-by: Danny Guo <dannyguo91@gmail.com>
 2016-12-03 14:58:15 -05:00
Aanand Prasad
716a6baa59 Implement 'healthcheck' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-18 14:47:02 +00:00
Daniel Nephin
079c95c340 Use stop grace period for container stop. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-16 12:12:28 -05:00
Daniel Nephin
6cac48c056 Add a vendored and modified pytimeparse 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-16 12:10:32 -05:00
Aanand Prasad
d717c88b6e Support version 3.0 of the Compose file format 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-16 16:07:02 +00:00
Joffrey F
721bf89447 Merge pull request #4134 from shin-/fix_none_opts_network_check 
Avoid breaking when remote driver options are null
 2016-11-15 15:01:24 -08:00
Joffrey F
09540339e0 Merge pull request #4131 from aanand/test-environment-overrides-env-file 
Test that values in 'environment' override env files
 2016-11-15 14:18:54 -08:00
Joffrey F
7f60ff5ae6 Avoid breaking when remote driver options are null. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 12:00:52 -08:00
Joffrey F
efb4ed1b9e Handle new pull failures behavior in Engine 1.13 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-15 11:30:52 -08:00
Aanand Prasad
ba249e5179 Test that values in 'environment' override env files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-09 15:10:27 +00:00
Joffrey F
10417eebd7 Fix logging dict merging 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-03 17:22:31 -07:00
Joffrey F
ba43d08fbd Add whitelisted driver option added by the overlay driver to avoid breakage 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-01 11:47:12 -07:00
Aanand Prasad
8b5782ba9f Merge pull request #4067 from shin-/portable-find-exe 
Replace "which" calls with the portable find_executable function
 2016-10-24 16:15:21 -07:00
Joffrey F
60d005b055 Improve robustness of a couple integration tests with occasional failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 13:58:45 -07:00
Joffrey F
d2fb146913 Replace "which" calls with the portable find_executable function 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 13:22:52 -07:00
Joffrey F
efb09af271 Do not normalize volume paths on Windows by default 
Add environment variable to enable normalization if needed.
Do not normalize internal paths

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-18 12:17:56 -07:00
Nicolas Barbey
086ae04b9e Fix TypeError : unorderable types: str() < int() 
While merging list items into a set, strings and ints are compared which is not possible.
We cast everything to strings to avoid the issue.

The issue was seen with python 3.5 while overriding configuration files
with heterogenous port types (int in one file, string in another).

Signed-off-by: Nicolas Barbey <nicolas.a.barbey@gmail.com>
 2016-10-18 12:01:00 +02:00
Joffrey F
14716bc2da Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master 2016-10-17 14:09:09 -07:00
Joffrey F
a5c1e4b0cd Merge pull request #3991 from shin-/3906-isolation-config 
Add support for "isolation" in config
 2016-10-17 11:02:11 -07:00
Joffrey F
95c6cc0420 Merge pull request #3994 from shin-/3430-enable-ipv6 
Add support for enable_ipv6 in network definition.
 2016-10-17 11:02:00 -07:00
realityone
22d91f60be
fix serialize restart spec with null string 
Signed-off-by: realityone <realityone@me.com>
 2016-10-14 18:20:55 +08:00
dbdd
bdcce13f4a add support for creating volume and network with label definition 
Signed-off-by: dbdd <wangtong2712@gmail.com>
 2016-10-12 10:35:14 +08:00
Joffrey F
e4bb9bde30 Merge pull request #3964 from shin-/3963-unicode-env 
Don't break when interpolating environment with unicode characters
 2016-10-11 12:00:36 -07:00
Joffrey F
7f1606545d Merge pull request #4004 from shin-/4000-extend-logging 
Properly merge logging dictionaries in overriding configs
 2016-10-11 12:00:06 -07:00
Joffrey F
0603b445e2 Properly merge logging dictionaries in overriding configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-10 15:39:05 -07:00
Joffrey F
9248298a4a Merge pull request #4016 from shin-/4008-unicode-formatter 
Handle formatter case where logrecord message is binary containing unicode
 2016-10-06 16:49:03 -07:00
Joffrey F
bc3ed6dead Merge pull request #3992 from shin-/3701-npipe-windows-default 
Use docker-py's default behavior when no explicit host on Windows
 2016-10-06 16:48:35 -07:00
Joffrey F
e5ded6ff9b Add support for enable_ipv6 in network definition. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-06 15:49:08 -07:00
Joffrey F
17c5b45641 Handle formatter case where logrecord message is binary containing 
unicode characters.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-06 15:39:47 -07:00
Daniel Nephin
2bce81508e Support non-alphanumeric default values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-06 17:04:19 -04:00
Daniel Nephin
fe08be698d Support inline default values. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-29 12:46:11 -04:00
Joffrey F
007cf96452 Use docker-py's default behavior when no explicit host on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 15:36:57 -07:00
Joffrey F
dc8a39f70d Add support for "isolation" in config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-28 15:31:58 -07:00
Joffrey F
f65f89ad8c Merge pull request #3653 from shin-/3637-link-local-ips 
Add support for link-local IPs in service.networks definition
 2016-09-22 11:58:29 -07:00
Joffrey F
53fa44c01e Don't break when interpolating environment with unicode characters 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 18:05:59 -07:00
Joffrey F
7687412e03 Merge pull request #3922 from shin-/3897-volumespec_parse_win32 
Improve volumespec parsing on windows platforms
 2016-09-20 13:09:37 -07:00
Joffrey F
33424189d4 Denormalize function defaults to latest version 
Minor docs fix

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 11:47:14 -07:00
Joffrey F
7911659266 Improve volumespec parsing on windows platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-20 11:24:24 -07:00
Joffrey F
1648a3e257 Merge pull request #3709 from Knetic/groupadd 
Supported group_add
 2016-09-19 17:18:06 -07:00
Joffrey F
64517e31fc Force default host on windows to the default TCP host (instead of npipe) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-16 11:43:25 -07:00
Joffrey F
66b395d950 Include docker-py link-local fix and improve integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-09-15 14:55:42 -07:00