tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,405 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

3405 Commits

Author SHA1 Message Date
Joffrey F bf7c2bc0f8 Use create_host_file in run -v tests to ensure file availability 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 18:13:16 -08:00
Joffrey F b454268f93 Merge pull request #4565 from shin-/onorua-pids-limit 
Add pids_limit to service config
 2017-03-06 18:09:53 -08:00
Joffrey F 2d56eb0c96 Merge pull request #4572 from shin-/Knetic-dnsopts 
Implement dns_opt support in v2
 2017-03-06 18:07:14 -08:00
Joffrey F 02a7b6bacc Merge pull request #4571 from shin-/marcosnils-master 
Improve Dockerfile.run
 2017-03-06 15:57:59 -08:00
Joffrey F 8f8678987b Improve readability of code and output for the images command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 15:56:41 -08:00
Joffrey F 83728d2bcc Do not add mode in volume representation if it's not a host binding 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 14:43:29 -08:00
Joffrey F b6fb3f2634 pids_limit not yet supported for swarm services - removing from v3 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 14:32:04 -08:00
Joffrey F 7512dccaa8 Add dns_opt to 2.1 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-06 13:28:52 -08:00
George Lester c7b8278e78 Implemented dns_opt 
Signed-off-by: George Lester <glester491@gmail.com>
 2017-03-03 15:37:21 -08:00
Marcos Lilljedahl 44653f2812 Improve Dockerfile.run 
This dockerfile generates a more lightweight image that works with the
current official dynamically generated binaries

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>

Change image script to use new Dockerfile.run image without building
compose

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>

Apply suggested fixes

Signed-off-by: Marcos Lilljedahl <marcosnils@gmail.com>
 2017-03-03 15:17:10 -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
Yaroslav Molochko 6a151aac04 introducing pids_limit, fix for #4178 
Signed-off-by: Yaroslav Molochko <y.molochko@anchorfree.com>
 2017-03-02 16:44:26 -08:00
stefan 11329e779b added failing test that ensures that named volume will not be printed with a mode suffix 
Signed-off-by: stefan <think@hotmail.de>
 2017-03-02 15:26:40 -08:00
Joffrey F 815a3af6d2 Fix docstring for images command 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-02 15:00:55 -08:00
Jesus Tinoco 90beeaf21c 3501 - Remove a test and fix other 
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
 2017-03-02 15:00:55 -08:00
Jesus Tinoco 33f510b340 3501 - Add a new command option (images) 
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
 2017-03-02 15:00:55 -08:00
Joffrey F 31b2d9176b Merge branch 'TheClimateCorporation-forward-exit' 2017-03-01 18:23:52 -08:00
Joffrey F 6986a994a8 Merge branch 'forward-exit' of https://github.com/TheClimateCorporation/compose into TheClimateCorporation-forward-exit 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-01 18:04:48 -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 284e3cfae9 Merge pull request #4289 from allandequeiroz/master 
Fixing bash path problem.
 2017-03-01 17:43:22 -08:00
Joffrey F 003319da86 Merge pull request #4214 from bheesham/completion-fish 
Add fish completion to contrib.
 2017-03-01 17:38:34 -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
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