Commit Graph

686 Commits

Author SHA1 Message Date
Joffrey F ceec0595bd Allow port publish ranges
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-04 14:15:17 -08:00
Joffrey F 9098a67394
Merge pull request #5410 from sethktaylor11/5374-build-memory
Adds support for a memory build-arg in docker-compose build.
2017-12-04 14:00:09 -08:00
Samantha Miller a6cdd62726 Adds support for a memory flag to docker-compose build.
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-03 13:59:32 -06:00
Joffrey F a204e50058
Merge pull request #5415 from docker/5377-secrets-mounts
Use mounts for secrets instead of volumes
2017-12-01 13:25:46 -08:00
Joffrey F 43fc651364
Merge pull request #5418 from nginth/5352-fix-volume-config
Add config validation for service volumes, fixes #5352
2017-12-01 12:19:23 -08:00
Drew Romanyk bee6046043 Add config validation for service volumes, fixes #5352
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-30 10:21:27 -06:00
Joffrey F 415fa6c59b Use mounts for secrets instead of volumes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-29 12:21:56 -08:00
Joffrey F 58dcfac853
Merge pull request #5397 from sethktaylor11/4937-Labels
Added a label option to 'docker-compose run' and test.
2017-11-29 11:42:24 -08:00
Samantha Miller c36a2fb1ad Added a label option to 'docker-compose run' and test.
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-11-28 18:43:00 -06:00
Drew Romanyk badd4d764a Refactor subnet cidr validator & add new test
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-13 21:53:14 -06:00
Drew Romanyk 6c8184d0d0 Add format to other v3 configs & remove unix dependency
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-10 18:04:11 -06:00
Drew Romanyk 68c636d728 Fix subnet config test for windows
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-09 23:41:42 -06:00
Drew Romanyk 5691b8241d Implement subnet config validation (fixes #4552)
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-09 22:30:10 -06:00
Joffrey F d48002a09d
Merge pull request #5361 from docker/5282-build-extra-hosts
Add support for extra_hosts in build config
2017-11-09 16:30:35 -08:00
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 0079ac52c6
Merge pull request #5250 from garribas/4801-progress-markers
Progress markers are not shown correctly for docker-compose up (fixes…
2017-11-09 14:29:34 -08:00
Joffrey F 4563d8c050 Fix service label parsing
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-03 13:51:49 -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
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
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
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 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
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
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 57eb1c463f Progress markers are not shown correctly for docker-compose up (fixes #4801)
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-13 22:54:39 -03: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
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
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 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
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 ec1f6c36eb Add support for extension fields in v2.x and v3.4
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:38:32 -07:00
Cecile Tonglet ebbf48e606 Actually test there is no control characters
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-24 14:10:50 -07:00
Joffrey F 7210fdb21c Add support for start_period in healthcheck config
Improve merging strategy for healthcheck configs

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 16:49:29 -07:00
Joffrey F 8c30971299 Add support for v3.4 files and custom volume names
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 11:48:00 -07:00
Joffrey F 3fbfb3a5dd Prevent null logging options in `docker-compose config` output
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-10 12:21:27 -07:00
Joffrey F 6e802df809 Add support for blkio config keys
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:45:22 -07:00
Joffrey F 454b063fed Keep no-ansi parameter in the CLI scope
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:00:23 -07:00
Cecile Tonglet b0b671dbf2 Add a flag --no-ansi to remove control characters on parallel executions
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-09 19:00:23 -07:00
Joffrey F 3ea8a20cfa Fix ServiceExtendsResolver same-file detection
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-03 12:06:06 -07:00
Joffrey F 8102f02cfc 0 is a valid value for a published port
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:17:26 -07:00
Joffrey F 7abae9f536 Escape dollar sign in serialized config output
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:16:55 -07:00
Yong Wen Chua 1ecf51c209 Add `target` to service build configuration
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-07-20 17:06:59 -07:00
Yong Wen Chua 4a65008199 Add Compose v2.3
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-07-20 17:06:59 -07:00
Joffrey F 8f0ef26a73 Improved version comparisons throughout the codebase
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-11 17:40:53 -07:00
Joffrey F d94fa5428e Make sure y/n values are quoted in serialized output
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-06 15:15:12 -07:00
Joffrey F e33041582f Add "network" field to build configuration
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-06 12:17:46 -07:00
Joffrey F 55bd02f303 `scale` property should be merged according to standard scalar rules
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-05 13:10:50 -07:00