Skip to content

Commit 7e3230b

Browse files
author
Gabriel Monroy
committed
cleanup line breaks, update command output
1 parent fdcd7d9 commit 7e3230b

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Before you get started, read about Deis core [concepts](http://docs.deis.io/en/l
3838
* What is a [Formation](http://docs.deis.io/en/latest/gettingstarted/concepts/#formations) and how does it relate to an application?
3939
* What are [Layers and Nodes](http://docs.deis.io/en/latest/gettingstarted/concepts/#layers), and how do they work with Chef?
4040
* How does the [Build, Release, Run](http://docs.deis.io/en/latest/gettingstarted/concepts/#build-release-run) process work?
41-
* How do I connect a Formation to [backing services](http://docs.deis.io/en/latest/gettingstarted/concepts/#backing-services)?
41+
* How do I connect an application to [backing services](http://docs.deis.io/en/latest/gettingstarted/concepts/#backing-services)?
4242

4343
Follow the steps below to install your own Deis platform on EC2. To complete the installation process, you will need [Git](http://git-scm.com), [RubyGems](http://rubygems.org/pages/download), [Pip](http://www.pip-installer.org/en/latest/installing.html), the [Amazon EC2 API Tools](http://aws.amazon.com/developertools/351), [EC2 Credentials](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/SettingUp_CommandLine.html#set_aws_credentials_linux) and a Chef Server with a working [Knife](http://docs.opscode.com/knife.html) client.
4444

@@ -51,9 +51,7 @@ $ git clone https://github.com/opdemand/deis.git
5151
$ cd deis
5252
```
5353

54-
Cloning the default master branch will provide you with the latest development version
55-
of Deis. If you want to deploy the latest stable release, make sure you checkout the
56-
most recent tag using ``git checkout vX.Y.Z``.
54+
Cloning the default master branch will provide you with the latest development version of Deis. If you want to deploy the latest stable release, make sure you checkout the most recent tag using ``git checkout vX.Y.Z``.
5755

5856
### 2. Configure the Chef Server
5957

@@ -82,6 +80,7 @@ $ sudo pip install deis
8280
$ deis register http://my-deis-controller.fqdn
8381
username: myuser
8482
password:
83+
password (confirm):
8584
email: myuser@example.com
8685
Registered myuser
8786
Logged in as myuser
@@ -101,17 +100,16 @@ Uploading EC2 credentials... done
101100
Use the Deis client to create a new formation named "dev" that
102101
has a default layer that serves as both runtime (hosts containers)
103102
and proxy (routes traffic to containers). Scale the default layer
104-
up to two nodes.
103+
up to one node.
105104

106105
```bash
107-
$ deis formations:create dev --flavor=ec2-us-west-2
106+
$ deis formations:create dev --flavor=ec2-us-west-2 --domain=deisapp.com
108107
Creating formation... done, created dev
109-
110108
Creating runtime layer... done in 1s
111109

112110
Use `deis nodes:scale dev runtime=1` to scale a basic formation
113111

114-
$ deis nodes:scale dev runtime=2
112+
$ deis nodes:scale dev runtime=1
115113
Scaling nodes... but first, coffee!
116114
...done in 251s
117115

@@ -123,18 +121,20 @@ Use `deis create --formation=dev` to create an application
123121
Change into your application directory and use ``deis create --formation=dev``
124122
to create a new application attached to the dev formation.
125123

126-
To deploy the application, use `git push deis master`.
127-
Deis will automatically deploy Docker containers
128-
and configure Nginx proxies to route requests to your application.
124+
To deploy the application, use `git push deis master`. Deis will automatically deploy Docker containers and configure Nginx proxies to route requests to your application.
129125

130-
Once your application is deployed, you use ``deis scale web=4`` to
126+
Once your application is deployed, use ``deis scale web=4`` to
131127
scale up web containers. You can also use ``deis logs`` to view
132-
aggregated application logs, or ``deis run`` to run one-off admin
128+
aggregated application logs, or ``deis run`` to run admin
133129
commands inside your application.
134130

135131
To learn more, use `deis help` or browse [the documentation](http://docs.deis.io).
136132

137133
```bash
134+
$ deis create --formation=dev
135+
Creating application... done, created peachy-waxworks
136+
Git remote deis added
137+
138138
$ git push deis master
139139
Counting objects: 146, done.
140140
Delta compression using up to 8 threads.
@@ -154,9 +154,9 @@ Total 146 (delta 84), reused 47 (delta 22)
154154
Launching... done, v2
155155

156156
-----> peachy-waxworks deployed to Deis
157-
http://ec2-198.51.100.36.us-west-2.compute.amazonaws.com ...
157+
http://peachy-waxworks.deisapp.com ...
158158

159-
$ curl -s http://ec2-198.51.100.36.us-west-2.compute.amazonaws.com
159+
$ curl -s http://peachy-waxworks.deisapp.com
160160
Powered by Deis!
161161

162162
$ deis scale web=4
@@ -166,10 +166,10 @@ done in 12s
166166
=== peachy-waxworks Containers
167167

168168
--- web: `node server.js`
169-
web.1 up 2013-09-23T19:02:30.745Z (dev-runtime-2)
169+
web.1 up 2013-09-23T19:02:30.745Z (dev-runtime-1)
170170
web.2 up 2013-09-23T19:36:48.741Z (dev-runtime-1)
171171
web.3 up 2013-09-23T19:36:48.758Z (dev-runtime-1)
172-
web.4 up 2013-09-23T19:36:48.771Z (dev-runtime-2)
172+
web.4 up 2013-09-23T19:36:48.771Z (dev-runtime-1)
173173
```
174174

175175
## Credits

0 commit comments

Comments
 (0)