Commit Graph

425 Commits

Author SHA1 Message Date
Guillermo Arribas 2f2259f2d2 Build labels option: array form produces unmarshal error (fixes #5183)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-16 16:46:21 -07:00
Alexey Rokhin 0367995b8f service_test.py reorder imports
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-10-16 16:45:25 -07:00
Alexey Rokhin 390821e31c skip cpu_percent test for Linux
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-10-16 16:45:25 -07:00
Alexey Rokhin f64b48f0de Fix testcases.py formatting
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-10-16 16:45:25 -07:00
Joffrey F 43cb1f3dff Add support for start_period in healthcheck config
Improve merging strategy for healthcheck configs

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 41a5a4a321 v2 custom volume name support
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F b893797e03 UCP 2.2.0 test fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 6361d907f6 Add support for blkio config keys
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Joffrey F 73fd0abd5b Fix test issues with Engine 17.07 RC1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-21 13:09:19 -07:00
Yong Wen Chua 16f8953c78 Add `target` to service build configuration
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-08-21 13:09:19 -07:00
Yong Wen Chua c006add122 Add Compose v2.3
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-08-21 13:09:19 -07:00
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 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 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 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
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 a85dddf83d Remedy test failures
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-06 15:26:49 -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
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 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 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 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