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

79 Commits

Author SHA1 Message Date
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 85ba08bb13 Merge pull request #2932 from AvdN/patch-1 
reset colors after warning
 2016-02-18 09:25:02 -08:00
Anthon van der Neut 1512793b30 for 1.6.0 the version value needs to be a string 
After conversion a file would immediately not load in docker-compose 1.6.0 with the message:

  ERROR: Version in "./converted.yml" is invalid - it should be a string.

Signed-off-by: Anthon van der Neut anthon@mnt.org
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-02-17 10:01:16 +01:00
Anthon van der Neut 69d0154718 reset colors after warning 
If a warning is shown, and you happen to have no color setting in your (bash) prompt, the \033[37m setting, stays active. With the message hardly readable (light grey on my default light yellow background), that means the prompt is barely visible and you need to do `tput reset`.
Would probably be better if the background color was set as well in case you have dark on light theme by default in your terminal.

Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-02-16 15:42:43 +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
Aanand Prasad c1cb75cc4f Merge pull request #2741 from sdurrheimer/zsh-completion-create-command 
Add zsh completion for 'docker-compose create'
 2016-02-01 15:43:47 +00:00
Daniel Nephin 40d69675f3 Merge pull request #2745 from albers/completion-services 
Fix computation of service lists in bash completion
 2016-01-28 16:08:46 -05:00
Aanand Prasad 7d403d09cf Extract helper methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 16:08:34 +00:00
Aanand Prasad aa4d43af0b Create declarations for named volumes 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 16:07:26 +00:00
Aanand Prasad f86fe11825 Make sure version line is at the top of the file 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 15:54:18 +00:00
Aanand Prasad 47b22e90f9 Make warnings a bit more readable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 15:53:25 +00:00
Aanand Prasad 4736b4409a Update for links, external_links, network_mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 15:53:02 +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
Steve Durrheimer 381d58bc66 Add zsh completion for 'docker-compose create' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-25 10:27:21 +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
Daniel Nephin 85619842be Add migration script. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-19 14:50:41 -05:00
Aanand Prasad 413cdbcb81 Merge pull request #2675 from sdurrheimer/zsh-completion-up-abort-on-container-exit 
Add zsh completion for 'docker-compose up --abort-on-container-exit'
 2016-01-19 10:41:08 +00:00
Aanand Prasad 683c8b0067 Merge pull request #2676 from sdurrheimer/zsh-completion-down-command 
Add zsh completion for 'docker-compose down'
 2016-01-19 10:40:29 +00:00
Steve Durrheimer d54190167a Fix zsh completion to ensure we have enough commands to store in the cache 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-16 13:53:16 +01:00
Steve Durrheimer f6561f1290 Add zsh completion for 'docker-compose down' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-16 13:47:48 +01:00
Steve Durrheimer e7180982aa Add zsh completion for 'docker-compose up --abort-on-container-exit' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-16 13:22:02 +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 a08e02f3bd Merge pull request #2643 from sdurrheimer/zsh-completion-events 
Add zsh completion for 'docker-compose events'
 2016-01-13 21:10:36 +00: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
Steve Durrheimer b59387401c Add zsh completion for 'docker-compose events' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-12 22:04:05 +01: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
Daniel Nephin 6fe747e0ee Merge pull request #2522 from sdurrheimer/zsh-completion-config-cmd 
Add zsh completion for config subcommand
 2015-12-09 10:40:44 -08:00
Steve Durrheimer 01bba5ea23 Add zsh completion for config subcommand 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-12-09 08:57:14 +01: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
Steve Durrheimer ac06366ef9 Add zsh completion for 'docker-compose --x-networking --x-network-driver' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-19 12:31:17 +02: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
Aanand Prasad 36d886b8b0 Merge pull request #2073 from sdurrheimer/zsh-completion-run-name 
Add zsh completion for 'docker-compose run --name'
 2015-09-21 12:35:29 +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
Steve Durrheimer 51ce16cf18 Add zsh completion for 'docker-compose build --build' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-09-18 22:46:08 +02:00
Steve Durrheimer 12b38adfac Add zsh completion for 'docker-compose run --name' 
Signed-off-by: Steve Durrheimer <steve.durrheimer@netapsys.fr>
 2015-09-18 22:42:19 +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
Daniel Nephin 21c16a787a Merge pull request #1928 from albers/completion-timeout 
Bash completion for `docker-compose scale --timeout`
 2015-08-27 12:37:55 -04: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