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

4218 Commits

Author SHA1 Message Date
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 86a9aa7788 Merge pull request #4773 from wrfly/patch-1 
Not a colon but a dot.
 2017-05-01 14:21:28 -07:00
mrfly 76641cba9c Not colon but a dot. 
hum...

Signed-off-by: wrfly <mr.wrfly@gmail.com>
 2017-04-28 17:00:22 +08:00
Joffrey F fd699c5923 Merge pull request #4742 from shin-/2496-new_scale 
docker-compose up --scale, scale in config file
 2017-04-27 15:52:31 -07:00
Joffrey F 28b868848d Add deprecation warning to scale command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-26 15:00:41 -07:00
Joffrey F d9902e89df Merge pull request #4770 from shin-/4767-check_ipam_nonetype 
Prevent NoneType error when remote IPAM options is None
 2017-04-26 14:39:54 -07:00
Joffrey F d0acefd450 Prevent NoneType error when remote IPAM options is None 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-26 13:34:45 -07:00
Joffrey F 59dbeac4c1 Merge pull request #4761 from shin-/4751-tmpfs-mounts 
Avoid rebinding tmpfs data volumes when recreating containers
 2017-04-26 12:45:21 -07:00
Joffrey F a0cf0a2009 Avoid rebinding tmpfs data volumes when recreating containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-25 15:10:57 -07:00
Joffrey F 561d3db387 Merge pull request #4757 from albers/completion-up--scale 
Add bash completion for `docker-compose up --scale`
 2017-04-25 13:41:39 -07:00
Joffrey F b38305f2d7 Merge pull request #4755 from shin-/sync_2.2_spec 
Add missing IPAM options to v2.2 spec
 2017-04-25 13:40:55 -07:00
Joffrey F 01776651e8 Merge pull request #4759 from brainnwaveDuncan/master 
Fixes --exit-code-from
 2017-04-25 13:40:30 -07:00
Duncan Paterson 397faf6172 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-04-25 15:11:44 +01:00
Harald Albers 0dc25f1cdf Add bash completion for `docker-compose up --scale` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-25 13:19:22 +02:00
Joffrey F ce0599d912 Add missing IPAM options to v2.2 spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-24 13:29:18 -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 2ba4e5e8ec Prevent `docker-compose scale` to be used with a v2.2 config file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 11:42:18 -07:00
Joffrey F afb2b6c51c Properly relay errors in execute_convergence_plan 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-18 12:53:43 -07:00
Joffrey F 78ee612333 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-17 19:51:48 -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