tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,791 Commits 21 Branches 266 Tags 54 MiB
Commit Graph

3791 Commits

Author SHA1 Message Date
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 adcd1901e9 Merge pull request #4340 from docker/bump-1.10.0 
Bump 1.10.0
 2017-01-17 15:25:06 -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 4bd6f1a0d8 Bump 1.10.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 4302861b21 Catch healthcheck exceptions in parallel_execute 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 76678747c7 Provide valid serialization of depends_on when format is not 2.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F ab97716a95 Use correct wheel file name in twine upload command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:27:49 -08:00
Joffrey F 260995fd56 Merge remote-tracking branch 'source/release' into bump-1.10.0 2017-01-17 13:24:01 -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
muicoder 931027c598 add IMAGE_EVENTS: load/save 
Signed-off-by: muicoder <muicoder@gmail.com>
 2017-01-16 10:53:40 +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 0f8a1aa7a3 Merge pull request #4312 from docker/bump-1.10.0-rc2 
Bump 1.10.0 rc2
 2017-01-11 11:36:56 -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 fb241d0906 Bump 1.10.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:47:40 -08:00
Joffrey F 71dd874600 Fix docker image build script when using universal wheels 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 16:47:40 -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 740a6842e8 Update setup.py extra_requires 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-10 15:01:13 -08:00
Thomas Grainger 340a3fc09c enable universal wheels 
Signed-off-by: Thomas Grainger <tom.grainger@procensus.com>
 2017-01-10 15:01:13 -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
Jun Guo cbb730172f Fix 404 issue, change APIError to more accureate ImageNotFound 
Signed-off-by: Jun Guo <blackhumour.gj@gmail.com>
 2017-01-09 16:44:32 -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
Daniel Nephin 91851cd5ae Fix schema typo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-09 16:38:42 -08:00
Joffrey F 22b837975d Add support for stop_grace_period in v2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:25 -08:00
Joffrey F de38c023ce Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:23 -08:00
Joffrey F 344f015a22 Use docker SDK 2.0.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-09 16:38:14 -08:00
Joffrey F 5dabe4ae62 Merge remote-tracking branch 'source/release' into bump-1.10.0-rc2 2017-01-09 16:27:38 -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 3dc5f91942 Merge pull request #4292 from docker/bump-1.10.0-rc1 
Bump 1.10.0 rc1
 2017-01-04 14:53:19 -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 ecff6f1a9a Bump 1.10.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 13:54:11 -08:00
Joffrey F f90618fc43 Unify healthcheck spec definition in v2 and v3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 13:54:11 -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 a45bb184f1 Merge remote-tracking branch 'source/release' into bump-1.10.0-rc1 2017-01-04 13:16:46 -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