tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,305 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

4305 Commits

Author SHA1 Message Date
Joffrey F c8b2dd2fb1 Add support for extension fields in v2.x and v3.4 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:30:33 -08:00
aronahl 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
Evan Shaw d1289554d5 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-12-06 17:27:07 -08:00
NikitaVlaznev 4286315bc9 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-12-06 17:26:56 -08:00
Joel Barciauskas 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
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
Alexey Rokhin 700d6aca54 Fix testcases.py formatting 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-12-06 17:26:21 -08:00
Joffrey F a9597d72f5
Merge pull request #5350 from docker/bump-1.17.1 
Bump 1.17.1
 2017-11-08 17:25:49 -08:00
Joffrey F 6d101fb068 Bump 1.17.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:13:58 -08:00
Joffrey F 03fefaca39 Fix service label parsing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:13:58 -08:00
Joffrey F fb113b731c Merge remote-tracking branch 'origin/release' into bump-1.17.1 2017-11-07 17:08:25 -08:00
Joffrey F b55a50a384
Merge pull request #5330 from docker/bump-1.17.0 
Bump 1.17.0
 2017-11-01 17:06:41 -07:00
Joffrey F ac53b73e79 Bump 1.17.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:46:17 -07: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 6078736604 Add flake8 to dev requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 13:36:22 -07:00
Guillermo Arribas 0847f8e84b flake8 error on master branch (fixes #5298) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-11-01 13:36:22 -07:00
Harald Albers 779773b664 Add bash completion for `up --no-start` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-11-01 13:36:22 -07:00
Joffrey F ec45acb582 Merge remote-tracking branch 'origin/release' into bump-1.17.0 2017-11-01 13:34:01 -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