tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,681 Commits 21 Branches 267 Tags 56 MiB
Commit Graph

229 Commits

Author SHA1 Message Date
Joffrey F b968d34227 Advanced merge for deploy dict in v3 files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-22 15:05:53 -08:00
Joffrey F 7f30a88bd6 Add type conversion (number, bool) -> float for label values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-17 18:50:27 -08:00
Joffrey F c387d05a40 Merge branch '4904-label-config-validation' of https://github.com/nginth/compose into nginth-4904-label-config-validation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-17 18:00:11 -08:00
Joffrey F 39d535c1f5 Fix unicode errors in interpolation / serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-09 17:05:12 -08:00
Joffrey F b13ec16e11 Replace unittest-style asserts with pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 14:38:28 -08:00
Joffrey F f22a1b6a2e Merge branch '5360-add-runtime-support' of https://github.com/cuckoohello/compose into cuckoohello-5360-add-runtime-support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 12:33:39 -08:00
Joffrey F fffcc05a8e Add stop_grace_period to ALLOWED_KEYS 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-11 11:03:19 -08:00
Joffrey F 5c0a06475c Expand mount source when type == bind 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-07 14:10:56 -08:00
Joffrey F 8155ddc7ad Add support for custom names for networks, secrets, configs 
Finalize v3.5 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 16:48:14 -08:00
Joffrey F 79b20eb53f Add support for mount syntax 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-05 16:21:49 -08:00
Yafeng Shan e4e92dd3d8 add support for `runtime` option in service definitions 
close #5360

Signed-off-by: Yafeng Shan <cuckoo@kokonur.me>
 2017-12-04 12:13:28 +08:00
Joffrey F 43fc651364
Merge pull request #5418 from nginth/5352-fix-volume-config 
Add config validation for service volumes, fixes #5352
 2017-12-01 12:19:23 -08:00
Drew Romanyk a1ac289943 Add label config validation, fixes #4904 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-11-30 11:57:42 -06:00
Drew Romanyk bee6046043 Add config validation for service volumes, fixes #5352 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-11-30 10:21:27 -06:00
Drew Romanyk badd4d764a Refactor subnet cidr validator & add new test 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-11-13 21:53:14 -06:00
Drew Romanyk 6c8184d0d0 Add format to other v3 configs & remove unix dependency 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-11-10 18:04:11 -06:00
Drew Romanyk 68c636d728 Fix subnet config test for windows 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-11-09 23:41:42 -06:00
Drew Romanyk 5691b8241d Implement subnet config validation (fixes #4552) 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-11-09 22:30:10 -06:00
Joffrey F 4563d8c050 Fix service label parsing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 13:51:49 -07:00
Guillermo Arribas aa1fb67495 Wrong format in the healthcheck test does not issue a warning (fixes #4424) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-23 14:50:22 -07:00
Guillermo Arribas eebc63c216 Allow empty default values in variable interpolation (fixes #5185) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-20 13:45:47 -07:00
Joffrey F 7df1b53ad2 Move build labels parsing to config module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 11:56:36 -07:00
Joffrey F 53e0378379 Mount with same container path and different mode should override 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-13 17:04:42 -07:00
Joffrey F 3654f3ac48 Fix oneOf validator parser to correctly process uniqueItems errors 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-09-26 17:21:31 -07:00
Joffrey F fc426e273d Merge extra_hosts instead of overwrite 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-09-01 13:18:44 -07:00
Joffrey F ec1f6c36eb Add support for extension fields in v2.x and v3.4 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-31 14:38:32 -07:00
Joffrey F 7210fdb21c Add support for start_period in healthcheck config 
Improve merging strategy for healthcheck configs

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-11 16:49:29 -07:00
Joffrey F 3fbfb3a5dd Prevent null logging options in `docker-compose config` output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-10 12:21:27 -07:00
Joffrey F 6e802df809 Add support for blkio config keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-09 19:45:22 -07:00
Joffrey F 3ea8a20cfa Fix ServiceExtendsResolver same-file detection 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-03 12:06:06 -07:00
Joffrey F 7abae9f536 Escape dollar sign in serialized config output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 18:16:55 -07:00
Yong Wen Chua 4a65008199 Add Compose v2.3 
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2017-07-20 17:06:59 -07:00
Joffrey F 8f0ef26a73 Improved version comparisons throughout the codebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-11 17:40:53 -07:00
Joffrey F d94fa5428e Make sure y/n values are quoted in serialized output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-06 15:15:12 -07:00
Joffrey F 55bd02f303 `scale` property should be merged according to standard scalar rules 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-05 13:10:50 -07:00
Joffrey F f2054f1a7d Fix ports sorting on Python 3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-27 12:50:41 -07:00
Joffrey F f3c1c8d158 ServicePort merge_field should account for external IP and protocol 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-12 11:42:29 -07:00
Joffrey F bd8d77feae Add configs tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F 9a70db0889 Merge pull request #4864 from shin-/cred_spec_support 
Add partial support for v3.3 credential_spec
 2017-05-25 17:30:44 -07:00
Joffrey F 73d7865da8 Add partial support (docker-compose config and warnings) for v3.3 credential_spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-25 14:54:46 -07:00
Joffrey F 062812e4aa Merge all fields inside build dict 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:23:04 -07:00
Joffrey F fa77856c86 Add 3.3 format support 
Remove build.labels field from 3.2 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 12:04:24 -07:00
Colin Hebert 9d78258b44 Fix test type 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Colin Hebert 37de55865b Add tests for the labels 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Alexey Rokhin 0043dc4fab Add cpu_count, cpu_percent, cpus parameters. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 14:50:29 +03:00
Joffrey F 3e66c68f9f Fix external secrets serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:42:17 -07:00
Joffrey F 72a2ea9d86 Fix serializer bug (python 3) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 16:54:31 -07:00
Joffrey F 2506b72508 Merge pull request #4649 from shin-/bump_docker_py 
Bump docker SDK dependency
 2017-03-31 14:40:49 -07:00
Joffrey F 48831a8d5f Bump docker SDK dependency 
Update invalid ports test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-28 16:15:34 -07:00
King Chung Huang 0e5acfa16c Merge deploy key in service dicts 
Update merge_service_dicts() to merge deploy mappings.
Compose file version 3 added the deploy key to service dicts
to specify configs related to Docker services.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
 2017-03-24 15:03:53 -06:00