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

4254 Commits

Author SHA1 Message Date
Joffrey F c5408f3a40 Add support for extra_hosts in build config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-09 14:57:24 -08:00
Joffrey F c0366b71e9
Merge pull request #5356 from docker/bump_sdk 
Include SDK attach bugfix
 2017-11-08 17:39:20 -08:00
Joffrey F 3de82c0049 Include SDK attach bugfix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-08 17:05:53 -08:00
Joffrey F 7208aeb002
Merge pull request #5351 from docker/bump_sdk 
Bump SDK version to latest
 2017-11-07 18:18:52 -08:00
Joffrey F b0480b4d04 Bump SDK version to latest 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-07 17:29:23 -08:00
Joffrey F 45d590ef69
Merge pull request #5341 from docker/5336-fix-label-parsing 
Fix service label parsing
 2017-11-03 15:45:32 -07:00
Joffrey F 4563d8c050 Fix service label parsing 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 13:51:49 -07:00
Joffrey F 2780559a14
Merge pull request #5340 from docker/sync_release 
Sync release
 2017-11-03 13:27:42 -07:00
Joffrey F 9b03cdfdf8 1.18.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:36:53 -07:00
Joffrey F d94cfff78d Bump 1.17.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:35:47 -07:00
Joffrey F 5e032b7e8f Bump 1.17.0-rc1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:35:17 -07:00
Joffrey F d05c53b5fc
Merge pull request #5339 from docker/add_shasum_compute 
Add shasum computation to download-binaries script
 2017-11-03 12:29:27 -07:00
Joffrey F 2482d57e9a Add shasum computation to download-binaries script 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-03 12:26:31 -07:00
Joffrey F 819be19f7c Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 15:18:28 -07:00
Joffrey F 9ae6015ce2 Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:26:29 -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 f965d2b374 Add check_duplicate=True when creating network 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:30:39 -07:00
Joffrey F d2cbf33412 Add specific handling for pywintypes.error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 13:43:57 -07:00
Guillermo Arribas aaa0773b4b Config command generates invalid volumes (fixes #5176) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-16 12:06:04 -07:00
Joffrey F 262a4a1d77 Merge branch 'garribas-5183-array-form-of-labels-unmarshall-error' 2017-10-16 11:56:48 -07:00
Joffrey F 7df1b53ad2 Move build labels parsing to config module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 11:56:36 -07:00
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