tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,192 Commits 20 Branches 259 Tags 62 MiB
Commit Graph

4192 Commits

Author SHA1 Message Date
Joffrey F d81a27be02 Bump 1.14.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
Joffrey F 73dfdfffb0 Bump 1.14.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-19 14:05:04 -07:00
NikitaVlaznev 78bb879419 Fix double silent argument value 
Fix for "TypeError: pull() got multiple values for keyword argument 'silent'."
This change e9b6cc23fc caused additional value to be passed for the 'silent' argument, that was already passed there: f85da99ef3

Signed-off-by: Nikita Vlaznev <nikita.dto@gmail.com>
 2017-06-19 13:01:55 -07:00
Joffrey F 7a4c328c41 Rewriting tests to be UCP/Swarm compatible 
- Event may contain more information in some cases.
  Don't assume order or format
- Don't assume ports are always exposed on 0.0.0.0 by default
- Absence of HostConfig in a create payload sometimes causes an error at the
  engine level
- In Swarm, volume names are prefixed by "<node_name>/"
- When testing against Swarm, the default network driver is overlay
- Ensure custom test networks are always attachable
- Handle Swarm network names
- Some params moved to host config in recent (1.21+) version
- Conditional test skips for Swarm environments

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-14 16:17:15 -07:00
Joel Barciauskas e9b6cc23fc Add --quiet parameter to docker-compose pull, using existing silent flag 
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
 2017-06-14 14:53:13 -07:00
Joffrey F d527f24ff0 Fix `ps` output to show all ports 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-12 11:42:29 -07:00
Joffrey F f3c1c8d158 ServicePort merge_field should account for external IP and protocol 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-12 11:42:29 -07:00
Joffrey F 0bcfc721f8 s/docker daemon/dockerd/ 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-09 12:06:55 -07:00
Joffrey F 821bd54663 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-06-09 12:06:55 -07:00
Stefan Pietsch e8e2eb6e59 check hash sums of downloaded files 
Signed-off-by: Stefan Pietsch <mail.ipv4v6+gh@gmail.com>
 2017-06-08 17:42:43 -07:00
Joffrey F 8512b33e24 Remedy test failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F 0fa7163522 Interpolate configs values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F bd8d77feae Add configs tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F 39c1cb5988 Partial support for service configs 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F 36af86b9b2 Always convert port values in ServicePort to integer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-05 15:51:22 -07:00
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