tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-14 09:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,286 Commits 20 Branches 280 Tags
Commit Graph

215 Commits

Author SHA1 Message Date
Drew Romanyk
dba2abd523 Add config validation for service volumes, fixes #5352 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk
76e9076cb7 Refactor subnet cidr validator & add new test 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk
df0f7e17d3 Add format to other v3 configs & remove unix dependency 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk
fa61a91cb5 Fix subnet config test for windows 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk
cf782a3dbb Implement subnet config validation (fixes #4552) 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Guillermo Arribas
e022f32ee9 Wrong format in the healthcheck test does not issue a warning (fixes #4424) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:32:25 -08:00
Guillermo Arribas
8cd46cd54d Allow empty default values in variable interpolation (fixes #5185) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:32:25 -08:00
Joffrey F
03fefaca39 Fix service label parsing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:13:58 -08:00
Joffrey F
f6d7eeb129 Move build labels parsing to config module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
Joffrey F
f74838676d Mount with same container path and different mode should override 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
Joffrey F
49b1ac57c3 Fix oneOf validator parser to correctly process uniqueItems errors 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
Joffrey F
2f61a1dac4 Add support for extension fields in v2.x and v3.4 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:18 -07:00
Joffrey F
241931f776 Merge extra_hosts instead of overwrite 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-09-01 15:43:44 -07:00
Joffrey F
43cb1f3dff Add support for start_period in healthcheck config 
Improve merging strategy for healthcheck configs

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
b2a3566cf5 Prevent null logging options in docker-compose config output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
6361d907f6 Add support for blkio config keys 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
467e0d0d31 Fix ServiceExtendsResolver same-file detection 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
770d94376a Escape dollar sign in serialized config output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Yong Wen Chua
c006add122 Add Compose v2.3 
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2017-08-21 13:09:19 -07:00
Joffrey F
56a23bfcd2 Improved version comparisons throughout the codebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
2d21bf6a50 Make sure y/n values are quoted in serialized output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
0916f124d0 scale property should be merged according to standard scalar rules 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
1dfdbe6f94 Fix ports sorting on Python 3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
5c3d0db3f2 ServicePort merge_field should account for external IP and protocol 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 13:28:04 -07:00
Joffrey F
bf3b62e2ff Add configs tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
909ef7f435 Add partial support (docker-compose config and warnings) for v3.3 credential_spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
150c44dc36 Merge all fields inside build dict 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
2ffa67cf92 Add 3.3 format support 
Remove build.labels field from 3.2 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Colin Hebert
2182329dae Fix test type 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-30 15:23:00 -07:00
Colin Hebert
67e48ae4cb Add tests for the labels 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
93d1ce5a55 Add cpu_count, cpu_percent, cpus parameters. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
Joffrey F
f94cf103d6 Fix external secrets serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:42:56 -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
Joffrey F
a0add5cc12 Fix ports reparsing for service extends 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-22 15:14:13 -07:00
Joffrey F
611f058cde Merge pull request #4632 from shin-/expanded-mounts 
Add support for expanded mount/volume notation
 2017-03-21 12:36:41 -07:00
Joffrey F
69d0c0e3a0 Add support for expanded mount/volume notation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-17 20:42:59 -07:00
King Chung Huang
0464476f08 Add unit test for image digests in config 
Add two unit tests to validate that the denormalize_service_dict
function still works without passing a third argument for image_digest,
and correctly uses an image digest if one is provided.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
 2017-03-17 12:22:40 -06:00
Daniel Nephin
2acf286ed6 Support V3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-15 11:40:31 -04:00
Joffrey F
a6db78e5d4 Enable variable substitution in config.secrets 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-13 18:30:37 -07:00
Joffrey F
23b873c2ce Add "secrets" section to docker-compose config output when applicable 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-10 14:32:55 -08:00
Dimitar Bonev
707210ae95 Ability to change working directory via a CLI flag 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2017-03-08 14:42:14 -08:00
Joffrey F
d5a2d37d05 Properly resolve build args against host environment values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-07 18:13:11 -08:00
Dat Tran
449dcc9d7b support --build-arg for build command 
Signed-off-by: Dat Tran <dattran.vn01@gmail.com>
 2017-03-07 17:09:35 -08:00
Joffrey F
0167aba2b7 Merge pull request #4541 from shin-/4502-expanded-port-syntax 
Add support for expanded port syntax in 3.1 format
 2017-03-06 18:32:52 -08:00
George Lester
c7b8278e78 Implemented dns_opt 
Signed-off-by: George Lester <glester491@gmail.com>
 2017-03-03 15:37:21 -08:00
Joffrey F
8d3c8be7d9 Merge pull request #4036 from nbarbey/master 
Fix TypeError : unorderable types: str() < int()
 2017-03-01 17:25:21 -08:00
Joffrey F
9f8e01fa94 Merge pull request #3543 from milin/master 
Replace assertEquals with assertEqual in unittests since the former is getting dep…
 2017-03-01 16:27:36 -08:00