tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 24 Branches 268 Tags
Commit Graph

4200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joffrey F
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
Evan Shaw
4bd2aa3d74 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-16 16:45:51 -07:00
NikitaVlaznev
d960f5151e 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-16 16:45:44 -07:00
Joel Barciauskas
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
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
Andrew Hsu
4900f09991 Bump 1.16.1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-09-01 15:43:44 -07:00
Joffrey F
241931f776 Merge extra_hosts instead of overwrite 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-09-01 15:43:44 -07:00
Joffrey F
07d5042859 Bump 1.16.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-31 14:36:32 -07:00
Joffrey F
5cc23c540c Bump 1.16.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-28 15:21:39 -07:00
Joffrey F
abdeed7bb6 Handle unicode errors in LogPrinter 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-28 15:21:39 -07:00
Harald Albers
b28bcd613a Add bash completion for create --build 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-08-28 15:21:39 -07:00
Harald Albers
e62c403326 Add bash completion for --no-ansi 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-08-28 15:21:39 -07:00
Joffrey F
c49837fae0 Remove all colors in output when --no-ansi is set 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-28 15:21:39 -07:00
Cecile Tonglet
fb531ceaa3 Fix --no-ansi flag not working properly 
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
 2017-08-28 15:21:39 -07:00
Cecile Tonglet
c8193821ed Actually test there is no control characters 
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
 2017-08-28 15:21:39 -07:00
Joffrey F
177499b6de Account for repo tag values that may contain a port 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-28 15:21:39 -07:00
Joffrey F
5f84c0c27a Rename 3.4 schema to 3.4-beta 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-28 15:21:39 -07:00
Joffrey F
d2543c830d Bump docker SDK -> 2.5.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-28 15:21:39 -07:00
Joffrey F
7805960a73 Bump 1.16.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
7611492f9c Update schemas to prevent invalid properties in deploy.resources 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
f2aebf8004 Bump python SDK version -> 2.5.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
aronahl
f1baee3292 Fix exit code 0 upon parallel pull failure. 
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
 2017-08-21 13:09:19 -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
b25eb084ae Add support for v3.4 files and custom volume names 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
b2a3566cf5 Prevent null logging options in docker-compose config output 
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
7882f1fb06 Keep no-ansi parameter in the CLI scope 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Cecile Tonglet
444d888720 Add a flag --no-ansi to remove control characters on parallel executions 
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
7feb2685d2 Bump texttable dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
467e0d0d31 Fix ServiceExtendsResolver same-file detection 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F
4652d3c38a Use newer versions of pre-commit hooks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Carl George
bbebf518cf 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-08-21 13:09:19 -07:00
Joffrey F
e0f7b075b8 1.16.0-dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00