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

1184 Commits

Author SHA1 Message Date
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
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 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 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 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 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 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 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 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 771bf5f7ea
Merge pull request #5436 from docker/5244-advanced-mount-support 
Add support for mount syntax
 2017-12-05 17:16:28 -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
Joffrey F eabccda9d1
Merge pull request #5393 from summergirl21/3370-down-timeout 
implement --timeout flag for docker-compose down
 2017-12-05 12:32:43 -08:00
Joffrey F 91bb682bdf
Merge pull request #5435 from summergirl21/5434-up-d-timeout-not-allowed 
Raise error if up used with both -d and --timeout
 2017-12-05 12:30:42 -08:00
Madeline Stager 16cc8437de Raise error if up used with both -d and --timeout 
Fix #5434
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
 2017-12-05 12:28:28 -06:00
Joffrey F ceec0595bd Allow port publish ranges 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-04 14:15:17 -08:00
Joffrey F 9098a67394
Merge pull request #5410 from sethktaylor11/5374-build-memory 
Adds support for a memory build-arg in docker-compose build.
 2017-12-04 14:00:09 -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
Samantha Miller a6cdd62726 Adds support for a memory flag to docker-compose build. 
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
 2017-12-03 13:59:32 -06:00
Joffrey F a204e50058
Merge pull request #5415 from docker/5377-secrets-mounts 
Use mounts for secrets instead of volumes
 2017-12-01 13:25:46 -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 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
Joffrey F 415fa6c59b Use mounts for secrets instead of volumes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-29 12:21:56 -08:00
Joffrey F 58dcfac853
Merge pull request #5397 from sethktaylor11/4937-Labels 
Added a label option to 'docker-compose run' and test.
 2017-11-29 11:42:24 -08:00
Samantha Miller c36a2fb1ad Added a label option to 'docker-compose run' and test. 
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
 2017-11-28 18:43:00 -06:00
Madeline Stager 3b81e49c66 implement --timeout flag for docker-compose down 
Fix #3370

Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
 2017-11-22 16:31:16 -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 d48002a09d
Merge pull request #5361 from docker/5282-build-extra-hosts 
Add support for extra_hosts in build config
 2017-11-09 16:30:35 -08:00
Joffrey F c5408f3a40 Add support for extra_hosts in build config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-09 14:57:24 -08:00
Joffrey F 0079ac52c6
Merge pull request #5250 from garribas/4801-progress-markers 
Progress markers are not shown correctly for docker-compose up (fixes…
 2017-11-09 14:29:34 -08:00
Joffrey F 4563d8c050 Fix service label parsing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 13:51:49 -07:00
Joffrey F 819be19f7c Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 15:18:28 -07:00
Andy Neff 0e4bd32a65 Added unit test and used stop_timeout 
Signed-off-by: Andy Neff <andyneff@users.noreply.github.com>
 2017-11-01 13:30:49 -07:00
Joffrey F 80503da476 Add support for oom_kill_disable in service config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-25 17:32:18 -07:00
Guillermo Arribas b30cb77a7b docker-compose exec doesn't have -e option (fixes #4551) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-25 13:22:00 -07:00
Joffrey F 8c0b03a2f5 Add support for BOM-signed env files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-24 12:52:54 -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
Joffrey F a07dee9207 Add type converter to interpolation module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-23 12:42:42 -07:00