Skip to content

Commit 81a4f79

Browse files
committed
ref(client): tweak client documentation
1 parent 393d3f4 commit 81a4f79

4 files changed

Lines changed: 44 additions & 44 deletions

File tree

mkdocs.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pages:
2929
- System Requirements: installing-workflow/system-requirements.md
3030
- Configuring Object Storage: installing-workflow/configuring-object-storage.md
3131
- Using Workflow:
32-
- Installing the Client: using-workflow/installing-the-client.md
32+
- Command Line Interface: using-workflow/cli.md
3333
- Registering a User: using-workflow/registering-a-user.md
3434
- Applications:
3535
- Deploying Apps: applications/deploying-apps.md
@@ -50,9 +50,6 @@ pages:
5050
- Security Considerations: managing-workflow/security-considerations.md
5151
- Platform SSL: managing-workflow/platform-ssl.md
5252
- Upgrading Workflow: managing-workflow/upgrading-workflow.md
53-
- Customizing Workflow:
54-
- CLI Plugins: customizing-workflow/cli-plugins.md
55-
- Tuning Component Settings: customizing-workflow/tuning-component-settings.md
5653
- Troubleshooting:
5754
- Troubleshooting with kubectl: troubleshooting/troubleshooting.md
5855
- Roadmap:

src/applications/deploying-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ image in development or in your CI pipeline as you are in production.
6565

6666
Learn how to deploy applications [using Docker images](../applications/using-docker-images.md).
6767

68-
[install client]: ../using-workflow/installing-the-client.md
68+
[install client]: ../using-workflow/cli.md#installation
6969
[application]: ../reference-guide/terms.md#application
7070
[controller]: ../understanding-workflow/components.md#controller
7171
[Twelve-Factor App]: http://12factor.net/

src/customizing-workflow/cli-plugins.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/using-workflow/installing-the-client.md renamed to src/using-workflow/cli.md

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# Install the Client
1+
## Deis Workflow CLI
22

3-
The Deis command-line interface (CLI), or client, allows you to interact
4-
with a Deis [Controller][]. You must install the client to use Deis.
3+
The Deis Workflow command-line interface (CLI), or client, allows you to interact
4+
with Deis Workflow.
55

6-
7-
## Install the Deis Client
6+
## Installation
87

98
Install the latest `deis` client for Linux or Mac OS X with:
109

@@ -15,8 +14,7 @@ somewhere in your $PATH:
1514

1615
$ ln -fs $PWD/deis /usr/local/bin/deis
1716

18-
19-
## Integrated Help
17+
## Getting Help
2018

2119
The Deis client comes with comprehensive documentation for every command.
2220
Use `deis help` to explore the commands available to you:
@@ -51,17 +49,23 @@ To get help on subcommands, use `deis help [subcommand]`:
5149
Use `deis help [command]` to learn more
5250

5351

54-
## Multiple Profile Support
52+
## Support for Multiple Profiles
53+
54+
The CLI reads from the default `client` profile which is located on your
55+
workstation at `$HOME/.deis/client.json`.
5556

56-
The Deis client supports running commands against multiple installations
57-
and/or accounts by setting the `$DEIS_PROFILE` environment variable
58-
before logging in and running any subsequent commands. If not set, all
59-
commands will default to the `client` profile which maps to
60-
a configuration file at `$HOME/.deis/client.json`. Here's an example
61-
of running the ps command against an app with the same name from two profiles:
57+
Easily switch between multiple Deis Workflow installations or users by setting
58+
the `$DEIS_PROFILE` environment variable.
6259

63-
$ DEIS_PROFILE=production deis ps -a helloworld
64-
$ DEIS_PROFILE=staging deis ps -a helloworld
60+
$ cat ~/.deis/production.json && echo
61+
{"username":"deis","controller":"http://deis-prod.example.com","token":"37de3...8776"}
62+
$ DEIS_PROFILE=production deis whoami
63+
You are deis at http://deis-prod.example.com
64+
65+
$ cat ~/.deis/staging.json && echo
66+
{"username":"deis","controller":"http://deis-prod.example.com","token":"67bdc...196a"}
67+
$ DEIS_PROFILE=staging deis whoami
68+
You are deis at http://deis-staging.example.com
6569

6670
## Proxy Support
6771

@@ -74,4 +78,26 @@ set the `http_proxy` or `https_proxy` environment variable to enable proxy suppo
7478
!!! note
7579
Configuring a proxy is generally not necessary for local Vagrant clusters.
7680

81+
# CLI Plugins
82+
83+
Plugins allow developers to extend the functionality of the [Deis Client][], adding new commands or features.
84+
85+
If an unknown command is specified, the client will attempt to execute the command as a dash-separated command. In this case, `deis resource:command` will execute `deis-resource` with the argument list `command`. In full form:
86+
87+
$ # these two are identical
88+
$ deis accounts:list
89+
$ deis-accounts list
90+
91+
Any flags after the command will also be sent to the plugin as an argument:
92+
93+
$ # these two are identical
94+
$ deis accounts:list --debug
95+
$ deis-accounts list --debug
96+
97+
But flags preceding the command will not:
98+
99+
$ # these two are identical
100+
$ deis --debug accounts:list
101+
$ deis-accounts list
102+
77103
[controller]: ../understanding-workflow/components.md#controller

0 commit comments

Comments
 (0)