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

721 Commits

Author SHA1 Message Date
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
Evan Shaw 9cdbb953ba 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-03 16:24:07 -07:00
Joffrey F f2054f1a7d Fix ports sorting on Python 3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-27 12:50:41 -07:00
Joffrey F f3c1c8d158 ServicePort merge_field should account for external IP and protocol 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-12 11:42:29 -07:00
Joffrey F bd8d77feae Add configs tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 11:50:09 -07:00
Joffrey F 36af86b9b2 Always convert port values in ServicePort to integer 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-05 15:51:22 -07:00
Joffrey F 9a70db0889 Merge pull request #4864 from shin-/cred_spec_support 
Add partial support for v3.3 credential_spec
 2017-05-25 17:30:44 -07:00
Joffrey F 73d7865da8 Add partial support (docker-compose config and warnings) for v3.3 credential_spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-25 14:54:46 -07:00
Joffrey F bf8498c488 Merge pull request #4861 from shin-/4825-cache-from 
Merge all fields inside build dict
 2017-05-25 14:44:56 -07:00
Joffrey F 2ba9cd73d1 Network label mismatch now prints a warning instead of raising an error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:26:17 -07:00
Joffrey F 062812e4aa Merge all fields inside build dict 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 15:23:04 -07:00
Joffrey F fa77856c86 Add 3.3 format support 
Remove build.labels field from 3.2 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-23 12:04:24 -07:00
Colin Hebert 9d78258b44 Fix test type 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Colin Hebert 37de55865b Add tests for the labels 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Colin Hebert 7fca689efd Update tests to show labels set to None 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-23 12:03:36 -07:00
Alexey Rokhin 0043dc4fab Add cpu_count, cpu_percent, cpus parameters. 
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
 2017-05-17 14:50:29 +03:00
Joffrey F babd7530c3 New network config whitelist option in unit test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-05 11:40:50 -07:00
Joffrey F 3e66c68f9f Fix external secrets serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-01 14:42:17 -07:00
Joffrey F d0acefd450 Prevent NoneType error when remote IPAM options is None 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-26 13:34:45 -07:00
Joffrey F a0cf0a2009 Avoid rebinding tmpfs data volumes when recreating containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-25 15:10:57 -07:00
Joffrey F ae2cc6b5b8 Merge pull request #4721 from shin-/4376-unicode_file_paths 
Convert paths to unicode in get_config_path_from_options if needed
 2017-04-12 14:41:44 -07:00
Joffrey F 1891b2b78c Fix ServicePort.legacy_repr bug for `ext_ip::target` notation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-11 14:45:14 -07:00
Joffrey F 0f00aa4098 Convert paths to unicode in get_config_path_from_options if needed 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 17:45:06 -07:00
Joffrey F 72a2ea9d86 Fix serializer bug (python 3) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 16:54:31 -07:00
Joffrey F 2506b72508 Merge pull request #4649 from shin-/bump_docker_py 
Bump docker SDK dependency
 2017-03-31 14:40:49 -07:00
Joffrey F 48831a8d5f Bump docker SDK dependency 
Update invalid ports test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-28 16:15:34 -07:00
King Chung Huang 0e5acfa16c Merge deploy key in service dicts 
Update merge_service_dicts() to merge deploy mappings.
Compose file version 3 added the deploy key to service dicts
to specify configs related to Docker services.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
 2017-03-24 15:03:53 -06:00
Joffrey F 0d1608c17c Merge pull request #4662 from shin-/4651-tls-version-commandline 
Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
 2017-03-23 15:16:03 -07:00
Joffrey F f55c9d4201 Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-22 17:27:11 -07:00
Joffrey F a0add5cc12 Fix ports reparsing for service extends 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-22 15:14:13 -07:00
Joffrey F 611f058cde Merge pull request #4632 from shin-/expanded-mounts 
Add support for expanded mount/volume notation
 2017-03-21 12:36:41 -07:00
Joffrey F 69d0c0e3a0 Add support for expanded mount/volume notation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-17 20:42:59 -07:00
King Chung Huang 0464476f08 Add unit test for image digests in config 
Add two unit tests to validate that the denormalize_service_dict
function still works without passing a third argument for image_digest,
and correctly uses an image digest if one is provided.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
 2017-03-17 12:22:40 -06:00
Daniel Nephin 2acf286ed6 Support V3.2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-15 11:40:31 -04:00
Joffrey F a182300706 Merge pull request #4605 from shin-/4600-check-all-network-updates 
Ensure network config matches remote for all properties
 2017-03-14 13:56:43 -07:00
Joffrey F a6db78e5d4 Enable variable substitution in config.secrets 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-13 18:30:37 -07:00
Joffrey F 963b672cbd Ensure network config matches remote for all properties 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-13 15:48:38 -07:00
Joffrey F 23b873c2ce Add "secrets" section to docker-compose config output when applicable 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-10 14:32:55 -08:00
Joffrey F dd294ce9cc Merge pull request #4591 from shin-/4580-log-api-error 
Avoid encoding crash in log_api_error
 2017-03-10 14:02:44 -08:00
Joffrey F beedceb66b Merge pull request #4589 from shin-/dbonev-2586-specify-cwd-parameter 
Ability to change working directory via a CLI flag
 2017-03-09 15:44:27 -08:00
Joffrey F 4e92b5bb85 Merge pull request #4590 from shin-/3474-self-referencing-ext-links 
Prevent service to create a container if it is referencing itself in an external link
 2017-03-09 15:36:48 -08:00
Joffrey F c3bcd59aeb Avoid encoding crash in log_api_error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-09 15:23:13 -08:00
Joffrey F 5ea9167334 Prevent service to create a container if it is referencing itself in an external link 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-08 18:29:09 -08:00
Dimitar Bonev 707210ae95 Ability to change working directory via a CLI flag 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2017-03-08 14:42:14 -08:00
Joffrey F ac12ab95c4 Rename COMPOSE_FILE_SEPARATOR -> COMPOSE_PATH_SEPARATOR 
Add unit test

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-08 14:30:15 -08:00
Joffrey F d5a2d37d05 Properly resolve build args against host environment values 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-07 18:13:11 -08:00
Dat Tran 449dcc9d7b support --build-arg for build command 
Signed-off-by: Dat Tran <dattran.vn01@gmail.com>
 2017-03-07 17:09:35 -08:00
Joffrey F dd4e49ef98 Merge pull request #4563 from shin-/3723-mem-reservation 
Add mem_reservation option to service config in 2.0 and 2.1 formats
 2017-03-07 15:23:22 -08:00
Joffrey F e344fe9a9f Merge pull request #4566 from shin-/eddwardo-run-v 
Add --volumes flag to docker-compose run
 2017-03-07 15:22:51 -08:00
Joffrey F 0167aba2b7 Merge pull request #4541 from shin-/4502-expanded-port-syntax 
Add support for expanded port syntax in 3.1 format
 2017-03-06 18:32:52 -08:00
Joffrey F ec252350ae Add mem_reservation option to service config in 2.0 and 2.1 formats 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 18:21:03 -08:00
George Lester c7b8278e78 Implemented dns_opt 
Signed-off-by: George Lester <glester491@gmail.com>
 2017-03-03 15:37:21 -08:00
Piotr Szymanski 83388ec31a enable -v flag for docker-compose run command 
Give user ability to attach volumes while running containers with
docker-compose run command. Example is given in the test implementation,
command is compatible with the one provided by docker engine.

Signed-off-by: Piotr Szymanski <skyleton@gmail.com>
 2017-03-02 16:50:24 -08:00
Joffrey F b4f4ff1a6b Merge pull request #4555 from kbh2o/abort_abort 
Return exit code when exiting with --abort-on-container-exit
 2017-03-01 17:51:58 -08:00
Joffrey F 8d3c8be7d9 Merge pull request #4036 from nbarbey/master 
Fix TypeError : unorderable types: str() < int()
 2017-03-01 17:25:21 -08:00
kbroadwater 6c3641fdb7 Returing 1 when a container exits with a non-zero exit code with --abort-on-container-exit is set. Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com> 
Catching the first container to exit Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Addressing feedback and fixing tests Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Adding break and removing extra fixture files Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>

Moving break Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
 2017-03-01 17:08:26 -08:00
Joffrey F 9f8e01fa94 Merge pull request #3543 from milin/master 
Replace assertEquals with assertEqual in unittests since the former is getting dep…
 2017-03-01 16:27:36 -08:00
Joffrey F 5ff3037aa8 Merge pull request #4428 from edsrzf/parallel-pull 
Pull services in parallel
 2017-03-01 14:38:22 -08:00
Joffrey F 11788ef0ff Add support for expanded port syntax in 3.1 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-01 12:10:51 -08:00
Joffrey F 7e8dcc847b Merge pull request #4529 from shin-/3528-invalid-service-name 
Detect the service that causes the invalid service name error
 2017-02-24 17:47:41 -08:00
Evan Shaw e29e3f8da4 Test for parallel_execute with limit 
Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-25 13:14:58 +13:00
Evan Shaw 05aa8c7285 Add optional limit to the number of parallel operations 
Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-24 21:53:38 +13:00
Joffrey F 8b92049432 Detect the service that causes the invalid service name error 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-22 16:21:23 -08:00
Joey Payne c64f7dde04 Fix failing unit tests 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Aaron.L.Xu d20e3f3342 function-name-modification for tests/* 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-16 15:25:20 +08:00
Joffrey F abce83ef25 Fix `config` command output with service.secrets section 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-13 16:51:50 -08:00