tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,177 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

4177 Commits

Author SHA1 Message Date
Joffrey F bcc4a76ea0 Bump docker version in requirements.txt 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-05 15:02:51 -07:00
Sebastiaan van Stijn 10cda3dabf Add Joffrey to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-05-30 09:15:18 -07:00
Joffrey F 9a70db0889 Merge pull request #4864 from shin-/cred_spec_support 
Add partial support for v3.3 credential_spec
 2017-05-25 17:30:44 -07:00
Joffrey F 73d7865da8 Add partial support (docker-compose config and warnings) for v3.3 credential_spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-25 14:54:46 -07:00
Joffrey F bf8498c488 Merge pull request #4861 from shin-/4825-cache-from 
Merge all fields inside build dict
 2017-05-25 14:44:56 -07:00
Joffrey F 347a7a8d2a Merge pull request #4862 from shin-/network_labels_check_warn 
Network label mismatch now prints a warning instead of raising an error
 2017-05-25 14:44:36 -07:00
Joffrey F bbb771f108 Merge pull request #4863 from shin-/4038-build-labels-v2 
Add support for build labels in 2.1 and 2.2 format
 2017-05-25 14:31:21 -07:00
Joffrey F 49605f2715 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-23 15:53:06 -07:00
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 062812e4aa Merge all fields inside build dict 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:23:04 -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 d43a22fe57 Merge pull request #4858 from shin-/build_labels_v3.3 
Build labels v3.3
 2017-05-23 15:04:38 -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 e9841bb9c6 Merge branch 'swoopla-master' 2017-05-23 12:19:42 -07:00
Pascal Vibet 7dafbd1e9c If COMPOSE_FILE is define then set this variable to the container 
Signed-off-by: Pascal Vibet <pvibet@gmail.com>
 2017-05-23 12:19:22 -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 9d78258b44 Fix test type 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Colin Hebert 37de55865b Add tests for the labels 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Colin Hebert 7fca689efd Update tests to show labels set to None 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -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
Joffrey F 6ed91c3b11 Merge pull request #4835 from AlexeyRokhin/master 
Add cpu_count, cpu_percent, cpus parameters.
 2017-05-17 16:13:13 -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 bffdb7a349 service_test.py reorder imports 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 16:42:43 +03:00
Alexey Rokhin 61ed6ca8a4 skip cpu_percent test for Linux 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 16:18:28 +03:00
Alexey Rokhin 3e39aa0709 Fix testcases.py formatting 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 15:21:35 +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
Joffrey F 1485183072 Merge pull request #4824 from mengskysama/master 
fix python3.x _asdict() return None
 2017-05-16 13:52:59 -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
Joffrey F 2c83c9ffb9 Merge pull request #4808 from londoncalling/compose-help-pull-cmd 
Updated CLI help for docker-compose pull command
 2017-05-09 16:18:27 -07: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 cb457a82f1 Merge pull request #4798 from shin-/4729-serviceport_repr 
Use different method to compute ServicePort.repr
 2017-05-08 12:05:26 -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
Joffrey F 98f7f6f228 Merge branch 'friism-add-exception-for-windows-overlay-driver' 2017-05-05 11:41:23 -07:00
Joffrey F babd7530c3 New network config whitelist option in unit test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-05 11:40:50 -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 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