tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,283 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

4283 Commits

Author SHA1 Message Date
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 6cd0bc4883
Merge pull request #5428 from docker/5230-allow-port-publish-ranges 
Allow port publish ranges
 2017-12-04 15:18:10 -08: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 3c232e42c1
Merge pull request #5430 from mtsmfm/fix-ci 
Specify osx_image to fix CI
 2017-12-04 14:12:46 -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
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
Fumiaki MATSUSHIMA 7fdb90d0aa Specify osx_image to fix CI 
Signed-off-by: Fumiaki Matsushima <mtsmfm@gmail.com>
 2017-12-03 01:13:56 +09: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
Joffrey F 8bc6334ba5
Merge pull request #5419 from nginth/5248-add-ipam-default-driver 
Add ipam default driver, fixes #5248
 2017-11-30 14:05:31 -08:00
Drew Romanyk 60f818e548 Add ipam default driver, fixes #5248 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-11-30 10:59:25 -06: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
Joffrey F bf13de024d
Merge pull request #5395 from summergirl21/5394-fix-testing-instructions 
5394 Fixed example in instructions for running tests
 2017-11-28 11:57:39 -08:00
Madeline Stager 0840a7f044 Fixed example in instructions for running tests. 
Fix #5394

Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
 2017-11-22 17:41:04 -06:00
Joffrey F ed841e2b0e
Merge pull request #5274 from docker/5263-bump-colorama 
Bump colorama (use unreleased fix)
 2017-11-20 15:04:26 -08:00
Joffrey F d1633d8e9d
Merge pull request #5364 from nginth/4552-validate-config-subnet 
Implement subnet config validation (fixes #4552)
 2017-11-16 18:18:22 -08: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 34464d5eee Bump colorama (use unreleased fix) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-09 15:03:21 -08:00
Joffrey F f855ed405b
Merge pull request #5362 from docker/garribas-4801-progress-markers 
Fix CLI status messages
 2017-11-09 15:02:14 -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 305fae85d1 Remove redundant log message 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-09 14:30:18 -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 c0366b71e9
Merge pull request #5356 from docker/bump_sdk 
Include SDK attach bugfix
 2017-11-08 17:39:20 -08:00
Joffrey F 3de82c0049 Include SDK attach bugfix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-08 17:05:53 -08:00
Joffrey F 7208aeb002
Merge pull request #5351 from docker/bump_sdk 
Bump SDK version to latest
 2017-11-07 18:18:52 -08:00
Joffrey F b0480b4d04 Bump SDK version to latest 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:29:23 -08:00
Joffrey F 45d590ef69
Merge pull request #5341 from docker/5336-fix-label-parsing 
Fix service label parsing
 2017-11-03 15:45:32 -07: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 2780559a14
Merge pull request #5340 from docker/sync_release 
Sync release
 2017-11-03 13:27:42 -07:00
Joffrey F 9b03cdfdf8 1.18.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:36:53 -07:00
Joffrey F d94cfff78d Bump 1.17.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:35:47 -07:00
Joffrey F 5e032b7e8f Bump 1.17.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:35:17 -07:00
Joffrey F d05c53b5fc
Merge pull request #5339 from docker/add_shasum_compute 
Add shasum computation to download-binaries script
 2017-11-03 12:29:27 -07:00
Joffrey F 2482d57e9a Add shasum computation to download-binaries script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:26:31 -07:00
Joffrey F 819be19f7c Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 15:18:28 -07:00
Joffrey F 9ae6015ce2 Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:26:29 -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
Andy Neff 2df3d6f75a Have stop_grace_period also set StopTimeout on create 
Signed-off-by: Andy Neff <andrew.neff@visionsystemsinc.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
Joffrey F 241621cd2f Merge branch 'garribas-4424-healthcheck-test-validation' 2017-10-23 14:50:36 -07:00
Joffrey F 3cfa0bd162 Improve process_healthcheck readability 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-23 14:50:22 -07:00