tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-10-29 02:03:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,290 Commits 21 Branches 288 Tags
Commit Graph

207 Commits

Author SHA1 Message Date
Joffrey F
67dfcd6951 Add support for extra_hosts in build config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Joffrey F
f89a55e488 Add support for oom_kill_disable in service config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:32:25 -08:00
Joffrey F
8a08eb6688 Move build labels parsing to config module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:32:25 -08:00
Guillermo Arribas
e1db4f6e19 Build labels option: array form produces unmarshal error (fixes #5183) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:31:38 -08:00
Alexey Rokhin
3d57f702f1 service_test.py reorder imports 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-12-06 17:26:21 -08:00
Alexey Rokhin
9b91f3431b skip cpu_percent test for Linux 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-12-06 17:26:21 -08:00
Joffrey F
9f80ec548e Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:46:17 -07:00
Joffrey F
f6d7eeb129 Move build labels parsing to config module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
George Lester
dada36f732 Supported group_add 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-09-11 23:10:49 -07:00
Jean-François Roche
d824cb9b06 Add support for swappiness constraint 
Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/)

refs #2383

Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
 2016-08-16 11:02:51 +02:00
Tomas Tomecek
fea970dff3 service: detailed error messages for create and start 
Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-07-11 10:45:27 +02:00
Aanand Prasad
1e176b58c5 Merge pull request #3592 from stakodiak/fix-privilege-typo 
Fix a typo in a test's name.
 2016-07-06 15:22:05 -07:00
George Lester
6fe5d2b543 Implemented oom_score_adj 
Signed-off-by: George Lester <glester491@gmail.com>
 2016-07-05 23:43:32 -07:00
Jonathan Giannuzzi
3c77db709f Fix assertion that was always true 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-06-20 14:48:45 +02:00
alex
68d73183eb Fix a typo in a test's name. 2016-06-13 23:36:34 -04:00