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

4158 Commits

Author SHA1 Message Date
Joffrey F 10267a83dc Merge pull request #4785 from docker/bump-1.13.0 
Bump 1.13.0
 2017-05-02 12:29:13 -07:00
Joffrey F 1719ceb881 Bump 1.13.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 15:25:43 -07:00
Joffrey F f94cf103d6 Fix external secrets serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:42:56 -07:00
Joffrey F f2d3ac680e Prevent NoneType error when remote IPAM options is None 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:40:42 -07:00
Joffrey F bbdbc35924 Avoid rebinding tmpfs data volumes when recreating containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:40:42 -07:00
Duncan Paterson da78c2c1db Fixes --exit-code-from 
- tried to find the length and array index of a filter object

Signed-off-by: Duncan Paterson <duncan@brainnwave.com>
 2017-05-01 14:40:42 -07:00
Harald Albers 90634533fc Add bash completion for `docker-compose up --scale` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-05-01 14:40:42 -07:00
Joffrey F 5b3b6ebf94 Add missing IPAM options to v2.2 spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:40:42 -07:00
Joffrey F 614e311c8d Merge remote-tracking branch 'source/release' into bump-1.13.0 2017-05-01 14:32:14 -07:00
Joffrey F f4328ccf6d Merge pull request #4750 from docker/bump-1.13.0-rc1 
Bump 1.13.0 rc1
 2017-04-24 11:13:19 -07:00
Joffrey F 38af51314e Bump 1.13.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
Joffrey F ef40e3c6b9 Prevent `docker-compose scale` to be used with a v2.2 config file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
Joffrey F 457c16a7b1 Properly relay errors in execute_convergence_plan 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
Joffrey F c8a7891cc8 Implement --scale option on up command, allow scale config in v2.2 format 
docker-compose scale modified to reuse code between up and scale

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
Joffrey F b6686f19fd Merge remote-tracking branch 'source/release' into bump-1.13.0-rc1 2017-04-21 14:43:32 -07:00
Joffrey F baf457c78c Merge pull request #4736 from shin-/4734-config_secrets 
Repair bad import
 2017-04-17 19:27:43 -07:00
Joffrey F 702eb4cc92 Merge pull request #4737 from shin-/4690-exec_detach_fix 
Do not wait for exec output when using detached mode
 2017-04-17 19:27:20 -07:00
Joffrey F 1bd9083de6 Do not wait for exec output when using detached mode 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-14 15:30:40 -07:00
Joffrey F c817dedef7 Repair bad imports 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-14 14:31:30 -07:00
Joffrey F ae2cc6b5b8 Merge pull request #4721 from shin-/4376-unicode_file_paths 
Convert paths to unicode in get_config_path_from_options if needed
 2017-04-12 14:41:44 -07:00
Joffrey F 9036c8f85a Merge pull request #4727 from shin-/4722-port_spec_fix 
Fix ServicePort.legacy_repr bug for `ext_ip::target` notation
 2017-04-12 14:21:30 -07:00
Joffrey F 1891b2b78c Fix ServicePort.legacy_repr bug for `ext_ip::target` notation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-11 14:45:14 -07:00
Joffrey F 0f00aa4098 Convert paths to unicode in get_config_path_from_options if needed 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 17:45:06 -07:00
Joffrey F 94defc159a Merge pull request #4716 from shin-/4415-init_init_path 
Add support for service.init
 2017-04-10 14:42:18 -07:00
Joffrey F d0d684f03d Merge pull request #4715 from shin-/4708-ipam_options 
Add support for IPAM options in v2 format
 2017-04-10 14:40:44 -07:00
Joffrey F 2b61afb45f Merge pull request #4713 from shin-/4710-project_dir_fix 
Fix Config.find for Compose files in nested folders
 2017-04-10 14:39:37 -07:00
Joffrey F 843a0d82a0 Add support for IPAM options in v2 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 12:24:05 -07:00
Joffrey F b5ed31e4f5 Merge pull request #4714 from shin-/4707-fix-config-python3 
Fix serializer bug (python 3)
 2017-04-10 12:20:52 -07:00
Joffrey F cc966a7e19 Add support for init and init_path 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 12:16:57 -07:00
Joffrey F 5a4293848c Add 2.2 schema for API 1.25 features support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 19:17:11 -07:00
Joffrey F ce44c865e5 Merge pull request #4698 from shin-/4624-disable-pip-version-check 
Prevent pip version checks when calling `pip freeze`
 2017-04-07 17:23:12 -07:00
Joffrey F 72a2ea9d86 Fix serializer bug (python 3) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 16:54:31 -07:00
Joffrey F 3b02426236 Fix Config.find for Compose files in nested folders 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 12:19:37 -07:00
Joffrey F 7aa55120db Merge pull request #4704 from shin-/update-changelog-1.12 
1.13.0dev
 2017-04-05 15:14:47 -07:00
Joffrey F dd862b28c0 1.13.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-05 13:57:56 -07:00
Joffrey F c3662697d7 Merge pull request #4697 from docker/bump-1.12.0 
Bump 1.12.0
 2017-04-05 11:21:50 -07:00
Joffrey F e7e159076b Prevent pip version checks when calling `pip freeze` 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-04 15:31:38 -07:00
Joffrey F b31ff33aca Bump 1.12.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-03 13:19:16 -07:00
fate-grand-order b195a09a54 fix misspell "compatibility" in script/ci 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-04-03 13:18:26 -07:00
Harald Albers 7a0e56a0c7 Add bash completion for `config --resolve-image-digests|--volumes"` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-03 13:18:26 -07:00
Harald Albers 5b6ddd5e30 Fix bash completion for `up --exit-code-from` 
`--exit-code-from` requires an argument.
Also corrected sort order.

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-03 13:18:26 -07:00
Harald Albers d917ca3e4e Add bash completion for `pull --parallel` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer c9a9f5ab03 Add zsh completion for 'docker-compose config --resolve-image-digests --volumes' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer ba787a45b9 Add zsh completion for 'docker-compose build --build-arg' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer cfdc9d67c8 Add zsh completion for 'docker-compose run -v --volume' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer 752d8d165f Add zsh completion for 'docker-compose images' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Joffrey F 21cdd3f6d7 Bump docker SDK dependency Update invalid ports test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-03 13:18:26 -07:00
Joffrey F f9a9d97489 Add 3.2 schema to docker-compose.spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-03 13:18:26 -07:00
King Chung Huang bc1a876937 Merge deploy key in service dicts 
Update merge_service_dicts() to merge deploy mappings.
Compose file version 3 added the deploy key to service dicts
to specify configs related to Docker services.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
 2017-04-03 13:18:26 -07:00
Joffrey F f731a229c7 Merge remote-tracking branch 'source/release' into bump-1.12.0 2017-04-03 12:44:11 -07:00