29c02ef598
Fix bad rebase
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:40:53 -08:00
99e9e32d7e
Add support for custom names for networks, secrets, configs
...
Finalize v3.5 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
084818ce2b
Add support for mount syntax
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
58f2f10d49
Raise error if up used with both -d and --timeout
...
Fix #5434
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-12-06 17:34:46 -08:00
34ea11fcb7
Allow port publish ranges
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
20a393d4f9
Adds support for a memory flag to docker-compose build.
...
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-06 17:34:46 -08:00
dba2abd523
Add config validation for service volumes, fixes #5352
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
3ce2f03d70
Use mounts for secrets instead of volumes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
7835a07550
Added a label option to 'docker-compose run' and test.
...
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-06 17:34:46 -08:00
6b0138d70f
implement --timeout flag for docker-compose down
...
Fix #3370
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-12-06 17:34:46 -08:00
76e9076cb7
Refactor subnet cidr validator & add new test
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
df0f7e17d3
Add format to other v3 configs & remove unix dependency
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
fa61a91cb5
Fix subnet config test for windows
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
cf782a3dbb
Implement subnet config validation ( fixes #4552 )
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
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
41d7d6e45b
Added unit test and used stop_timeout
...
Signed-off-by: Andy Neff <andyneff@users.noreply.github.com>
2017-12-06 17:32:25 -08:00
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
a1a6fb485b
docker-compose exec doesn't have -e option ( fixes #4551 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-12-06 17:32:25 -08:00
558df8fe2f
Add support for BOM-signed env files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:32:25 -08:00
e022f32ee9
Wrong format in the healthcheck test does not issue a warning ( fixes #4424 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-12-06 17:32:25 -08:00
eb51f0fae8
Add type converter to interpolation module
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:32:25 -08:00
8cd46cd54d
Allow empty default values in variable interpolation ( fixes #5185 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-12-06 17:32:25 -08:00
ee6a293ae0
Placing dots in hostname no longer populates domainname if api >= 1.23 ( fixes #4128 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-12-06 17:32:25 -08:00
dfa7380f37
Add missing test constraint
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:32:25 -08:00
8a08eb6688
Move build labels parsing to config module
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:32:25 -08:00
6dfd469354
Progress markers are not shown correctly for docker-compose up ( fixes #4801 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-12-06 17:31:38 -08:00
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
2daf3628e9
Fix exit code 0 upon parallel pull failure.
...
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2017-12-06 17:29:49 -08:00
5844dbb38e
Add --quiet parameter to docker-compose pull, using existing silent flag
...
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
2017-12-06 17:26:45 -08:00
3d57f702f1
service_test.py reorder imports
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-12-06 17:26:21 -08:00
9b91f3431b
skip cpu_percent test for Linux
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-12-06 17:26:21 -08:00
700d6aca54
Fix testcases.py formatting
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-12-06 17:26:21 -08:00
03fefaca39
Fix service label parsing
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-07 17:13:58 -08:00
9f80ec548e
Miscellaneous test fixes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-01 14:46:17 -07:00
63b5722b16
flake8
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 13:36:18 -07:00
9e1388eba6
Add specific handling for pywintypes.error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
b9bae89f1d
Config command generates invalid volumes ( fixes #5176 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-16 16:46:21 -07:00
f6d7eeb129
Move build labels parsing to config module
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
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
96882268de
Add get_secret_volumes unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
f74838676d
Mount with same container path and different mode should override
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
aecd0a9483
Temporary xfails for engine bug
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
38073bbd9f
Add shm_size to build-options (issue #3866 )
...
* Add shm_size to build configuration
* Make it possible to enlarge/customize shm size during build
* Value in bytes, or use string like "512M" or "1G" ...
* Add to compose format 2.3 and (provisionally) >=3.5 format
* Add automated test for shm_size in build-opts
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Made unit tests compatible with previously added shm_size build-option
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Also support shm_size build-opt when conf override
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Automated test for shm_size build-option
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Schema 3.4, add shm_size to schema 2.3, updated const.py
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Corrected typo in config_schema_v3.4
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Add support for g/m/k units for shm_size in build-opts
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Reorder imports in service.py
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
2017-10-16 16:46:21 -07:00
ce19f43158
Avoid import ConfigurationError inside compose.utils (circular import)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
49b1ac57c3
Fix oneOf validator parser to correctly process uniqueItems errors
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
2f61a1dac4
Add support for extension fields in v2.x and v3.4
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:18 -07:00
376389d7a5
Add --no-start flag to up command. Deprecate create command.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:18 -07:00
2eed6939f1
Add --quiet parameter to docker-compose pull, using existing silent flag
...
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
2017-10-16 16:45:42 -07:00
0367995b8f
service_test.py reorder imports
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-10-16 16:45:25 -07:00
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
Madeline Stager
Samantha Miller
Drew Romanyk
Andy Neff
Guillermo Arribas
aronahl
Joel Barciauskas
Alexey Rokhin
Marc van den Hoogen