From 6c57f1a08b4ed22b6bd40e8c7ca2d610aaa2b6cb Mon Sep 17 00:00:00 2001 From: Ben Creasy Date: Sun, 8 Oct 2017 22:02:13 -0700 Subject: [PATCH 1/2] docs: WIP on optional herokuish [ci skip] --- .gitignore | 1 + docs/getting-started/advanced-installation.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3027ddb0d..704e2db40 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.rpm .DS_Store .ruby-version +.idea/ .vagrant data/ stack.tgz diff --git a/docs/getting-started/advanced-installation.md b/docs/getting-started/advanced-installation.md index 85a51d40e..49ed0fc59 100644 --- a/docs/getting-started/advanced-installation.md +++ b/docs/getting-started/advanced-installation.md @@ -44,6 +44,8 @@ cd dokku sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make install ``` +Herokuish is recommended but not required. For Debian, `sudo DOKKU_NO_INSTALL_RECOMMENDS=true bash bootstrap.sh` is one way to skip the dependency, although it will also skip other recommended dependencies. + ## Configuring Once Dokku is installed, if you are not using the web-installer, you'll want to configure a the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications. From dc9ebf867cff6968065888df4f2ce8c19dcad937 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 12 Nov 2017 13:28:36 -0500 Subject: [PATCH 2/2] docs: revise herokuish installation [ci skio] --- docs/getting-started/advanced-installation.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/getting-started/advanced-installation.md b/docs/getting-started/advanced-installation.md index 49ed0fc59..e416602c5 100644 --- a/docs/getting-started/advanced-installation.md +++ b/docs/getting-started/advanced-installation.md @@ -44,7 +44,9 @@ cd dokku sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make install ``` -Herokuish is recommended but not required. For Debian, `sudo DOKKU_NO_INSTALL_RECOMMENDS=true bash bootstrap.sh` is one way to skip the dependency, although it will also skip other recommended dependencies. +## Skipping herokuish installation + +The `herokuish` package is recommended but not required if not using Heroku Buildpacks for deployment. Debian-based OS users can run the bootstrap installer via `sudo DOKKU_NO_INSTALL_RECOMMENDS=true bash bootstrap.sh` to skip the dependency. Please note that this will _also_ skip installation of other recommended dependencies. ## Configuring