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

4090 Commits

Author SHA1 Message Date
Joffrey F b4dfa9c155 Merge pull request #3867 from ncopa/use-posix-shell-for-run 
Use posix shell instead of bash for run.sh
 2017-03-01 17:19:28 -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 1a77a7fd44 Merge pull request #3756 from nkovacs/2419-run-rm-volumes 
Remove anonymous volumes when using run --rm.
 2017-03-01 16:38:46 -08:00
Joffrey F eca3146c9c Merge pull request #3617 from dguo/help-nonexistent-command 
Handle giving help a nonexistent command
 2017-03-01 16:31:37 -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 77e7989eaa Merge pull request #3529 from melkor217/patch-2 
Add issue link for zero-downtime deploys
 2017-03-01 16:23:28 -08:00
Joffrey F 9efb00457d Merge pull request #3423 from cmihai/fix-1876 
Ignore error output of `stty size` when standard input is not a termi…
 2017-03-01 15:50:33 -08:00
Joffrey F 9e90b6e645 Merge pull request #4553 from edsrzf/config-volumes 
Add --volumes flag to config command
 2017-03-01 14:54:46 -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 ac99bc5bbf Merge pull request #4444 from jcberthon/compose-master-armv7 
Provide support for ARM 32bit
 2017-03-01 14:31:05 -08:00
Joffrey F f989ae8da6 Merge pull request #4537 from edsrzf/color-parallel 
Colorize statuses in parallel_execute output
 2017-03-01 14:29:45 -08:00
Evan Shaw d67261f26e Add --volumes flag to config command 
Closes #3609

Signed-off-by: Evan Shaw <evan@vendhq.com>
 2017-03-02 10:03:31 +13: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
David McKay 1f9fb27456 Allowing running containers to be rm'd by stop flag 
Signed-off-by: David McKay <david@rawkode.com>
 2017-03-01 10:33:23 +00:00
Nathan J. Mehl cffb76d4d9 Address comments 
- set flag name to `--exit-code-from` (and rename some variable,
  function and test names to match)
- force cascade_stop to true when exit-code-from flag is set
- use lambda in filter statement
- check that selected container name is in the project before running
- remove fancy parsing of service name to container mappings: if there
  are multiple containers in a service, return the first nonzero exit
  value if any
- flake8 changes

Signed-off-by: Nathan J. Mehl <n@climate.com>
 2017-02-27 09:51:03 -08:00
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