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

4766 Commits

Author SHA1 Message Date
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
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
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
Svyatoslav Ilinskiy 5924c6366e Fix minor issue in docker-compose config documentation. 
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
 2017-11-18 17:46:55 -06:00
Svyatoslav Ilinskiy 1414c1f1fa Use docker-compose config --services in bash completion 
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
 2017-11-18 17:27:42 -06:00
Svyatoslav Ilinskiy 21e312e402 Implement --filter flag for docker-compose config --services. 
Fix #1498
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
 2017-11-17 17:43:12 -06: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 a9597d72f5
Merge pull request #5350 from docker/bump-1.17.1 
Bump 1.17.1
 2017-11-08 17:25:49 -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 6d101fb068 Bump 1.17.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:13:58 -08:00
Joffrey F 03fefaca39 Fix service label parsing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:13:58 -08:00
Joffrey F fb113b731c Merge remote-tracking branch 'origin/release' into bump-1.17.1 2017-11-07 17:08:25 -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 b55a50a384
Merge pull request #5330 from docker/bump-1.17.0 
Bump 1.17.0
 2017-11-01 17:06:41 -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 ac53b73e79 Bump 1.17.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:46:17 -07:00
Joffrey F 9f80ec548e Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:46:17 -07:00
Joffrey F 9ae6015ce2 Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:26:29 -07:00
Joffrey F 6078736604 Add flake8 to dev requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 13:36:22 -07:00
Guillermo Arribas 0847f8e84b flake8 error on master branch (fixes #5298) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-11-01 13:36:22 -07:00
Harald Albers 779773b664 Add bash completion for `up --no-start` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-11-01 13:36:22 -07:00
Joffrey F ec45acb582 Merge remote-tracking branch 'origin/release' into bump-1.17.0 2017-11-01 13:34:01 -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
Guillermo Arribas da32c44bce Terminate containers on SIGHUP (fixes #4909) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-11-01 12:15:00 -03:00