Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-06-25 02:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
4118 commits 25 branches 301 tags 62 MiB
Commit graph

1149 commits

Author SHA1 Message Date
Joffrey F
2ba9cd73d1 Network label mismatch now prints a warning instead of raising an error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:26:17 -07:00
Joffrey F
972fe65830 Merge pull request #4860 from shin-/4845-rm-stop 
Fix improper use of project.stop
 2017-05-23 15:08:13 -07:00
Joffrey F
98419ba2a2 Merge pull request #4859 from shin-/eliat123-4771-fix-allow-override-yaml-extension 
Fix: allow override yaml extension
 2017-05-23 15:08:00 -07:00
Joffrey F
244209814b Fix improper use of project.stop 
Add some better test coverage for rm --stop

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 12:38:54 -07:00
Joffrey F
7f1f450080 Rewrite duplicate override error message 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 12:14:32 -07:00
Eli Atzaba
0d0c0454e9 Raise exception when override.yaml & override.yml coexist 
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
 2017-05-23 12:09:19 -07:00
Eli Atzaba
9334f29898 Fix for yaml extention does not work with override file 
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
 2017-05-23 12:09:19 -07:00
Joffrey F
fa77856c86 Add 3.3 format support 
Remove build.labels field from 3.2 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 12:04:24 -07:00
Colin Hebert
d906f9ce92 Add support for labels during build 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Joffrey F
5b6637d7f8 Merge pull request #4817 from albers/3205-exec-u 
Add docker-compose exec -u to docs and completion
 2017-05-22 12:23:30 -07:00
Alexey Rokhin
61e54514c4 move cpus validation to validation.py 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-18 01:43:04 +03:00
Alexey Rokhin
b7c688cc37 Implement review suggestions. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 23:21:47 +03:00
Alexey Rokhin
faaca661ac Fix cpu option checking. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 15:10:44 +03:00
Alexey Rokhin
0043dc4fab Add cpu_count, cpu_percent, cpus parameters. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 14:50:29 +03:00
Joffrey F
2de246a464 Merge pull request #4820 from shin-/4803-run-rescale 
Prevent dependencies rescaling when executing `docker-compose run`
 2017-05-16 13:53:44 -07:00
mengskysama
3a76f95e28 fix python3.x _asdict() return None 
Signed-off-by: mengskysama <mengskysama@gmail.com>
 2017-05-15 15:22:22 +08:00
Joffrey F
59a4f554b9 Prevent dependencies rescaling when executing docker-compose run 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-12 17:39:56 -07:00
Harald Albers
16bbe5d99c Add docker-compose exec -u to docs and completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-05-11 18:19:01 +02:00
Victoria Bialas
e74a5e449c Updated CLI help for docker-compose pull command 
removed reference to docker-stack.yml in pull command help

referenced generic Compose file, consistent naming in Help, init caps

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-05-09 14:57:30 -07:00
Joffrey F
07680b77a6 Use different method to compute ServicePort.repr 
Workaround for https://bugs.python.org/issue24931

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-05 16:40:45 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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