tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,166 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

3166 Commits

Author SHA1 Message Date
Joffrey F 8a27a0f059 Merge pull request #4350 from shin-/fix-invalid-depends-on-merge 
depends_on merge now retains condition information when present
 2017-01-19 14:50:29 -08:00
Joffrey F b47c97e94e Merge pull request #4358 from shin-/1.11-dev 
1.11.0dev
 2017-01-19 14:50:10 -08:00
Joffrey F a482c138d8 Merge pull request #4353 from xulike666/fight-for-readability 
Fix typo in script/test/versions.py
 2017-01-19 14:49:05 -08:00
Joffrey F 1c46525c2b 1.11.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 14:47:31 -08:00
Aaron.L.Xu 169289c8b6 find a fishbone 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-01-20 00:52:19 +08:00
Joffrey F 1a02121ab5 depends_on merge now retains condition information when present 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-18 17:52:03 -08:00
Joffrey F 708c4f9534 Merge pull request #4339 from shin-/4328-catch-healthcheck-exception 
Catch healthcheck exceptions in parallel_execute
 2017-01-17 14:16:37 -08:00
Joffrey F 56a1b02aac Catch healthcheck exceptions in parallel_execute 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:22:16 -08:00
Joffrey F 5ade097d74 Merge pull request #4324 from shin-/4321-v3-depends-on 
Provide valid serialization of depends_on when format is not 2.1
 2017-01-12 11:52:15 -08:00
Joffrey F 62cdd25b7d Merge pull request #4323 from shin-/fix-push-release-script 
Use correct wheel file name in twine upload command
 2017-01-12 11:52:05 -08:00
Joffrey F 2df31bb13c Provide valid serialization of depends_on when format is not 2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 16:25:40 -08:00
Joffrey F 29b46d5b26 Use correct wheel file name in twine upload command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-11 15:39:48 -08:00
Joffrey F 2091149fee Merge pull request #4317 from shin-/release-script-fixes 
Fix docker image build script when using universal wheels
 2017-01-10 17:21:27 -08:00
Joffrey F 19190ea0df Fix docker image build script when using universal wheels 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:43:26 -08:00
Joffrey F 1c1fe89e43 Merge pull request #4316 from shin-/update-setup-py 
Update setup.py extra_requires
 2017-01-10 15:50:11 -08:00
Joffrey F 52792b7a96 Update setup.py extra_requires 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 14:59:11 -08:00
Joffrey F 9f6778aa73 Merge pull request #4172 from graingert/enable-universal-wheels 
enable universal wheels
 2017-01-10 14:57:22 -08:00
Joffrey F 545153f117 Merge pull request #4288 from tntC4stl3/fix_404_issue 
Fix 404 issue, change APIError to more accureate ImageNotFound
 2017-01-09 16:43:57 -08:00
Joffrey F 3f7b3fbf0a Merge pull request #4304 from shin-/4302-dockerignore-windows 
Use docker SDK patch
 2017-01-09 16:14:57 -08:00
Joffrey F 88294b46dd Merge pull request #4294 from shin-/4240-compose-convert-false 
Ensure falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized
 2017-01-09 15:49:44 -08:00
Joffrey F 2c157e8fa9 Use docker SDK 2.0.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 15:27:20 -08:00
Joffrey F b570cba965 Merge pull request #3961 from ankon/patch-1 
Fix typo
 2017-01-09 12:15:04 -08:00
Joffrey F 3bb8a7d178 Merge pull request #4297 from shin-/4271-fix-schemas 
Fix config schemas (misplaced "additionalProperties")
 2017-01-06 12:10:22 -08:00
Joffrey F 45c7ee4466 Merge pull request #4279 from dnephin/fix-schema-typo 
Fix schema typo
 2017-01-05 17:15:39 -08:00
Joffrey F e063c5739f Fix config schemas (misplaced "additionalProperties") 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-05 11:18:21 -08:00
Joffrey F 534b4ed820 Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 15:45:11 -08:00
Joffrey F 27d91bba01 Merge pull request #4293 from shin-/stop_timeout_v2.1 
Add support for stop_grace_period in v2
 2017-01-04 15:14:18 -08:00
Joffrey F 1be41f59c9 Add support for stop_grace_period in v2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 14:30:20 -08:00
Joffrey F 838bdd71f3 Merge pull request #4291 from shin-/unify-healthcheck-def-v2v3 
Unify healthcheck spec definition in v2 and v3
 2017-01-04 13:53:39 -08:00
Joffrey F 47b672e393 Merge pull request #4051 from shin-/update-release-process 
Update release process document to account for recent changes.
 2017-01-04 13:15:49 -08:00
Joffrey F 8145429399 Unify healthcheck spec definition in v2 and v3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 13:14:23 -08:00
Joffrey F be88bb0e6c Merge pull request #4267 from shin-/3754-depends-on-healthcheck 
Allow service dependencies to wait on healthy containers
 2017-01-04 13:00:19 -08:00
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 f6edd610f3 Add 3.0 schema to docker-compose.spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:26:45 -08:00
Joffrey F 0edfe08bf0 Add healthchecks to 2.1 schema. Update depends_on 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:26:45 -08:00
Thomas Grainger 2648af6807
enable universal wheels 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2017-01-04 18:33:58 +00:00
Jun Guo c73fc26824 Fix 404 issue, change APIError to more accureate ImageNotFound 
Signed-off-by: Jun Guo <blackhumour.gj@gmail.com>
 2017-01-04 15:42:31 +08:00
Daniel Nephin a74b2f2f70 Fix schema typo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-28 15:16:53 -05:00
Joffrey F 09690e1758 Merge pull request #4220 from shin-/4211-default_network_labels 
Add default labels to networks and volumes created by Compose
 2016-12-20 02:34:57 -08:00
Joffrey F 3058e39407 Merge pull request #4268 from shin-/jtakkala-3765-sysctl-support 
Add sysctl option support when creating service
 2016-12-20 02:34:02 -08:00
Joffrey F e1ebb0df22 Merge pull request #4070 from shin-/use-colorama 
Use colorama to enable colored output on Windows
 2016-12-20 02:32:51 -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 346802715d Use colorama to enable colored output on Windows 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:40:47 -08:00
Joffrey F eb6441c8e3 Add sysctls option to 3.0 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:35:09 -08:00
Joffrey F 82230071d5 Merge branch '3765-sysctl-support' of https://github.com/jtakkala/compose into jtakkala-3765-sysctl-support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:33:54 -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 ea7b565009 Merge pull request #4232 from shin-/attachable_networks 
Make created networks attachable for file format >=2.1
 2016-12-16 13:06:57 -08:00
Joffrey F e736151ee4 Make created networks attachable for file format >=2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-16 12:23:24 -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