Commit Graph

4710 Commits

Author SHA1 Message Date
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
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 38ae7ae037 Update script to generate sha256 files
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-07 12:04:26 -08:00
Joffrey F b2c52178ba
Merge pull request #5453 from albers/completion-down--timeout
Add bash completion for `down --timeout`
2017-12-07 11:37:01 -08:00
Harald Albers bb42537bcf Add bash completion for `down --timeout`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-12-07 17:49:39 +01:00
Joffrey F 8fc6ac1899
Merge pull request #5449 from docker/bump-1.18.0-rc1
Bump 1.18.0 RC1
2017-12-06 18:50:27 -08:00
Joffrey F e96dfbac2a Bump 1.18.0-rc1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:40:53 -08:00
Joffrey F 29c02ef598 Fix bad rebase
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:40:53 -08:00
Joffrey F 99e9e32d7e Add support for custom names for networks, secrets, configs
Finalize v3.5 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F 084818ce2b Add support for mount syntax
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Madeline Stager 58f2f10d49 Raise error if up used with both -d and --timeout
Fix #5434
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-12-06 17:34:46 -08:00
Joffrey F 34ea11fcb7 Allow port publish ranges
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Samantha Miller 20a393d4f9 Adds support for a memory flag to docker-compose build.
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-06 17:34:46 -08:00
Fumiaki MATSUSHIMA 7765eed9db Specify osx_image to fix CI
Signed-off-by: Fumiaki Matsushima <mtsmfm@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk 4099c97758 Add ipam default driver, fixes #5248
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk dba2abd523 Add config validation for service volumes, fixes #5352
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Joffrey F 3ce2f03d70 Use mounts for secrets instead of volumes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Samantha Miller 7835a07550 Added a label option to 'docker-compose run' and test.
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-06 17:34:46 -08:00
Madeline Stager a99dd9f2dc Fixed example in instructions for running tests.
Fix #5394

Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-12-06 17:34:46 -08:00
Madeline Stager 6b0138d70f implement --timeout flag for docker-compose down
Fix #3370

Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk 76e9076cb7 Refactor subnet cidr validator & add new test
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk df0f7e17d3 Add format to other v3 configs & remove unix dependency
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk fa61a91cb5 Fix subnet config test for windows
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk cf782a3dbb Implement subnet config validation (fixes #4552)
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Joffrey F fb43b8b6b7 Bump colorama (use unreleased fix)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F 67dfcd6951 Add support for extra_hosts in build config
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F b2c13e1534 Remove redundant log message
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F 8ecd15e568 Include SDK attach bugfix
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F 183110e0b0 Bump SDK version to latest
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F 985010b887 1.18.0dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00