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

1100 commits

Author SHA1 Message Date
Joffrey F
c923ea1320 Some more test adjustments for Swarm support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 16:50:14 -07:00
Alexey Rokhin
fd862f9ca7 service_test.py reorder imports 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-07-26 16:50:14 -07:00
Alexey Rokhin
31b161045d skip cpu_percent test for Linux 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-07-26 16:50:14 -07:00
Joffrey F
344a69331c Bump 1.15.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
56a23bfcd2 Improved version comparisons throughout the codebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
2d21bf6a50 Make sure y/n values are quoted in serialized output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
d475e0c1e3 Add "network" field to build configuration 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
0916f124d0 scale property should be merged according to standard scalar rules 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
ec4ba7752f Fix override volume merging + add acceptance test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Evan Shaw
154adc5807 Align status output for parallel_execute 
Previously docker-compose would output lines that looked like:

    Starting service ... done
    Starting short ...
    Starting service-with-a-long-name ... done

It's difficult to scan down this output and get an idea of what's happening.

Now the statuses are aligned, and output looks like this:

    Starting service                  ... done
    Starting short                    ...
    Starting service-with-a-long-name ... done

To me, this is quite a bit easier to read.

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
41976b0f7f Add support for service:name pid config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
e22524474a Ignore test failures in storage_opt test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
dinesh
6a957294df Add storage_opt in v2.1 
Signed-off-by: dinesh <dineshpy07@gmail.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
1dfdbe6f94 Fix ports sorting on Python 3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F
a0119ae1a5 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-07-13 17:37:26 -07:00
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
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
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
a85dddf83d Remedy test failures 
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
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
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
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
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
93d1ce5a55 Add cpu_count, cpu_percent, cpus parameters. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 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
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
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
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
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
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
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