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

414 Commits

Author SHA1 Message Date
Joffrey F d668fd1c67 Bump 1.15.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 18:20:09 -07:00
Joffrey F 9502408ff0 Fix test issues with Engine 17.07 RC1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 17:33:02 -07:00
Yong Wen Chua 1ecf51c209 Add `target` to service build configuration 
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2017-07-20 17:06:59 -07:00
Yong Wen Chua 4a65008199 Add Compose v2.3 
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2017-07-20 17:06:59 -07:00
Joffrey F 6a4adb64f9 Some more test adjustments for Swarm support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-20 16:39:03 -07:00
Joffrey F 8f0ef26a73 Improved version comparisons throughout the codebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-11 17:40:53 -07:00
Joffrey F e33041582f Add "network" field to build configuration 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-06 12:17:46 -07:00
Joffrey F 259b96748c Add support for service:name pid config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-03 16:15:20 -07:00
Joffrey F 515526f0ff Ignore test failures in storage_opt test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-27 12:51:21 -07:00
dinesh 4dd54b83e8 Add storage_opt in v2.1 
Signed-off-by: dinesh <dineshpy07@gmail.com>
 2017-06-27 12:51:21 -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
Joffrey F 8512b33e24 Remedy test failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -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
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 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 fd699c5923 Merge pull request #4742 from shin-/2496-new_scale 
docker-compose up --scale, scale in config file
 2017-04-27 15:52:31 -07:00
Joffrey F a0cf0a2009 Avoid rebinding tmpfs data volumes when recreating containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-25 15:10:57 -07:00
Joffrey F 2ba4e5e8ec Prevent `docker-compose scale` to be used with a v2.2 config file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 11:42:18 -07:00
Joffrey F 78ee612333 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-17 19:51:48 -07:00
Joffrey F 94defc159a Merge pull request #4716 from shin-/4415-init_init_path 
Add support for service.init
 2017-04-10 14:42:18 -07:00
Joffrey F 843a0d82a0 Add support for IPAM options in v2 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 12:24:05 -07:00
Joffrey F cc966a7e19 Add support for init and init_path 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 12:16:57 -07:00
Joffrey F 732bf52a4e The interval is too damn small 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-22 14:09:50 -07:00
Daniel Nephin 2acf286ed6 Support V3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-15 11:40:31 -04:00
Joffrey F d5a2d37d05 Properly resolve build args against host environment values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-07 18:13:11 -08:00
Joffrey F dd4e49ef98 Merge pull request #4563 from shin-/3723-mem-reservation 
Add mem_reservation option to service config in 2.0 and 2.1 formats
 2017-03-07 15:23:22 -08:00
Joffrey F e344fe9a9f Merge pull request #4566 from shin-/eddwardo-run-v 
Add --volumes flag to docker-compose run
 2017-03-07 15:22:51 -08:00
Joffrey F ec252350ae Add mem_reservation option to service config in 2.0 and 2.1 formats 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 18:21:03 -08:00
Joffrey F bf7c2bc0f8 Use create_host_file in run -v tests to ensure file availability 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 18:13:16 -08:00
Joffrey F b454268f93 Merge pull request #4565 from shin-/onorua-pids-limit 
Add pids_limit to service config
 2017-03-06 18:09:53 -08:00
Joffrey F b6fb3f2634 pids_limit not yet supported for swarm services - removing from v3 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 14:32:04 -08:00
Joffrey F 7512dccaa8 Add dns_opt to 2.1 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 13:28:52 -08:00
George Lester c7b8278e78 Implemented dns_opt 
Signed-off-by: George Lester <glester491@gmail.com>
 2017-03-03 15:37:21 -08:00
Yaroslav Molochko 6a151aac04 introducing pids_limit, fix for #4178 
Signed-off-by: Yaroslav Molochko <y.molochko@anchorfree.com>
 2017-03-02 16:44:26 -08:00
Joffrey F 9f8e01fa94 Merge pull request #3543 from milin/master 
Replace assertEquals with assertEqual in unittests since the former is getting dep…
 2017-03-01 16:27:36 -08:00
Joey Payne 33fcfca040 Add test for cache_from 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Daniel Nephin 59d1847d9b Fix some test failures. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:40 -05:00
Daniel Nephin 4053adc7d3 Add an integration test for secrets using bind mounts. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-31 09:53:16 -05:00
Joffrey F 5c2165eaaf Fix volume definition in v3 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-19 15:41:31 -08:00
Joffrey F 56a1b02aac Catch healthcheck exceptions in parallel_execute 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 13:22:16 -08:00
Joffrey F 8145429399 Unify healthcheck spec definition in v2 and v3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 13:14:23 -08:00
Joffrey F 04394b1d0a Expand depends_on to allow different conditions (service_start, service_healthy) 
Rework "up" and "start" to wait on conditional state of dependent services
Add integration tests

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-04 11:28:30 -08:00
Joffrey F ba47fb99ba Add default labels to networks and volumes created by Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-12-19 20:43:35 -08:00
Joffrey F e6b2949edc Merge pull request #4216 from lawliet89/userns_mode 
Implement `userns_mode` HostConfig for services
 2016-12-19 18:12:15 -08:00
Daniel Nephin e04a12b5ca Increase minimum version for v3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-12-07 11:16:40 -05:00
Yong Wen Chua 62f8b1402e Implement `userns_mode` HostConfig for services 
Fixes #3349

This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2016-12-05 14:25:56 +08:00
Joffrey F 60d005b055 Improve robustness of a couple integration tests with occasional failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-10-24 13:58:45 -07:00
Joffrey F 14716bc2da Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master 2016-10-17 14:09:09 -07:00