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

682 Commits

Author SHA1 Message Date
Joffrey F 99e9e32d7e Add support for custom names for networks, secrets, configs 
Finalize v3.5 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Joffrey F 084818ce2b Add support for mount syntax 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Joffrey F 34ea11fcb7 Allow port publish ranges 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Samantha Miller 20a393d4f9 Adds support for a memory flag to docker-compose build. 
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk dba2abd523 Add config validation for service volumes, fixes #5352 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Joffrey F 3ce2f03d70 Use mounts for secrets instead of volumes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Samantha Miller 7835a07550 Added a label option to 'docker-compose run' and test. 
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk 76e9076cb7 Refactor subnet cidr validator & add new test 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk df0f7e17d3 Add format to other v3 configs & remove unix dependency 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk fa61a91cb5 Fix subnet config test for windows 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Drew Romanyk cf782a3dbb Implement subnet config validation (fixes #4552) 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2017-12-06 17:34:46 -08:00
Joffrey F 67dfcd6951 Add support for extra_hosts in build config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Andy Neff 41d7d6e45b Added unit test and used stop_timeout 
Signed-off-by: Andy Neff <andyneff@users.noreply.github.com>
 2017-12-06 17:32:25 -08:00
Joffrey F 558df8fe2f Add support for BOM-signed env files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:32:25 -08:00
Guillermo Arribas e022f32ee9 Wrong format in the healthcheck test does not issue a warning (fixes #4424) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:32:25 -08:00
Joffrey F eb51f0fae8 Add type converter to interpolation module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:32:25 -08:00
Guillermo Arribas 8cd46cd54d Allow empty default values in variable interpolation (fixes #5185) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:32:25 -08:00
Guillermo Arribas ee6a293ae0 Placing dots in hostname no longer populates domainname if api >= 1.23 (fixes #4128) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:32:25 -08:00
Joffrey F 8a08eb6688 Move build labels parsing to config module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:32:25 -08:00
Guillermo Arribas 6dfd469354 Progress markers are not shown correctly for docker-compose up (fixes #4801) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:31:38 -08:00
Guillermo Arribas e1db4f6e19 Build labels option: array form produces unmarshal error (fixes #5183) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:31:38 -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 9e1388eba6 Add specific handling for pywintypes.error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
Joffrey F f6d7eeb129 Move build labels parsing to config module 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
Guillermo Arribas 2f2259f2d2 Build labels option: array form produces unmarshal error (fixes #5183) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-16 16:46:21 -07:00
Joffrey F 96882268de Add get_secret_volumes unit tests 
Signed-off-by: Joffrey F <joffrey@docker.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
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 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
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 241931f776 Merge extra_hosts instead of overwrite 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-09-01 15:43:44 -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 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 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 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 467e0d0d31 Fix ServiceExtendsResolver same-file detection 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F 1ae83d4139 0 is a valid value for a published port 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F 770d94376a Escape dollar sign in serialized config output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Yong Wen Chua 16f8953c78 Add `target` to service build configuration 
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2017-08-21 13:09:19 -07:00
Yong Wen Chua c006add122 Add Compose v2.3 
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
 2017-08-21 13:09:19 -07:00
Joffrey F 56a23bfcd2 Improved version comparisons throughout the codebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F 2d21bf6a50 Make sure y/n values are quoted in serialized output 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F d475e0c1e3 Add "network" field to build configuration 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F 0916f124d0 `scale` property should be merged according to standard scalar rules 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Evan Shaw 154adc5807 Align status output for parallel_execute 
Previously docker-compose would output lines that looked like:

    Starting service ... done
    Starting short ...
    Starting service-with-a-long-name ... done

It's difficult to scan down this output and get an idea of what's happening.

Now the statuses are aligned, and output looks like this:

    Starting service                  ... done
    Starting short                    ...
    Starting service-with-a-long-name ... done

To me, this is quite a bit easier to read.

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-07-13 17:37:26 -07:00
Joffrey F 1dfdbe6f94 Fix ports sorting on Python 3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00