Skip to content

Commit 393d3f4

Browse files
slackslack
committed
chore(lifecycle,configuration): reorganize content into new categories
1 parent 89de88f commit 393d3f4

3 files changed

Lines changed: 57 additions & 66 deletions

File tree

‎src/applications/managing-app-configuration.md‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -149,38 +149,6 @@ Configured health checks also modify the default application deploy behavior.
149149
When starting a new pod, Workflow will wait for the health check to pass before
150150
moving onto the next pod.
151151

152-
## Track Changes
153-
154-
Each time a build or config change is made to your application, a new [release][] is created.
155-
Track changes to your application using `deis releases`.
156-
157-
$ deis releases
158-
=== peachy-waxworks Releases
159-
v4 3 minutes ago gabrtv deployed d3ccc05
160-
v3 1 hour 17 minutes ago gabrtv added DATABASE_URL
161-
v2 6 hours 2 minutes ago gabrtv deployed 7cb3321
162-
v1 6 hours 2 minutes ago gabrtv deployed deis/helloworld
163-
164-
165-
## Rollback the Application
166-
167-
Use `deis rollback` to revert to a previous release.
168-
169-
$ deis rollback v2
170-
Rolled back to v2
171-
172-
$ deis releases
173-
=== folksy-offshoot Releases
174-
v5 Just now gabrtv rolled back to v2
175-
v4 4 minutes ago gabrtv deployed d3ccc05
176-
v3 1 hour 18 minutes ago gabrtv added DATABASE_URL
177-
v2 6 hours 2 minutes ago gabrtv deployed 7cb3321
178-
v1 6 hours 3 minutes ago gabrtv deployed deis/helloworld
179-
180-
!!! note
181-
All releases (including rollbacks) append to the release ledger.
182-
183-
184152
[attached resources]: http://12factor.net/backing-services
185153
[stores config in environment variables]: http://12factor.net/config
186154
[release]: ../reference-guide/terms.md#release

‎src/applications/managing-app-lifecycle.md‎

Lines changed: 57 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Managing an Application
22

3-
Deis includes many tools for managing deployed [Applications][application].
4-
5-
63
## Scale the Application
74

85
Applications deployed on Deis [scale out via the process model][].
@@ -30,8 +27,37 @@ Scaling is managed by process types like `web` or `worker` defined in a
3027
!!! note
3128
Docker applications can use the `cmd` process type to scale the default container command.
3229

30+
## Rollback a Release
31+
32+
Use `deis rollback` to revert to a previous release.
33+
34+
$ deis rollback v2
35+
Rolled back to v2
36+
37+
$ deis releases
38+
=== folksy-offshoot Releases
39+
v5 Just now gabrtv rolled back to v2
40+
v4 4 minutes ago gabrtv deployed d3ccc05
41+
v3 1 hour 18 minutes ago gabrtv added DATABASE_URL
42+
v2 6 hours 2 minutes ago gabrtv deployed 7cb3321
43+
v1 6 hours 3 minutes ago gabrtv deployed deis/helloworld
44+
45+
!!! note
46+
All releases (including rollbacks) append to the release ledger.
47+
48+
## Track Application Changes
3349

34-
## Administer the Application
50+
Each time a build or config change is made to your application, a new [release][] is created.
51+
Track changes to your application using `deis releases`.
52+
53+
$ deis releases
54+
=== peachy-waxworks Releases
55+
v4 3 minutes ago gabrtv deployed d3ccc05
56+
v3 1 hour 17 minutes ago gabrtv added DATABASE_URL
57+
v2 6 hours 2 minutes ago gabrtv deployed 7cb3321
58+
v1 6 hours 2 minutes ago gabrtv deployed deis/helloworld
59+
60+
## Run One-off Administration Tasks
3561

3662
Deis applications [use one-off processes for admin tasks][] like database migrations and other commands that must run against the live application.
3763

@@ -50,7 +76,32 @@ Use `deis run` to execute commands on the deployed application.
5076
drwxr-xr-x 6 root root 4096 Dec 3 00:00 target
5177

5278

53-
## Share the Application
79+
## Limit Resource Usage
80+
81+
Deis supports restricting memory and CPU shares of each [Container][].
82+
83+
Use `deis limits:set` to restrict memory by process type:
84+
85+
$ deis limits:set web=512M
86+
Applying limits... done, v3
87+
88+
=== peachy-waxworks Limits
89+
90+
--- Memory
91+
web 512M
92+
93+
--- CPU
94+
Unlimited
95+
96+
You can also use `deis limits:set -c` to restrict CPU shares.
97+
CPU shares are on a scale of 0 to 1024, with 1024 being all CPU resources on the host.
98+
99+
!!! important
100+
If you restrict resources to the point where containers do not start,
101+
the `limits:set` command will hang. If this happens, use CTRL-C
102+
to break out of `limits:set` and use `limits:unset` to revert.
103+
104+
## Share an Application
54105

55106
Use `deis perms:create` to allow another Deis user to collaborate on your application.
56107

@@ -75,7 +126,7 @@ When working with an application that has been shared with you, clone the origin
75126
* [new branch] master -> deis/master
76127

77128

78-
## Troubleshoot the Application
129+
## Application Troubleshooting
79130

80131
Applications deployed on Deis [treat logs as event streams][]. Deis aggregates `stdout` and `stderr` from every [Container][] making it easy to troubleshoot problems with your application.
81132

@@ -92,32 +143,6 @@ Use `deis logs` to view the log output from your deployed application.
92143
Dec 3 00:30:31 ip-10-250-15-201 peachy-waxworks[web.7]: INFO:oejs.AbstractConnector:Started SelectChannelConnector@0.0.0.0:10007
93144
Dec 3 00:30:31 ip-10-250-15-201 peachy-waxworks[web.8]: INFO:oejs.AbstractConnector:Started SelectChannelConnector@0.0.0.0:10008
94145

95-
96-
## Limit the Application
97-
98-
Deis supports restricting memory and CPU shares of each [Container][].
99-
100-
Use `deis limits:set` to restrict memory by process type:
101-
102-
$ deis limits:set web=512M
103-
Applying limits... done, v3
104-
105-
=== peachy-waxworks Limits
106-
107-
--- Memory
108-
web 512M
109-
110-
--- CPU
111-
Unlimited
112-
113-
You can also use `deis limits:set -c` to restrict CPU shares.
114-
CPU shares are on a scale of 0 to 1024, with 1024 being all CPU resources on the host.
115-
116-
!!! important
117-
If you restrict resources to the point where containers do not start,
118-
the `limits:set` command will hang. If this happens, use CTRL-C
119-
to break out of `limits:set` and use `limits:unset` to revert.
120-
121146
[application]: ../reference-guide/terms.md#application
122147
[container]: ../reference-guide/terms.md#container
123148
[store config in environment variables]: http://12factor.net/config

‎src/applications/using-buildpacks.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
Deis supports deploying applications via [Heroku Buildpacks][]. Buildpacks are useful if you're interested in following Heroku's best practices for building applications or if you are deploying an application that already runs on Heroku.
44

5-
65
## Prepare an Application
76

87
If you do not have an existing application, you can clone an example application that demonstrates the Heroku Buildpack workflow.
@@ -100,7 +99,6 @@ To use a custom buildpack, set the `BUILDPACK_URL` environment variable.
10099

101100
On your next `git push`, the custom buildpack will be used.
102101

103-
104102
## Using Private Repositories
105103

106104
To pull code from private repositories, set the `SSH_KEY` environment variable to a private key

0 commit comments

Comments
 (0)