tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-16 18:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,112 Commits 20 Branches 280 Tags
Commit Graph

4112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joel Barciauskas
59c4c2388e Add --quiet parameter to docker-compose pull, using existing silent flag 
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
86a0e36348 s/docker daemon/dockerd/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
85d2c0a314 Take editions into account when selecting test engine versions 
Get candidates from moby/moby and docker/docker-ce repos

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Stefan Pietsch
33c7c750e8 check hash sums of downloaded files 
Signed-off-by: Stefan Pietsch <mail.ipv4v6+gh@gmail.com>
 2017-07-13 17:37:26 -07:00
Sebastiaan van Stijn
74f5037f78 Add Joffrey to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-13 17:37:26 -07:00
Colin Hebert
645d35612d Add support for labels during build 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-07-13 17:37:26 -07:00
Alexey Rokhin
5067f7a77b service_test.py reorder imports 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-07-13 17:37:26 -07:00
Alexey Rokhin
50d405fea3 skip cpu_percent test for Linux 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-07-13 17:37:26 -07:00
Joffrey F
cffce0880b Bump 1.14.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 13:28:04 -07:00
Joffrey F
abac2eea37 Fix ps output to show all ports 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 13:28:04 -07:00
Joffrey F
5c3d0db3f2 ServicePort merge_field should account for external IP and protocol 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 13:28:04 -07:00
Joffrey F
cfe152f907 Bump 1.14.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
a85dddf83d Remedy test failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
e7b7480462 Interpolate configs values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
bf3b62e2ff Add configs tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
70b2e64c1b Partial support for service configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
bfc7ac4995 Always convert port values in ServicePort to integer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
ff720ba6b2 Bump docker version in requirements.txt 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F
e6000051f7 Bump 1.14.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
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