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
Michael Friis f3d09df19b add exception for windows networking 
Signed-off-by: Michael Friis <friism@gmail.com>
 2017-05-04 18:15:37 -07:00
Joffrey F 301b06ca92 Merge pull request #4793 from shin-/sync-release_master 
Resync release and master branches
 2017-05-04 14:41:06 -07:00
Joffrey F ebff0d915a 1.14.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-04 12:47:44 -07:00
Joffrey F 1f75ac6c12 Merge branch 'release' 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-04 12:45:36 -07:00
Joffrey F c06e0ed09a Merge pull request #4786 from shin-/script-download_binaries 
Script downloading release binaries from bintray and appveyor
 2017-05-04 12:42:21 -07:00
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 353c3a7b7a Script downloading release binaries from bintray and appveyor 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 16:48:16 -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 6f4107aa70 Merge pull request #4784 from shin-/4779-serialize-secrets 
Fix external secrets serialization
 2017-05-01 15:10:33 -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 3e66c68f9f Fix external secrets serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:42:17 -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 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