Commit Graph

4603 Commits

Author SHA1 Message Date
Joffrey F 803d5352e6 Add missing test constraint
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-18 17:27:23 -07:00
Joffrey F 2a0dd1401f Bump 1.17.0-rc1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 13c5049dbc flake8
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 395dce9d2c Add check_duplicate=True when creating network
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F d8194cf6f0 Add specific handling for pywintypes.error
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Guillermo Arribas 0ec77bf7d5 Config command generates invalid volumes (fixes #5176)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-17 17:20:00 -07:00
Joffrey F f680d46d9a Move build labels parsing to config module
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Guillermo Arribas 0d0da0760c Build labels option: array form produces unmarshal error (fixes #5183)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-17 17:20:00 -07:00
Joffrey F c4a8cb30ff Add get_secret_volumes unit tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Andrea Giardini 18df4915f2 Fix secret location with absolute paths
Signed-off-by: Andrea Giardini <contact@andreagiardini.com>
2017-10-17 17:20:00 -07:00
Joffrey F 8c38651196 Mount with same container path and different mode should override
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 3436145764 Temporary xfails for engine bug
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Marc van den Hoogen c7cdd63acf 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-17 17:20:00 -07:00
Joffrey F 21d597c2b4 Avoid import ConfigurationError inside compose.utils (circular import)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 78fe655dbc Revert 3.4-beta temp rename
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
French Ben cb2d65556b Use slim alpine instead of bulky debian
Signed-off-by: French Ben <frenchben@docker.com>
2017-10-17 17:20:00 -07:00
French Ben 53928a17c0 Simple patch to allow s390x images to be built
Needs integration with CI and s390x machine integration

Signed-off-by: French Ben <frenchben@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 1da5b54d75 Fix oneOf validator parser to correctly process uniqueItems errors
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Vincent Demeester 158a786578 Sync composefile v3.2 schema with `docker/cli`
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-10-17 17:20:00 -07:00
Joffrey F d48296213b Update release process with most recent changes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 8c6f2217c4 Add support for extension fields in v2.x and v3.4
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 42aa1c3447 Reduce up() cyclomatic complexity
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Joffrey F 9587556e8f Add --no-start flag to up command. Deprecate create command.
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 17:20:00 -07:00
Evan Shaw 5b4573e7e5 Always silence pull output with --parallel
This is how things were prior to the addition of the --quiet flag.
Making it not silent produces output that's weird and difficult to read.

Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-10-17 17:20:00 -07:00
NikitaVlaznev f8b2981fb9 Fix double silent argument value
Fix for "TypeError: pull() got multiple values for keyword argument 'silent'."
This change e9b6cc23fc caused additional value to be passed for the 'silent' argument, that was already passed there: f85da99ef3

Signed-off-by: Nikita Vlaznev <nikita.dto@gmail.com>
2017-10-17 17:20:00 -07:00
Joel Barciauskas aee944393e Add --quiet parameter to docker-compose pull, using existing silent flag
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
2017-10-17 17:20:00 -07:00
Alexey Rokhin 3089eda5ab service_test.py reorder imports
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-10-17 17:20:00 -07:00
Alexey Rokhin 11bd32b597 skip cpu_percent test for Linux
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-10-17 17:20:00 -07:00
Alexey Rokhin 7f1dc09404 Fix testcases.py formatting
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-10-17 17:20:00 -07:00
Joffrey F a0f95afcd1 Bump 1.17.0-rc1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 14:59:13 -07:00
Joffrey F 63b5722b16 flake8
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 13:36:18 -07:00
Joffrey F 2556668c8c Add check_duplicate=True when creating network
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
Joffrey F 9e1388eba6 Add specific handling for pywintypes.error
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
Guillermo Arribas b9bae89f1d Config command generates invalid volumes (fixes #5176)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-16 16:46:21 -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
Joffrey F 96882268de Add get_secret_volumes unit tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
Andrea Giardini 07b30e3145 Fix secret location with absolute paths
Signed-off-by: Andrea Giardini <contact@andreagiardini.com>
2017-10-16 16:46:21 -07:00
Joffrey F 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
Joffrey F aecd0a9483 Temporary xfails for engine bug
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
Marc van den Hoogen 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
Joffrey F 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
Joffrey F fa63e23520 Revert 3.4-beta temp rename
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
French Ben c5e871c5a5 Use slim alpine instead of bulky debian
Signed-off-by: French Ben <frenchben@docker.com>
2017-10-16 16:46:21 -07:00
French Ben 4bc9d9dbaf Simple patch to allow s390x images to be built
Needs integration with CI and s390x machine integration

Signed-off-by: French Ben <frenchben@docker.com>
2017-10-16 16:46:21 -07:00
Joffrey F 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
Vincent Demeester 1610af7e9f Sync composefile v3.2 schema with `docker/cli`
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-10-16 16:46:21 -07:00
Joffrey F eab333adb1 Update release process with most recent changes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:21 -07:00
Joffrey F 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
Joffrey F 3cb22fa94a Reduce up() cyclomatic complexity
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 16:46:18 -07:00