From ad0d2b1f6de095d6db343bef09a44c3ae1d758e1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 14 May 2016 14:28:31 -0400 Subject: [PATCH 1/2] Remove unused contents from docs/index.md [ci skip] --- docs/development/release-process.md | 1 - docs/index.md | 70 ----------------------------- 2 files changed, 71 deletions(-) diff --git a/docs/development/release-process.md b/docs/development/release-process.md index c22f66792..44535c323 100644 --- a/docs/development/release-process.md +++ b/docs/development/release-process.md @@ -8,7 +8,6 @@ To propose a release, the following tasks need to be performed: - The installable version must be changed in the `contrib/dokku-installer.py` file. - The installable version must be changed in the `debian/control` file. - The installable version must be changed in the `docs/home.html` file -- The installable version must be changed in the `docs/index.md` file - The installable version must be changed in the `docs/installation.md` file. - The installable version must be changed in the `docs/template.html` file. - The installable version must be changed in the `README.md` file. diff --git a/docs/index.md b/docs/index.md index c6227baaf..e69de29bb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,70 +0,0 @@ -
-
-

The smallest PaaS implementation you've ever seen

-

Docker powered mini-Heroku in around 200 lines of Bash

-
- View Documentation -
-
-
- -
-
-

Quick-start Instructions

-
-

- ~ - $ - wget https://raw.githubusercontent.com/dokku/dokku/v0.5.6/bootstrap.sh -

-

- ~ - $ - sudo DOKKU_TAG=v0.5.6 bash bootstrap.sh -

-

- # => Go to your server's IP and follow the web installer -

-
-
- -
- - - -
-
-

Own Your PaaS. Infrastructure at a fraction of the cost.

-

Powered by Docker, you can install Dokku on any hardware. Use it on inexpensive cloud providers. Use the extra cash to buy a pony or feed kittens. You'll save tens of dollars a year on your dog photo sharing website.

-
-
- Docker Logo -
-
- -
- -
-
-

Easy Git Deploys. From your command-line to the cloud.

-

Once it's set up on a host, you can push Heroku-compatible applications to it via Git. They'll build using Heroku buildpacks and then run in isolated containers. The end result is your own, single-host version of Heroku.

-
-
- Git Logo -
-
- -
- -
-
-

Extensible Platform. Customize your PaaS.

-

Write dokku plugins in any language. Share them online with others, and extend those already available. Dokku's simple core is easy to hack and add the features you need to get your job done.

-
-
- Extend Logo -
-
- -
-
From fe00835aa7a29de9ff3ddee9d0bb27a8206b75de Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 14 May 2016 14:28:05 -0400 Subject: [PATCH 2/2] clarify what happens when installing via the bootstrap.sh file Closes #2041 [ci skip] --- docs/advanced-installation.md | 4 +++- docs/home.html | 2 +- docs/installation.md | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/advanced-installation.md b/docs/advanced-installation.md index d7436259b..f61b1a3e9 100644 --- a/docs/advanced-installation.md +++ b/docs/advanced-installation.md @@ -3,7 +3,9 @@ You can always install dokku straight from the latest - potentially unstable - master release via the following bash command: ```shell -wget -qO- https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh | sudo DOKKU_BRANCH=master bash +# using a branch results in installing from source +wget https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh +sudo DOKKU_BRANCH=master bash bootstrap.sh ``` ## Development diff --git a/docs/home.html b/docs/home.html index a7b4bc950..3e4592a0a 100644 --- a/docs/home.html +++ b/docs/home.html @@ -90,7 +90,7 @@

-  # only works on debian systems! +  # for debian systems, installs dokku via apt-get

diff --git a/docs/installation.md b/docs/installation.md index 009749f6c..310c4eb77 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -20,7 +20,7 @@ Dokku is designed for usage on a fresh installation of Ubuntu, and should instal To install the latest stable version of dokku, you can run the following shell commands: ```shell -# installs dokku via apt-get +# for debian systems, installs dokku via apt-get wget https://raw.githubusercontent.com/dokku/dokku/v0.5.6/bootstrap.sh sudo DOKKU_TAG=v0.5.6 bash bootstrap.sh ```