Skip to content

Commit 4d46a56

Browse files
committed
Merge pull request #54 from slack/structure
Tweak structure to accommodate reader flow
2 parents b588883 + d166aaf commit 4d46a56

6 files changed

Lines changed: 33 additions & 27 deletions

File tree

mkdocs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
site_name: Deis Documentation
66
pages:
77
- Welcome: index.md
8+
- Quick Start: installing-deis/quickstart.md
89
- Understanding Deis:
9-
- Architecture: understanding-deis/architecture.md
1010
- Concepts: understanding-deis/concepts.md
11+
- Architecture: understanding-deis/architecture.md
1112
- Components: understanding-deis/components.md
1213
- Installing Deis:
1314
- Quick Start: installing-deis/quickstart.md

src/index.md

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

33
Deis (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any Kubernetes cluster, making it easy to deploy and manage applications on your own servers. It includes capabilities for building and deploying from source via git push, configuring your applications, managing and rolling back releases, managing application domain names and SSL certificates, edge routing, application log aggregation, and managing access to application resources. All of this is exposed through a simple REST API and command line interface.
44

5-
To get started with Workflow, follow our [Quick Start][quickstart] guide.
5+
For more detailed information about Workflow view the [Concepts][concepts] and [Architecture][arch] sections.
66

7-
For more detailed information about Workflow view the [Architecture][arch] and [Concepts][concepts] sections.
7+
To get started with Workflow, follow our [Quick Start][quickstart] guide.
88

99
[arch]: understanding-deis/architecture.md
1010
[concepts]: understanding-deis/concepts.md

src/installing-deis/quickstart.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,14 @@ See [Configuring DNS][] for more information on properly setting up your DNS rec
2929
Once your cluster has been provisioned and Deis Workflow has been installed, you can
3030
[install the client][client] and [register your first user][register]!
3131

32+
## Deploy your first Application
33+
34+
Last but not least, select your build process and [deploy your first application][deploy].
3235

3336
[client]: ../using-deis/installing-the-client.md
3437
[configuring object storage]: configuring-object-storage.md
3538
[configuring dns]: ../managing-deis/configuring-dns.md
39+
[deploy]: ../using-deis/deploying-an-application.md
3640
[install deis]: installing-deis-workflow.md
3741
[register]: ../using-deis/registering-a-user.md
3842
[system requirements]: system-requirements.md

src/understanding-deis/components.md

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ the functionality in your own project we invite you to give it a shot!
1212

1313
## Controller
1414

15-
Project Location: [deis/workflow](https://github.com/deis/workflow)
15+
**Project Location:** [deis/workflow](https://github.com/deis/workflow)
1616

1717
The controller component is an HTTP API server which serves as the endpoint for
1818
the `deis` CLI. The controller provides all of the platform functionality as
@@ -21,7 +21,7 @@ of its data to the database component.
2121

2222
## Database
2323

24-
Project Location: [deis/postgres](https://github.com/deis/postgres)
24+
**Project Location:** [deis/postgres](https://github.com/deis/postgres)
2525

2626
The database component is a managed instance of [PostgreSQL][] which holds a
2727
majority of the platforms state. Backups and WAL files are pushed to the object
@@ -32,7 +32,7 @@ and restore read the documentation for
3232

3333
## <a name="builder"></a>Builder: builder, slugbuilder, and dockerbuilder
3434

35-
Project Location: [deis/builder](https://github.com/deis/builder)
35+
**Project Location:** [deis/builder](https://github.com/deis/builder)
3636

3737

3838
The builder component is responsible for accepting code pushes via [Git][] and
@@ -46,7 +46,7 @@ managing the build process of your [Application][]. The builder process is:
4646

4747
Builder currently supports both buildpack and Dockerfile based builds.
4848

49-
Project Location: [deis/slugbuilder](https://github.com/deis/slugbuilder)
49+
**Project Location:** [deis/slugbuilder](https://github.com/deis/slugbuilder)
5050

5151
For Buildpack-based deploys, the builder component will launch a one-shot Pod
5252
in the `deis` namespace. This pod runs `slugbuilder` component which handles
@@ -56,7 +56,7 @@ its depdencies as determined by the buildpack. The slug is pushed to the
5656
cluster-configured object storage for later execution. For more information
5757
about buildpacks see [using buildpacks][using-buildpacks].
5858

59-
Project Location: [deis/dockerbuilder](https://github.com/deis/dockerbuilder)
59+
**Project Location:** [deis/dockerbuilder](https://github.com/deis/dockerbuilder)
6060

6161
For Applications which contain a `Dockerfile` in the root of the repository,
6262
`builder` will instead launch the `dockerbuilder` to package your application.
@@ -66,7 +66,7 @@ Docker registry on cluster. For more information see [using Dockerfiles][using-d
6666

6767
## Slugrunner
6868

69-
Project Location: [deis/slugrunner](https://github.com/deis/slugrunner)
69+
**Project Location:** [deis/slugrunner](https://github.com/deis/slugrunner)
7070

7171
Slugrunner is the component responsible for executing buildpack-based
7272
Applications. Slugrunner receives slug information from the controller and
@@ -75,7 +75,7 @@ processes.
7575

7676
## Object Storage
7777

78-
Project Location: [deis/minio](https://github.com/deis/mino)
78+
**Project Location:** [deis/minio](https://github.com/deis/mino)
7979

8080
All of the Workflow components ship their persistent data to cluster configured
8181
S3 compatibile Object Storage. For example, database ships its WAL files,
@@ -92,7 +92,7 @@ configure minio to use persistent storage available in your environment.
9292

9393
## Registry
9494

95-
Project Location: [deis/registry](https://github.com/deis/registry)
95+
**Project Location:** [deis/registry](https://github.com/deis/registry)
9696

9797
The registry component is a managed docker registry which holds application
9898
images generated from the builder component. Registry persists the Docker image
@@ -101,7 +101,7 @@ configured for the cluster.
101101

102102
## Router
103103

104-
Project Location: [deis/router](https://github.com/deis/router)
104+
**Project Location:** [deis/router](https://github.com/deis/router)
105105

106106
The router component is based on [Nginx][] and is responsible for routing
107107
inbound HTTP(S) traffic to your applications. The default workflow charts
@@ -118,20 +118,26 @@ configuration view the router [project documentation][router-documentation].
118118
The logging subystem consists of two compoents. Fluentd handles log shipping
119119
and logger maintains a ring-buffer of application logs.
120120

121-
Project Location: [deis/fluentd](https://github.com/deis/fluentd)
121+
122+
**Project Location:** [deis/fluentd](https://github.com/deis/fluentd)
122123

123124
Fluentd is deployed to your Kubernetes cluster via Daemon Sets. Fluentd
124125
subscribes to all container logs, decorates the output with Kubernetes metadata
125126
and can be configured to drain logs to multiple destinations. By default,
126127
fluentd ships logs to the logger component, which powers `deis logs`.
127128

128-
Project Location: [deis/logger](https://github.com/deis/logger)
129+
**Project Location:** [deis/logger](https://github.com/deis/logger)
129130

130131
The `logger` compoent receives log streams from `fluentd`, collating by
131132
Application name. Logger does not persist logs to disk, instead maintaining an
132133
in-memory ring buffer. For more information on logger see the [project
133134
documentation][logger-documentation].
134135

136+
## See Also
137+
138+
* [Workflow Concepts][concepts]
139+
* [Workflow Components][components]
140+
135141
[Application]: ../reference-guide/terms.md#application
136142
[Config]: ../reference-guide/terms.md#config
137143
[Git]: http://git-scm.com/
@@ -140,6 +146,8 @@ documentation][logger-documentation].
140146
[WAL-E]: https://github.com/wal-e/wal-e
141147
[architecture]: architecture.md
142148
[backupandrestore]: ../managing-deis/backing-up-and-restoring-data.md
149+
[components]: components.md
150+
[concepts]: concepts.md
143151
[configure-objectstorage]: ../installing-deis/configuring-object-storage.md
144152
[logger-documentation]: https://github.com/deis/logger
145153
[release]: ../reference-guide/terms.md#release

src/understanding-deis/concepts.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@ to external or third-party vendor services.
118118

119119
## See Also
120120

121-
* [Architecture](architecture.md)
122-
* [Twelve-Factor App][]
121+
* [Workflow Architecture][architecture]
122+
* [Workflow Components][components]
123123

124124
[Build and Run]: http://12factor.net/build-release-run
125125
[Docker]: https://www.docker.com/
126126
[Kubernetes]: https://kubernetes.io
127127
[Twelve-Factor App]: http://12factor.net/
128128
[application]: ../reference-guide/terms.md#application
129+
[architecture]: architecture.md
129130
[backing services]: http://12factor.net/backing-services
130131
[build]: ../reference-guide/terms.md#build
131132
[builder]: components.md#builder

src/using-deis/deploying-an-application.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,18 @@ using the URL supplied by their Deis administrator.
3030

3131
Deis supports three different ways of building applications:
3232

33-
1. [Heroku Buildpacks][]
34-
2. [Dockerfiles][]
35-
3. [Docker Images][]
36-
37-
3833
### Buildpacks
3934

4035
Heroku buildpacks are useful if you want to follow Heroku's best practices for building applications or if you are porting an application from Heroku.
4136

42-
Learn how to deploy applications on Deis [using Buildpacks](using-buildpacks.md).
37+
Learn how to deploy applications [using Buildpacks](using-buildpacks.md).
4338

4439

4540
### Dockerfiles
4641

4742
Dockerfiles are a powerful way to define a portable execution environment built on a base OS of your choosing.
4843

49-
Learn how to deploy applications on Deis [using Dockerfiles](using-dockerfiles.md).
44+
Learn how to deploy applications [using Dockerfiles](using-dockerfiles.md).
5045

5146

5247
### Docker Image
@@ -55,11 +50,8 @@ Deploying a Docker image onto Deis allows you to take a Docker image from either
5550
or a private registry and copy it over bit-for-bit, ensuring that you are running the same
5651
image in development or in your CI pipeline as you are in production.
5752

58-
Learn how to deploy applications on Deis [using Docker images](using-docker-images.md).
53+
Learn how to deploy applications [using Docker images](using-docker-images.md).
5954

6055
[application]: ../reference-guide/terms.md#application
6156
[controller]: ../understanding-deis/components.md#controller
6257
[twelve-factor methodology]: http://12factor.net/
63-
[Heroku Buildpacks]: https://devcenter.heroku.com/articles/buildpacks
64-
[Dockerfiles]: https://docs.docker.com/reference/builder/
65-
[Docker Images]: https://docs.docker.com/engine/userguide/containers/dockerimages/

0 commit comments

Comments
 (0)