Commit Graph

4218 Commits

Author SHA1 Message Date
Guillermo Arribas 6de646d3b0 Build labels option: array form produces unmarshal error (fixes #5183)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-13 22:49:41 -03:00
Joffrey F 08714ef796 Add get_secret_volumes unit tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-13 17:43:07 -07:00
Andrea Giardini edcb8aea7b Fix secret location with absolute paths
Signed-off-by: Andrea Giardini <contact@andreagiardini.com>
2017-10-13 17:43:07 -07:00
Joffrey F 53e0378379 Mount with same container path and different mode should override
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-13 17:04:42 -07:00
Joffrey F aab0891a07 Temporary xfails for engine bug
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-13 16:21:34 -07:00
Marc van den Hoogen dc838067fd 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-09-29 15:50:17 -07:00
Joffrey F 9430e5bf9d Avoid import ConfigurationError inside compose.utils (circular import)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-28 16:51:03 -07:00
Joffrey F 7f82a28572 Revert 3.4-beta temp rename
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-26 18:01:43 -07:00
French Ben b2a03265e4 Use slim alpine instead of bulky debian
Signed-off-by: French Ben <frenchben@docker.com>
2017-09-26 17:44:22 -07:00
French Ben 6222d1cc8b 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-09-26 17:44:22 -07:00
Joffrey F 3654f3ac48 Fix oneOf validator parser to correctly process uniqueItems errors
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-26 17:21:31 -07:00
Vincent Demeester 432dffc710 Sync composefile v3.2 schema with `docker/cli`
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-21 22:33:26 -07:00
Joffrey F fc426e273d Merge extra_hosts instead of overwrite
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-01 13:18:44 -07:00
Joffrey F 36e5985b01 Update release process with most recent changes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-01 12:16:39 -07:00
Joffrey F d1eabcecb6 1.17.0 dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:49:43 -07:00
Joffrey F cb82e3d192 Bump 1.16.0-rc1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:49:43 -07:00
Joffrey F cfb0fda1b1 Bump 1.16.0-rc2
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:49:43 -07:00
Joffrey F dc4b77deb0 Bump 1.16.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:49:43 -07:00
Joffrey F ec1f6c36eb Add support for extension fields in v2.x and v3.4
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:38:32 -07:00
Joffrey F 3e725162ec Reduce up() cyclomatic complexity
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:36:13 -07:00
Joffrey F 40c05cfc1e Add --no-start flag to up command. Deprecate create command.
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:36:13 -07:00
Joffrey F c8daf17db6 Handle unicode errors in LogPrinter
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-25 16:37:17 -07:00
Harald Albers ff05f1ed15 Add bash completion for `create --build`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-08-25 15:46:57 -07:00
Harald Albers 28e1c85c3b Add bash completion for `--no-ansi`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-08-25 15:46:34 -07:00
Joffrey F 60eed707d1 Remove all colors in output when --no-ansi is set
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-24 14:10:50 -07:00
Cecile Tonglet 9e88b15172 Fix --no-ansi flag not working properly
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-24 14:10:50 -07:00
Cecile Tonglet ebbf48e606 Actually test there is no control characters
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-24 14:10:50 -07:00
Joffrey F e370a22104 Rename 3.4 schema to 3.4-beta
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-24 14:01:30 -07:00
Joffrey F 7813d0a8fa Account for repo tag values that may contain a port
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-24 12:27:18 -07:00
Joffrey F 415c5ddde4 Bump docker SDK -> 2.5.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-23 12:35:31 -07:00
Joffrey F f1083087df Update schemas to prevent invalid properties in deploy.resources
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 16:51:22 -07:00
Joffrey F bd3feae62b Bump python SDK version -> 2.5.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 16:24:12 -07:00
aronahl 390ba801a3 Fix exit code 0 upon parallel pull failure.
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2017-08-15 13:48:41 -07:00
Joffrey F 7210fdb21c Add support for start_period in healthcheck config
Improve merging strategy for healthcheck configs

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 16:49:29 -07:00
Joffrey F 22d9a258f4 v2 custom volume name support
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 11:48:00 -07:00
Joffrey F 8c30971299 Add support for v3.4 files and custom volume names
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 11:48:00 -07:00
Joffrey F 3fbfb3a5dd Prevent null logging options in `docker-compose config` output
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-10 12:21:27 -07:00
Joffrey F dc6bb7020d UCP 2.2.0 test fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-10 11:08:20 -07:00
Joffrey F 6e802df809 Add support for blkio config keys
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:45:22 -07:00
Joffrey F 454b063fed Keep no-ansi parameter in the CLI scope
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:00:23 -07:00
Cecile Tonglet b0b671dbf2 Add a flag --no-ansi to remove control characters on parallel executions
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-09 19:00:23 -07:00
Joffrey F f9aaa72c54 Bump texttable dependency
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-03 12:06:23 -07:00
Joffrey F 3ea8a20cfa Fix ServiceExtendsResolver same-file detection
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-03 12:06:06 -07:00
Joffrey F 0c4fc93895 Use newer versions of pre-commit hooks
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-02 20:02:26 -07:00
Carl George 8ea0e8e053 only require colorama on windows
Colorama is only useful on Windows by design.  Since it has no effect on
other platforms, it makes sense to not require it universally.

Signed-off-by: Carl George <carl@george.computer>
2017-07-27 14:07:19 -07:00
Joffrey F a7dae73aa3 1.16.0-dev
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:21:30 -07:00
Joffrey F f71293bb76 Bump 1.15.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:20:24 -07:00
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 8102f02cfc 0 is a valid value for a published port
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:17:26 -07:00
Joffrey F 7abae9f536 Escape dollar sign in serialized config output
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:16:55 -07:00