Skip to content

Commit 9529fa0

Browse files
committed
Added basic documentation for deis sharing commands.
1 parent c4acac4 commit 9529fa0

3 files changed

Lines changed: 46 additions & 7 deletions

File tree

client/deis.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,6 +1671,9 @@ def perms(self, args):
16711671

16721672
def perms_list(self, args):
16731673
"""
1674+
List all users with permission to use an app, or list all users
1675+
with system administrator privileges.
1676+
16741677
Usage: deis perms:list [--app=<app>|--admin]
16751678
"""
16761679
app, url = self._parse_perms_args(args)
@@ -1682,6 +1685,9 @@ def perms_list(self, args):
16821685

16831686
def perms_create(self, args):
16841687
"""
1688+
Give another user permission to use an app, or give another user
1689+
system administrator privileges.
1690+
16851691
Usage: deis perms:create <username> [--app=<app>|--admin]
16861692
"""
16871693
app, url = self._parse_perms_args(args)
@@ -1701,6 +1707,9 @@ def perms_create(self, args):
17011707

17021708
def perms_delete(self, args):
17031709
"""
1710+
Revoke another user's permission to use an app, or revoke another
1711+
user's system administrator privileges.
1712+
17041713
Usage: deis perms:delete <username> [--app=<app>|--admin]
17051714
"""
17061715
app, url = self._parse_perms_args(args)

docs/developer/index.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ Developer Guide
1212

1313
.. toctree::
1414
:maxdepth: 1
15-
15+
1616
install-client
1717
register-user
1818
deploy-application
1919
manage-application
20-

docs/developer/manage-application.rst

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ and troubleshoot your deployed :ref:`Application`.
99

1010
Configure the Application
1111
-------------------------
12-
Use ``deis config`` to set a `DATABASE_URL` that attaches
12+
Use ``deis config`` to set a `DATABASE_URL` that attaches
1313
the application to an external PostgreSQL database.
1414

1515
.. code-block:: console
@@ -35,9 +35,9 @@ that power your app.
3535
$ deis scale web=8
3636
Scaling containers... but first, coffee!
3737
done in 20s
38-
38+
3939
=== peachy-waxworks Containers
40-
40+
4141
--- web: `java -cp target/classes:target/dependency/* HelloWorld`
4242
web.1 up 2013-12-03T00:00:25.836Z (dev-runtime-1)
4343
web.2 up 2013-12-03T00:30:10.934Z (dev-runtime-1)
@@ -52,7 +52,7 @@ Applications deployed on Deis `scale out via the process model`_.
5252
Web requests are automatically routed to the ``web`` processes
5353
defined by your application.
5454

55-
You must define process types like ``web`` or ``worker`` in a
55+
You must define process types like ``web`` or ``worker`` in a
5656
`Procfile`_ in the root of your application repository.
5757

5858
Administer the Application
@@ -74,6 +74,37 @@ Use ``deis run`` to execute commands against the deployed version of your applic
7474
Applications deployed on Deis `use one-off processes for admin tasks`_ like
7575
database migrations and other tasks that must run against the live application.
7676

77+
Share the Application
78+
---------------------
79+
Use ``deis sharing:add`` to allow another Deis user to collaborate on your
80+
application.
81+
82+
.. code-block:: console
83+
84+
$ deis sharing:add otheruser
85+
Adding otheruser to peachy-waxworks collaborators... done
86+
87+
Use ``deis sharing`` to see who an application is currently shared with, and
88+
``deis sharing:remove`` to remove a collaborator.
89+
90+
.. important:: Collaborator Privileges
91+
Collaborators can do anything with an application that its owner can do,
92+
except delete the application itself.
93+
94+
When working with an application that has been shared with you, clone
95+
the original repository and add Deis' git remote entry before attempting to
96+
``git push`` any changes to Deis.
97+
98+
.. code-block:: console
99+
100+
$ git clone https://github.com/opdemand/example-java-jetty.git
101+
Cloning into 'example-java-jetty'... done
102+
$ cd example-java-jetty
103+
$ git remote add -f deis git@deis-controller.local:peachy-waxworks.git
104+
Updating deis
105+
From deis-controller.local:peachy-waxworks
106+
* [new branch] master -> deis/master
107+
77108
Troubleshoot the Application
78109
----------------------------
79110
Use ``deis logs`` to view the log output from your deployed application.
@@ -100,4 +131,4 @@ making it easy to troubleshoot problems with your application.
100131
.. _`scale out via the process model`: http://12factor.net/concurrency
101132
.. _`treat logs as event streams`: http://12factor.net/logs
102133
.. _`use one-off processes for admin tasks`: http://12factor.net/admin-processes
103-
.. _`Procfile`: http://ddollar.github.io/foreman/#PROCFILE
134+
.. _`Procfile`: http://ddollar.github.io/foreman/#PROCFILE

0 commit comments

Comments
 (0)