Commit Graph

149 Commits

Author SHA1 Message Date
Harald Albers 0dc25f1cdf Add bash completion for `docker-compose up --scale`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-04-25 13:19:22 +02:00
Joffrey F 8f08f57cb7 Merge pull request #4683 from sdurrheimer/zsh-completion-run-volume
Add zsh completion for 'docker-compose run -v --volume'
2017-03-31 12:22:28 -07:00
Joffrey F 9069ae78f7 Merge pull request #4685 from sdurrheimer/zsh-completion-config
Add zsh completion for 'docker-compose config --resolve-image-digests --volumes'
2017-03-30 13:46:05 -07:00
Joffrey F 5230396543 Merge pull request #4684 from sdurrheimer/zsh-completion-build-build-arg
Add zsh completion for 'docker-compose build --build-arg'
2017-03-30 13:45:08 -07:00
Steve Durrheimer be8fd5810e
Add zsh completion for 'docker-compose config --resolve-image-digests --volumes'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 22:10:20 +02:00
Steve Durrheimer 29d23c2793
Add zsh completion for 'docker-compose build --build-arg'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 22:05:36 +02:00
Steve Durrheimer 9fc3cc9c3c
Add zsh completion for 'docker-compose run -v --volume'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 22:01:00 +02:00
Steve Durrheimer f6fc8b5822
Add zsh completion for 'docker-compose images'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 21:32:33 +02:00
Joffrey F d1a23cee85 Merge pull request #4641 from albers/completion-pull--parallel
Add bash completion for `pull --parallel`
2017-03-20 11:36:29 -07:00
Joffrey F 566cd1b1e4 Merge pull request #4640 from albers/completion-up--exit-code-from
Fix bash completion for `up --exit-code-from`
2017-03-20 11:36:07 -07:00
Harald Albers 0cf5f28f17 Add bash completion for `pull --parallel`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-20 16:37:41 +01:00
Harald Albers 02c294ee28 Fix bash completion for `up --exit-code-from`
`--exit-code-from` requires an argument.
Also corrected sort order.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-20 16:28:02 +01:00
Harald Albers 5fdbd5026a Add bash completion for `config --resolve-image-digests|--volumes"`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-19 08:00:35 -07:00
Joffrey F 61b4d9d001 Merge pull request #4626 from albers/completion--project-directory
Add bash completion for `--project-directory`
2017-03-16 14:58:52 -07:00
Harald Albers 6a773a018e Rename variables in bash completion
The old names were supposed to designate variables that get propagated
to the Docker daemon. This is not true for all contained options and
therefore confused me.
The new names focus on the placement after the top level command.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 16:05:19 +01:00
Harald Albers de2dd5b3d3 Add bash completion for `--project-directory`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 15:47:01 +01:00
Harald Albers 583c673c8a Add bash completion for `build --build-arg`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-16 11:37:06 +01:00
Harald Albers ba0468395b Add bash completion for `docker-compose rm --stop`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-09 10:31:29 +01:00
Joffrey F 682b5b7480 Merge pull request #4586 from albers/completion-run--volume
Add bash completion for `run --volume`
2017-03-08 14:35:20 -08:00
Harald Albers 38087a2888 Fix bash completion for `docker-compose images`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-08 13:07:25 -08:00
Harald Albers 0652530ee9 Add bash completion for `run --volume`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-08 12:49:31 -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 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
Joffrey F 003319da86 Merge pull request #4214 from bheesham/completion-fish
Add fish completion to contrib.
2017-03-01 17:38:34 -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
Bheesham Persaud b0b9a3703d Add fish completion to contrib.
Signed-off-by: Bheesham Persaud <me@bheesham.com>
2016-12-03 11:19:28 -05:00
Matt Bray a37d99f201 Zsh completion: change --file description text
Signed-off-by: Matt Bray <mattjbray@gmail.com>
2016-09-30 00:45:46 +01:00
Matthew Bray 90356b7040 Zsh completion: permit multiple --file arguments
Before this change:

```
$ docker-compose --file docker-compose.yml -<TAB>
 -- option --
--help                 -h  -- Get help
--host                 -H  -- Daemon socket to connect to
--project-name         -p  -- Specify an alternate project name (default: directory name)
--skip-hostname-check      -- Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)
--tls                      -- Use TLS; implied by --tlsverify
--tlscacert                -- Trust certs signed only by this CA
--tlscert                  -- Path to TLS certificate file
--tlskey                   -- Path to TLS key file
--tlsverify                -- Use TLS and verify the remote
--verbose                  -- Show more output
--version              -v  -- Print version and exit
```

(Note the `--file` argument is no longer available to complete.)

After this change:

```
docker-compose --file docker-compose.yml -<TAB>
 -- option --
--file                 -f  -- Specify an alternate docker-compose file (default: docker-compose.yml)
--help                 -h  -- Get help
--host                 -H  -- Daemon socket to connect to
--project-name         -p  -- Specify an alternate project name (default: directory name)
--skip-hostname-check      -- Don't check the daemon's hostname against the name specified in the client certificate (for example if your docker host is an IP address)
--tls                      -- Use TLS; implied by --tlsverify
--tlscacert                -- Trust certs signed only by this CA
--tlscert                  -- Path to TLS certificate file
--tlskey                   -- Path to TLS key file
--tlsverify                -- Use TLS and verify the remote
--verbose                  -- Show more output
--version              -v  -- Print version and exit
```

Signed-off-by: Matt Bray <mattjbray@gmail.com>
2016-09-28 12:04:13 +01: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
Joffrey F 79ddf06267 Merge pull request #3662 from albers/completion-bundle--fetch-digests
bash completion for `docker-compose bundle --fetch-digests`
2016-07-07 10:39:18 -07:00
Aanand Prasad bc0939dcf0 Merge pull request #3645 from leonhartX/zsh-completion-bundle
add zsh completion support for bundle
2016-06-30 10:32:44 -07:00
Aanand Prasad c0237a487b Merge pull request #3221 from aeriksson/fix-zsh-autocomplete
Fix zsh autocomplete
2016-06-29 11:08:08 -07: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
Ke Xu edd28f09d1 change dsb to dab
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2016-06-29 11:01:50 +09: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
Joffrey F 3649df83ab Merge pull request #3626 from albers/completion-push
bash completion for `docker-compose push`
2016-06-28 15:52:14 -07:00
Andre Eriksson c3247e7af8 zsh autocomplete: update misleading comment
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:07:59 -07:00
Andre Eriksson b3d4e9c9d7 zsh autocomplete: break out duplicated flag messages into variables
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:00:17 -07:00
Andre Eriksson 0058b4ba0c zsh autocomplete: replace use of sed with cut
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:00:17 -07:00
Andre Eriksson 612d263d74 zsh autocomplete: fix issue when filtering on already selected services
Previously, the filtering on already selected services would break when
one service was a substring of another.

This commit fixes that.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:00:17 -07:00
Andre Eriksson 048408af48 zsh autocomplete: fix missing services issue for build/pull commands
Previously, the autocomplete for the build/pull commands would only add
services for which build/image were the _first_ keys, respectively, in
the docker-compose file.

This commit fixes this, so the appropriate services are listed
regardless of the order in which they appear

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:00:17 -07:00
Andre Eriksson d990f7899c zsh autocomplete: pass all relevant flags to docker-compose/docker
For autocomplete to work properly, we need to pass along some flags when
calling docker (--host, --tls, …) and docker-compose (--file, --tls, …).

Previously flags would only be passed to docker-compose, and the only
flags passed were --file and --project-name.

This commit makes sure that all relevant flags are passed to both
docker-compose and docker.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:00:17 -07:00
Andre Eriksson 97ba14c82a zsh autocomplete: use two underscores for all function names
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:00:17 -07:00
Andre Eriksson 1b5a94f4e4 zsh autocomplete: bring flag help texts up to date
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
2016-06-27 11:00:17 -07:00