tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,289 Commits 21 Branches 266 Tags 54 MiB
Commit Graph

72 Commits

Author SHA1 Message Date
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 284e3cfae9 Merge pull request #4289 from allandequeiroz/master 
Fixing bash path problem.
 2017-03-01 17:43:22 -08: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
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
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
Peter Urda a67500ee57
Added `top` to `docker-compose` to display running processes. 
This commit allows `docker-compose` to access `top` for containers
much like running `docker top` directly on a given container.

This commit includes:

* `docker-compose` CLI changes to expose `top`
* Completions for `bash` and `zsh`
* Required testing for the new `top` command

Signed-off-by: Peter Urda <peter.urda@gmail.com>
 2017-02-01 15:42:30 -08:00
Allan de Queiroz f01ecda83c Fixing bash path problem, avoiding 'docker-compose-completion.sh: bash: bad interpreter: No such file or directory' error 
Signed-off-by: Allan de Queiroz <allandequeiroz@gmail.com>
 2017-01-04 11:45:44 +00:00
Aanand Prasad 6633f1962c Shell completion for --push-images 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:00:53 +01:00
Harald Albers 622de27c1e bash completion for `docker-compose bundle --fetch-digests` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-29 08:45:36 -07:00
Joffrey F 93cc2675c8 Merge pull request #3625 from albers/completion-bundle 
bash completion for `docker-compose bundle`
 2016-06-28 15:52:37 -07:00
Harald Albers f49b624d95 bash completion for `docker-compose push` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-22 17:19:20 +02:00
Harald Albers e5c5dc09f8 bash completion for `docker-compose bundle` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-22 17:06:30 +02:00
Harald Albers c46737ed02 remove command completion for `docker-compose rm --a` 
As `--all|-a` is deprecated, there's no use to suggest it any
more in command completion.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-05-26 12:48:53 -07:00
Joffrey F d78b013bb0 Merge pull request #3204 from albers/completion-rm--all 
bash completion for `docker-compose rm --all`
 2016-03-24 10:44:36 -07:00
Joffrey F aabeb56527 Merge pull request #3206 from albers/completion-exec 
bash completion for `docker-compose exec`
 2016-03-24 10:44:19 -07:00
Harald Albers c9b02b7b34 bash completion for `docker-compose exec` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 18:02:12 +01:00
Joffrey F 87231a25be Merge pull request #3202 from albers/completion-logs 
bash completion for new `docker logs` options
 2016-03-24 09:56:12 -07:00
Harald Albers b030c3928a bash completion for `docker-compose rm --all` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 17:29:04 +01:00
Harald Albers 5416e4c99b bash completion for `docker-compose up --build` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 17:21:56 +01:00
Harald Albers d8fb9d8831 bash completion for new `docker logs` options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 17:11:10 +01:00
Harald Albers 5b2c2e332f bash completion for TLS options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 12:06:10 +01:00
Harald Albers 9094c4d97d prepare bash completion for new TLS options 
Up to now there were two special top-level options that required special
treatment: --project-name and --file (and their short forms).
For 1.7.0, several TLS related options were added that have to be passed
to secondary docker-compose invocations as well.
This commit introduces a scalable treatment of those options.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 12:05:59 +01:00
Harald Albers e3c1b5886a bash completion for `docker-compose run --workdir` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-18 10:47:17 +01:00
Joffrey F 20c29f7e47 Add flag to up/down to remove orphaned containers 
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-15 16:11:49 -07:00
Harald Albers 0049743615 add support for multiple compose files to bash completion 
Since 1.6.0, Compose supports multiple compose files specified with `-f`.
These need to be passed to the docker invocations done by the
completion.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-02 21:18:33 +01:00
Aanand Prasad 1816147d57 Merge pull request #2740 from albers/completion-create 
bash completion for `docker-compose create`
 2016-02-01 15:44:07 +00:00
Harald Albers 73a0d83075 Fix computation of service list in bash completion 
The previous approach assumed that the service list could be extracted
from a single file. It did not follow extends and overrides.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-25 15:51:58 +01:00
Harald Albers 7f3a319ecc bash completion for `docker-compose create` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-25 10:15:14 +01:00
Joffrey F 842dc14417 Merge pull request #2660 from albers/completion-down 
bash completion for `docker-compose down`
 2016-01-14 15:17:45 -08:00
Harald Albers fca3e47a75 bash completion for `docker-compose up --abort-on-container-exit` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 10:43:53 -08:00
Harald Albers a7be0afa5b bash completion for `docker-compose down` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 10:32:06 -08:00
Aanand Prasad 9f34354c19 Merge pull request #2638 from albers/completion-events 
Add bash completion for `docker-compose events`
 2016-01-13 21:10:09 +00:00
Aanand Prasad a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00:00
Harald Albers 6c205a8e01 Add bash completion for `docker-compose events` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-12 10:51:04 -08:00
Daniel Nephin 2acc29cf1c Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-04 15:37:21 -05:00
Harald Albers a5b48a3dc2 Add bash completion for config subcommand 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-12-08 10:23:55 -08:00
Daniel Nephin a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00
Daniel Nephin 338bbb5063 Re-order flags in bash completion 
and remove unnecessary variables from build command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-10 13:11:59 -05:00
Adrian Budau c5c36d8b00 Added --force-rm to compose build. 
It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.

Signed-off-by: Adrian Budau <budau.adi@gmail.com>
 2015-11-10 13:05:04 -05:00
mnowster bca018c50a Merge pull request #2211 from albers/completion-networking 
bash completion for networking options
 2015-10-19 11:23:03 +01:00
Harald Albers fa44a5fac2 fix problem with bash completion in old bash 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-17 09:51:37 -07:00
Harald Albers 43a89e1702 bash completion for networking options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-17 09:30:53 -07:00
mnowster b9252aa48e Merge pull request #2032 from villlem/master 
Flag to skip all pull errors when pulling images
 2015-09-21 13:41:08 +01:00
Aanand Prasad 6817f76fd5 Merge pull request #2070 from albers/completion-run-name 
Add bash completion for `docker-compose run --name`
 2015-09-21 12:36:23 +02:00
Vojta Orgon c9083e21c8 Flag to skip all pull errors when pulling images. 
Signed-off-by: Vojta Orgon <villlem@gmail.com>
 2015-09-21 11:59:23 +02:00
Harald Albers 006146b2cd Add bash completion for `docker-compose run --name` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 18:18:06 +02:00
Harald Albers af7b98ff56 Add bash completion for `docker-compose build --pull` 
Also adds a fix for an error message on some completions when no
compose file is present:

    docker-compose build awk: cannot open docker-compose.yml (No such file or directory)

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-09-18 18:12:30 +02:00
Harald Albers 2cfda01ff4 Use consistent argument order in bash completion 
In most of this file and in Dockers's bash completion the sort order of
options is to sort alphabetically by long option name.
The short options are put right behind their long couterpart.

This commit improves consistency.

Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-26 18:31:36 +02:00
Harald Albers b03a2f7910 Add completion for `scale --timeout` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-08-26 18:31:36 +02:00