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

4075 Commits

Author SHA1 Message Date
Nathan J. Mehl a73190e1cc Add support for returning the exit value of a specific container 
Current best practice for using docker-compose as a tool for continuous
integration requires fragile shell pipelines to query the exit status
of composed containers, e.g.:

http://stackoverflow.com/questions/29568352/using-docker-compose-with-ci-how-to-deal-with-exit-codes-and-daemonized-linked
http://blog.ministryofprogramming.com/docker-compose-and-exit-codes/

This PR adds a `--forward-exitval <container>` flag that allows
`docker-compose up` to return the exit value of a specified container.
The container may optionally have a number specified (foo_2) otherwise
the first is defaulted to.

Signed-off-by: Nathan J. Mehl <n@climate.com>
 2017-02-27 08:37:11 -08:00
Evan Shaw a507c7f720 Colorize statuses in parallel_execute output 
'ok' displays in green
'error' displays in red

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-26 19:24:59 +13:00
Joffrey F a953651597 Merge pull request #4528 from shin-/4430-divergent-scale 
Check for divergent containers when scaling up
 2017-02-24 17:50:34 -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 b4b221f6a3 Update to address code review feedback 
Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-25 12:37:38 +13:00
Evan Shaw c6a271e57c Hide parallel pull behind --parallel flag 
Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-24 21:53:39 +13:00
Evan Shaw f85da99ef3 Silence service pull output when pulling in parallel 
Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-24 21:53:39 +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
Evan Shaw 21529169ad Pull services in parallel 
Updates #1652

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-02-24 21:53:38 +13:00
Joffrey F b0ba14cdb2 Merge pull request #4533 from albers/completion-exe 
Activate bash completion for Windows executable
 2017-02-23 13:31:14 -08:00
Harald Albers 2943d2e61d Activate bash completion for Windows executable 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-02-23 14:41:08 +01: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
Joffrey F 3621787a74 Check for divergent containers when scaling up 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-22 15:21:03 -08:00
Joffrey F d7df36d4e1 Merge pull request #4514 from jyapayne/cache_from 
Add cache_from as an available command
 2017-02-22 11:27:20 -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
Joey Payne 33fcfca040 Add test for cache_from 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Joey Payne 5b6191e653 Add cache_from to build opts 
Signed-off-by: Joey Payne <jyapayne@gmail.com>
 2017-02-21 19:01:30 -07:00
Joffrey F 89c028f3f2 Merge pull request #4524 from docker/update_build_status 
Update build status in README.md
 2017-02-21 17:06:14 -08:00
Joffrey F 9a46e62873 Merge pull request #4505 from docker/bump-1.11.2 
Bump 1.11.2
 2017-02-21 16:08:05 -08:00
Joffrey F 7b1be89ec0 Merge pull request #4518 from albers/completion-fix-global-args 
Fix treatment of global arguments in bash completion
 2017-02-21 14:58:38 -08:00
Joffrey F e4a87397af Update README.md 2017-02-21 14:56:07 -08:00
Joffrey F 64ddd09ed1 Merge pull request #4504 from shin-/docker-py-2.1.0 
Update docker SDK dependency
 2017-02-21 14:52:08 -08:00
Joffrey F dbe418924a Merge pull request #4523 from shin-/versions_py_fix 
Update versions.py script to support new engine versioning schema
 2017-02-21 14:20:54 -08:00
Joffrey F c2553ac777 Update versions.py script to support new engine versioning schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-21 14:05:47 -08:00
Harald Albers 39b2c6636e Fix treatment of global arguments in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-02-21 17:54:20 +01:00
Joffrey F dfed245b57 Bump 1.11.2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F b9e9177ba9 Fix `config` command output with service.secrets section 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Daniel Nephin 1d88989ff5 Fix secrets config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F 0d668aa446 Don't import pip inside Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F 5198a5d33e Update docker SDK dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:16:07 -08:00
Joffrey F afe22ed15d Merge remote-tracking branch 'source/release' into bump-1.11.2 2017-02-16 17:07:04 -08:00
Joffrey F e0e862c042 Update docker SDK dependency 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-16 17:05:09 -08:00
Joffrey F aa8fb8f708 Merge pull request #4499 from xulike666/function-name-modification 
function-name-modification for tests/*
 2017-02-16 11:59:36 -08:00
Joffrey F b49f42f9b7 Merge pull request #4496 from xulike666/quick-easy-typo-fix 
fix a typo in script/release/utils.sh
 2017-02-16 11:59:17 -08:00
Joffrey F afd3bcfbf4 Merge pull request #4484 from shin-/4425-sys-path-fix 
Reinitialize sys.path after it's been potentially modified by pip
 2017-02-16 11:39:54 -08: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
Aaron.L.Xu 27297fd1af fix a typo in script/release/utils.sh 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-16 11:14:49 +08:00
Joffrey F 66f4a795a2 Don't import pip inside Compose 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-15 16:31:50 -08:00
Joffrey F 40c26ca676 Merge pull request #4480 from shin-/4479-merge-secrets 
Fix `config` command output with service.secrets section
 2017-02-14 17:08:18 -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
Joffrey F bb5d7b2433 Merge pull request #4473 from Vehsamrak/patch-1 
Compose file reference link fix in README.md
 2017-02-13 13:03:39 -08:00
Petr Karmashev 252699c1d1 Compose file reference link fix in README.md 
Signed-off-by: Petr Karmashev <smonkl@bk.ru>
 2017-02-12 02:10:34 +03:00
Joffrey F ad0e6d219b Merge pull request #4469 from dnephin/fix_secrets_config 
Fixes secrets config loading
 2017-02-10 18:39:53 -08:00
Daniel Nephin dc5b3f3b3e Fix secrets config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-02-10 17:11:24 -05:00
Joffrey F 1fe2443735 Merge pull request #4438 from fate-grand-order/master 
fix typo in CHANGELOG.md
 2017-02-09 16:35:35 -08:00
Joffrey F 27e0f31275 Merge pull request #4443 from xulike666/fix-accessibility 
Referencing the right segment of code in compose/bundle.py
 2017-02-09 16:34:48 -08:00
Joffrey F 2f13201b9e Merge pull request #4453 from kevinetc123/patch-typo 
fix typo in project.py
 2017-02-09 16:33:07 -08:00
Joffrey F fa90e4e555 Merge pull request #4458 from docker/bump-1.11.1 
Bump 1.11.1
 2017-02-09 12:38:41 -08:00
Joffrey F 276db7231a Merge pull request #4455 from dnephin/fix_3.1 
Fix version 3.1
 2017-02-09 12:38:29 -08:00