tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,583 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

4583 Commits

Author SHA1 Message Date
Joffrey F 65004e9b11
Merge pull request #5541 from docker/nginth-3397-depends-on-restart 
Fix depends_on recreation behavior
 2018-01-05 16:19:11 -08:00
Drew Romanyk c63ad67e9c Convert to use any for finding stopped containers 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2018-01-05 15:49:16 -08:00
Drew Romanyk 5db3cd60d4 Reword & Optimize getting stopped containers & update tests 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2018-01-05 15:49:16 -08:00
Drew Romanyk ba0b3d421c Fix depends on restart behavior, fixes #3397 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2018-01-05 15:49:03 -08:00
Joffrey F 353ebe9337
Merge pull request #4992 from johnharris85/3573-ignore-orphan-warning 
Add --ignore-orphan-warning
 2018-01-05 15:29:22 -08:00
John Harris 963b004749 Add COMPOSE_IGNORE_ORPHANS 
Signed-off-by: John Harris <john@johnharris.io>
 2018-01-04 17:46:11 -08:00
Joffrey F c3b1bce42e
Merge pull request #5538 from docker/update_test_asserts 
Replace unittest-style asserts with pytest asserts
 2018-01-04 15:00:44 -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 b97b76d24f
Merge pull request #5537 from docker/Rozelette-branch_limit_test 
Add configurable parallel operations limit
 2018-01-04 13:04:27 -08:00
Joffrey F ddbc9e30b0 Merge branch 'cuckoohello-5360-add-runtime-support' 2018-01-04 12:46:26 -08:00
Joffrey F 74f616f208 Fix if_runtime_available decorator 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 12:45:31 -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 8d3c7d4bce Clean up limit setting code and add reasonable input guards 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 12:16:46 -08:00
Joffrey F d582ae0009 Merge branch 'branch_limit_test' of https://github.com/Rozelette/compose into Rozelette-branch_limit_test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 11:32:38 -08:00
Joffrey F bcc13d7fae
Merge pull request #5530 from docker/5527-convert-errors 
Gracefully handle errors and provide helpful error message in type conversion
 2018-01-03 16:02:11 -08:00
Joffrey F 2d064614ac Gracefully handle errors and provide helpful error message in type conversion 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-03 14:02:05 -08:00
Joffrey F ec95c38fa9
Merge pull request #5496 from docker/bump_docker_py 
Bump docker SDK dependency
 2017-12-19 17:46:12 -08:00
Joffrey F ebf1a658a6 Bump docker SDK dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-19 16:37:50 -08:00
Joffrey F 4a4ee35ca0
Merge pull request #5493 from shin-/update_master_1.18 
Resync master with release branch
 2017-12-18 16:09:04 -08:00
Joffrey F 17195d33e6 1.19.0-dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 15:59:23 -08:00
Joffrey F 095292bf83 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 15:58:40 -08:00
Joffrey F cae6bf9557
Merge pull request #5479 from docker/bump-1.18.0 
Bump 1.18.0
 2017-12-18 15:50:50 -08:00
Joffrey F 9191bf3813
Merge pull request #5490 from docker/5489-convert-mounts 
Convert mounts to legacy volumes if API version < 1.30
 2017-12-18 13:28:40 -08:00
Joffrey F 8dd22a962a Bump 1.18.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 13:20:55 -08:00
Joffrey F 5a7ba590fb Convert mounts to legacy volumes if API version < 1.30 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 13:20:55 -08:00
Joffrey F 0025050847 Convert mounts to legacy volumes if API version < 1.30 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-18 12:35:59 -08:00
Ashlie Martinez acf76c15a2 Allow parallel limit to be set in env file. 
Signed-off-by: Ashlie Martinez <ashmrtn@utexas.edu>
 2017-12-16 19:50:55 -06:00
Ashlie Martinez dc6b464751 Do not bleed env values outside of test. 
Signed-off-by: Ashlie Martinez <ashmrtn@utexas.edu>
 2017-12-16 08:51:02 -06:00
Joffrey F d5167d5329 Avoid CLI crash if image has no tags 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-13 13:41:38 -08:00
Joffrey F 7614becbfe Re-align docstring 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-13 13:41:38 -08:00
Joffrey F 7d628ad1ab Add stop_grace_period to ALLOWED_KEYS 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-13 13:41:38 -08:00
Joffrey F cc23ffbeb9 Merge remote-tracking branch 'origin/release' into bump-1.18.0 2017-12-13 13:32:17 -08:00
Joffrey F 9355d35c6b
Merge pull request #5476 from docker/5414-tagless-images 
Avoid CLI crash if image has no tags
 2017-12-12 16:20:31 -08:00
Joffrey F c8ba50ff1e Avoid CLI crash if image has no tags 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-12 15:26:20 -08:00
Joffrey F e8d4616723
Merge pull request #5472 from docker/5462-stop_grace_period 
Add stop_grace_period to ALLOWED_KEYS
 2017-12-11 12:30:23 -08:00
Joffrey F c2a5dd4c89 Re-align docstring 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-11 11:03:46 -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
Shea Rozmiarek 48166a79c7 Add COMPOSE_PARALLEL_LIMIT to restrict global number of parallel operations 
Signed-off-by: Shea Rozmiarek <uberpanzermensch@gmail.com>
 2017-12-10 07:02:10 -06:00
Joffrey F 01cd2688bb
Merge pull request #5460 from docker/bump-1.18.0-rc2 
Bump 1.18.0 rc2
 2017-12-08 16:13:08 -08:00
Joffrey F 0c5e82955e
Merge pull request #5459 from docker/5443-handle-unicode-in-winerror 
Handle non-ascii characters in npipe error handler
 2017-12-08 14:54:47 -08:00
Joffrey F 189468b07f Bump 1.18.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-08 14:30:44 -08:00
Joffrey F 45d2eb4003 Handle non-ascii characters in npipe error handler 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-08 14:30:44 -08:00
Joffrey F f79f06ca4a Recover from possible unicode errors in get_conn_error_message 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-08 14:30:44 -08:00
Joffrey F ad40a9e654 Expand mount source when type == bind 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-08 14:30:43 -08:00
Harald Albers 2e232ee97c Fix wrong option name in changelog 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-12-08 14:30:43 -08:00
Joffrey F 51bc2a4b13 Merge remote-tracking branch 'origin/release' into bump-1.18.0-rc2 2017-12-08 14:27:23 -08:00
Joffrey F d0644bdff8 Handle non-ascii characters in npipe error handler 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-08 14:16:14 -08:00
Joffrey F a28610022b
Merge pull request #5456 from docker/5442-find_executable_utf_err 
Recover from possible unicode errors in get_conn_error_message
 2017-12-07 17:20:19 -08:00
Joffrey F d60f94b1bf Recover from possible unicode errors in get_conn_error_message 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-07 15:46:58 -08:00
Joffrey F e0eaf4bca4
Merge pull request #5455 from docker/5450-bind-relative-paths 
Expand mount source for bind types
 2017-12-07 15:21:33 -08:00