tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 13:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,193 Commits 20 Branches 280 Tags
Commit Graph

4193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
909ef7f435 Add partial support (docker-compose config and warnings) for v3.3 credential_spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
5fb7675055 Add support for build labels in 2.1 and 2.2 format 
Add cache_from in 2.2 format

Add integration test for build labels

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
f6aa53ea6c Network label mismatch now prints a warning instead of raising an error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
150c44dc36 Merge all fields inside build dict 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
d29ed0d3e4 Fix improper use of project.stop 
Add some better test coverage for rm --stop

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Pascal Vibet
c9ff9023b2 If COMPOSE_FILE is define then set this variable to the container 
Signed-off-by: Pascal Vibet <pvibet@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
d2a8a9edaa Rewrite duplicate override error message 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Eli Atzaba
88fa8db79a Raise exception when override.yaml & override.yml coexist 
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
 2017-05-30 15:23:00 -07:00
Eli Atzaba
d0b80f537b Fix for yaml extention does not work with override file 
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
2ffa67cf92 Add 3.3 format support 
Remove build.labels field from 3.2 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Colin Hebert
2182329dae Fix test type 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-30 15:23:00 -07:00
Colin Hebert
67e48ae4cb Add tests for the labels 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-30 15:23:00 -07:00
Colin Hebert
3f920d515d Update tests to show labels set to None 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-30 15:23:00 -07:00
Colin Hebert
d10d64ac82 Add support for labels during build 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
201919824f move cpus validation to validation.py 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
b815a00e33 Implement review suggestions. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
aeeed0cf2f service_test.py reorder imports 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
56f63c8586 skip cpu_percent test for Linux 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
e621117ab2 Fix testcases.py formatting 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
2d4fc2cd51 Fix cpu option checking. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
Alexey Rokhin
93d1ce5a55 Add cpu_count, cpu_percent, cpus parameters. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-30 15:23:00 -07:00
mengskysama
511b981f11 fix python3.x _asdict() return None 
Signed-off-by: mengskysama <mengskysama@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
9daced4c04 Prevent dependencies rescaling when executing docker-compose run 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Harald Albers
50437bd6ea Add docker-compose exec -u to docs and completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-05-30 15:23:00 -07:00
Victoria Bialas
f1fd9eb1d0 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-30 15:23:00 -07:00
Joffrey F
a5837ba358 Use different method to compute ServicePort.repr 
Workaround for https://bugs.python.org/issue24931

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
570cf951ac New network config whitelist option in unit test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Michael Friis
9c0bbaad36 add exception for windows networking 
Signed-off-by: Michael Friis <friism@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
57f647f03f 1.14.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
e27dfe8ccd Script downloading release binaries from bintray and appveyor 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
mrfly
b1e3228d19 Not colon but a dot. 
hum...

Signed-off-by: wrfly <mr.wrfly@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
d3ad2ae7fe Add deprecation warning to scale command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
1be40656a1 Prevent docker-compose scale to be used with a v2.2 config file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
1646e75591 Properly relay errors in execute_convergence_plan 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F
ffb8f9f1b4 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-05-30 15:23:00 -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
1719ceb881 Bump 1.13.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
1.13.0 		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>
1.13.0-rc1 		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