tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,626 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

4626 Commits

Author SHA1 Message Date
Joffrey F 819be19f7c Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 15:18:28 -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 9ae6015ce2 Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:26:29 -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
Andy Neff 0e4bd32a65 Added unit test and used stop_timeout 
Signed-off-by: Andy Neff <andyneff@users.noreply.github.com>
 2017-11-01 13:30:49 -07:00
Andy Neff 2df3d6f75a Have stop_grace_period also set StopTimeout on create 
Signed-off-by: Andy Neff <andrew.neff@visionsystemsinc.com>
 2017-11-01 13:30:49 -07:00
Joffrey F 80503da476 Add support for oom_kill_disable in service config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-25 17:32:18 -07:00
Guillermo Arribas b30cb77a7b docker-compose exec doesn't have -e option (fixes #4551) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-25 13:22:00 -07:00
Joffrey F 8c0b03a2f5 Add support for BOM-signed env files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-24 12:52:54 -07:00
Joffrey F 241621cd2f Merge branch 'garribas-4424-healthcheck-test-validation' 2017-10-23 14:50:36 -07:00
Joffrey F 3cfa0bd162 Improve process_healthcheck readability 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-23 14:50:22 -07:00
Guillermo Arribas aa1fb67495 Wrong format in the healthcheck test does not issue a warning (fixes #4424) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-23 14:50:22 -07:00
Reut Sharabani d6546e342b Better installation instruction in release notes 
Changed sample download script to use the built in `-o` optoin in `curl` instead of redicrecting stdout's output.

This allows users to prepend `sudo` to the snippet to make it work in common use cases where root permissions are needed to create the output file.

From `curl`:
    -o, --output <file>
              Write output to <file> instead of stdout.

Signed-off-by: Reut Sharabani <reut.sharabani@gmail.com>
 2017-10-23 14:41:10 -07:00
Joffrey F 3ada75821b Add flake8 to dev requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-23 14:24:54 -07:00
Joffrey F a07dee9207 Add type converter to interpolation module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-23 12:42:42 -07:00
Guillermo Arribas 2e81e6ceb2 flake8 error on master branch (fixes #5298) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-23 12:23:52 -07:00
Guillermo Arribas eebc63c216 Allow empty default values in variable interpolation (fixes #5185) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-20 13:45:47 -07:00
Guillermo Arribas 9c5347bd23 Placing dots in hostname no longer populates domainname if api >= 1.23 (fixes #4128) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-19 16:31:18 -07:00
Harald Albers 9b06bdc34a Add bash completion for `up --no-start` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-10-19 14:27:25 -07:00
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