Release 0.5.6

export app config vars into sigil environment for use in nginx templates

.gitignore

@@ -1,7 +1,6 @@
 .vagrant
 .DS_Store
 stack.tgz
-build
 tmp
 *.deb
 .ruby-version

CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at dokku@josediazgonzalez.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -1,13 +1,16 @@
 # How to contribute
 
-Dokku loves to welcome your contributions. There are several ways to help out:
+The Dokku project would love to welcome your contributions. There are 
+several ways to help out:
 
-* Create an [issue](https://github.com/progrium/dokku/issues) on GitHub, if you
+* Create an [issue](https://github.com/dokku/dokku/issues) on GitHub, if you
   have found a bug
 * Write test cases for open bug issues
 * Write patches for open bug/feature issues, preferably with test cases
   included
-* Contribute to the [documentation](http://progrium.viewdocs.io/dokku/)
+* Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)
+* Come up with new ways to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795)
+* Blog about different ways you are using dokku
 
 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.
@@ -41,12 +44,12 @@ encounter an issue. We always appreciate a well-written, thorough bug report,
 and will thank you for it!
 
 Sometimes dokku is missing a feature you need. In some cases, those features can
-be found in pre-existing [plugins](http://progrium.viewdocs.io/dokku/plugins/),
+be found in pre-existing [plugins](http://dokku.viewdocs.io/dokku/plugins/),
 and we encourage our users to create and contribute such packages. From time to
 time, we will also pull plugins into the dokku core when the task they solve is
 a common one for our users.
 
-Check that [our issue database](https://github.com/progrium/dokku/issues)
+Check that [our issue database](https://github.com/dokku/dokku/issues)
 doesn't already include that problem or suggestion before submitting an issue.
 If you find a match, add a quick "+1" or "I have this problem too." Doing this
 helps prioritize the most common problems and requests.
@@ -55,49 +58,18 @@ When reporting issues, please include your host OS (Ubuntu 14.04, Fedora 19,
 etc). Please include:
 
 * The output of `uname -a`.
+* The output of `free -m`
 * The output of `docker version`.
 * The output of `docker -D info`.
+* The output of `sigil -v`.
+* The output of `docker run --rm -ti gliderlabs/herokuish:latest herokuish version`
 * The output of `dokku version`.
+* The output of `dokku plugin`.
 
 Please also include the steps required to reproduce the problem if possible and
 applicable. This information will help us review and fix your issue faster.
 
-**Issue Report Template**:
-
-```
-Description of problem:
-
-
-Output of the following commands
-
-- `dokku version`:
-- `dokku plugins`:
-- `docker version`:
-- `docker info`:
-- `uname -a`:
-- `cat /home/dokku/<app>/nginx.conf` (if applicable):
-- Output of failing dokku commands with `dokku trace on`:
-
-Environment details (AWS, VirtualBox, physical, etc.):
-
-How was dokku installed?:
-
-How reproducible:
-
-
-Steps to Reproduce:
-1.
-2.
-3.
-
-Actual Results:
-
-
-Expected Results:
-
-
-Additional info:
-```
+Our Issue Report Template is available [here](https://github.com/dokku/dokku/blob/master/ISSUE_TEMPLATE.md)
 
 ## Contributing
 
@@ -105,7 +77,7 @@ Before you contribute to the dokku project, there are a few things that you'll
 need to do
 
 * Make sure you have a [GitHub account](https://github.com/signup/free).
-* Submit an [issue](https://github.com/progrium/dokku/issues), assuming one
+* Submit an [issue](https://github.com/dokku/dokku/issues), assuming one
   does not already exist.
   * Clearly describe the issue including steps to reproduce when it is a bug.
   * Make sure you fill in the earliest version that you know has the issue.
@@ -129,7 +101,7 @@ need to do
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Use descriptive commit messages and reference the #issue number.
 * Core test cases should continue to pass. You can run tests locally or enable
-  [circle-ci](https://circleci.com/gh/progrium/dokku) for your fork, so all
+  [circle-ci](https://circleci.com/gh/dokku/dokku) for your fork, so all
   tests and codesniffs will be executed.
 * Your work should apply the [Dokku coding standards](https://github.com/progrium/bashstyle)
 * Pull requests must be cleanly rebased on top of master without multiple branches
@@ -179,13 +151,13 @@ To run the shellcheck sniffs for Dokku coding standards:
     make ci-dependencies
     make lint
 
-The [testing docs](http://progrium.viewdocs.io/dokku/development/testing/)
+The [testing docs](http://dokku.viewdocs.io/dokku/development/testing/)
 contains installation info for bats and shellcheck.
 
 # Additional Resources
 
 * [Dokku coding standards](https://github.com/progrium/bashstyle)
-* [Existing issues](https://github.com/progrium/dokku/issues)
+* [Existing issues](https://github.com/dokku/dokku/issues)
 * [General GitHub documentation](https://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
 * [#dokku IRC channel on freenode.org](https://webchat.freenode.net/?channels=dokku)

HISTORY.md

@@ -1,12 +1,636 @@
 # History
 
+## 0.5.6
+
+Release 0.5.5 is mostly a documentation release. Please note, however, that we now inject application environment variables into sigil-generated nginx configurations. You can use this to further improve your generated nginx configuration files.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2120: @u2mejc Add apex help_content for certs,nginx,storage,tar plugins
+- #2122: @michaelshobbs Add 10.0.0.2 so *.dokku.me works
+- #2145: @michaelshobbs Fix dockerfile-procfile test
+
+### New Features
+
+- #2150: @michaelshobbs export app config vars into sigil environment for use in nginx templates
+
+### Documentation
+
+- #2099: @ojosdegris Added clarification on configuration via separate files
+- #2107: @simenbrekken Add CI deployment recipe
+- #2112: @josegonzalez Alphabetize triggers
+- #2114: @josegonzalez Add table of contents to sidebar when there is a table of contents
+- #2115: @josegonzalez Document potential dockerfile/nginx.conf.sigil issues
+- #2116: @josegonzalez Warn users when there is a low memory condition on installation
+- #2127: @crisward Added dokku require plugin
+- #2129: @christiangenco Condense upgrading instructions
+- #2136: @josegonzalez Use `sleep infinity` for enter cron task
+- #2142: @Aluxian Add dokku-nginx-cache to the list of plugins
+
+## 0.5.5
+
+Release 0.5.5 is mostly a documentation release, further clarifying how our default proxy implementation (nginx) interacts with Dockerfiles. Note that we also updated how ssl certificates interact with application domains, so please check out our domains and ssl documentation.
+
+We've also added a small section to the [dokku homepage](http://dokku.viewdocs.io/dokku/) that lists the current core team. Feel free to look at their beautiful faces and imagine yourself contributing to Dokku and joining our core team. There are [quite a few ways to contribute](https://github.com/dokku/dokku/blob/master/CONTRIBUTING.md) - even without code/documentation - so feel more than free to jump on the bandwagon!
+
+Finally, we've started an [Official Dokku Blog](https://dokku.github.io/), where we will post about dokku internals, roadmaps, potential use-cases, etc. An rss feed is available [here](https://dokku.github.io/feed.xml).
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2094: @josegonzalez Create storage directories on install. Closes #2091
+- #2102: @josegonzalez Only strip .git directory from end of url
+
+### New Features
+
+- #2088: @josegonzalez Upgrade herokuish package
+- #2089: @michaelshobbs Update how ssl and multiple domains interact
+
+### Documentation
+
+- #2076: @josegonzalez Add a note to dockerfile deploys concerning ports being exposed as http
+- #2080: @michaelshobbs Clarify the need for contents of dockerfile when debugging
+- #2082: @michaelshobbs Add use case example for ssl redirect
+- #2083: @louisbl Clarify 0.5.0 migration guide about `EXPOSE`
+- #2084: @louisbl Clarify where to put nginx custom template without `WORKDIR`
+- #2093: @fwolfst Fix path in storage example
+- #2098: @josegonzalez Add a blog link to the header area
+- #2100: @kane-c Fix docs navigation link to domain configuration
+- #2104: @crisward Added new clone plugin
+- #2105: @josegonzalez Add a note about how disabling the proxy affects the host port an application is deployed to
+
+## 0.5.4
+
+This release continues on our tradition of making bugfixes in patch releases. Also note that we now release dokku with `sshcommand` version `0.4.0`, which should increase usability of that package quite a bit.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2055: @tobru Move nginx include to server section
+- #2060: @michaelshobbs Filter restart policies from exec-app-json containers
+- #2061: @znz Fix ignored settings in the CHECKS file
+- #2065: @michaelshobbs Fix pre/post deploy support for dockerfile apps
+
+### New Features
+
+- #2052: @josegonzalez Use upstream releases when creating deb packages. Closes #2048
+- #2068: @josegonzalez Use latest sshcommand when installing via debian
+- #2070: @josegonzalez Upgrade sshcommand to 0.4.0
+
+### Documentation
+
+- #2049: @mmlkrx Fix typo in deployment-tasks.md
+- #2051: @plieningerweb Clarify installation instructions in docs
+- #2058: @michaelshobbs Remove references to global TLS certs
+- #2072: @michaelshobbs Note that we only support one EXPOSE port per line in dockerfiles
+
+## 0.5.3
+
+This release sorts out a few minor bugs introduced in the 0.5.0 release.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #2030: @josegonzalez Fix setting of APPS in checks command when $1 is left unspecified
+- #2035: @stesie Fix ps_restart to not exit early
+- #2042: @michaelshobbs Ensure CHECKS file has trailing newline
+- #2046: @michaelshobbs Strip inline comments and trailing whitespace from CHECKS and Procfile
+- #2047: @michaelshobbs Remove deprecated mktemp args and name vars more clearly
+
+### Documentation
+
+- #2032: @josegonzalez Fix upstream positioning in docs. Closes #2031
+- #2039: @christiangenco Clarify upgrading documentation
+- #2043: @michaelshobbs Clarify dockerfile port exposure documentation
+- #2045: @u2mejc Reword dockerfiles docs to clarify EXPOSE handling in 0.5.x
+
+## 0.5.2
+
+This is a packaging fix release.
+
+### Bug Fixes
+
+- #2027: @michaelshobbs Add sigil to debian control file
+
+## 0.5.1
+
+That was quick! This is a bugfix release to fix issues in the packaging and release phases of dokku.
+
+### Bug Fixes
+
+- #2023: @josegonzalez Fix sigil packaging
+- #2024: @josegonzalez Delete bad symlinks without confirmation
+
+## 0.5.0
+
+This is our largest, most feature-packed release in the history of the dokku project. Lots of delicious things, including:
+
+- Support for docker 1.10/1.11. You *must* have docker 1.9.1+ to install dokku.
+- Revamped documentation website
+- [Deployment Tasks](http://dokku.viewdocs.io/dokku/deployment/deployment-tasks/)
+- Heroku-style management of [dockerfile processes](http://dokku.viewdocs.io/dokku/deployment/dockerfiles/#procfiles-and-multiple-processes)
+- Official [persistent storage plugin](http://dokku.viewdocs.io/dokku/dokku-storage/)
+
+We'd also love it if you welcomed a few new core developers:
+
+- @MorrisJobke: Maintainer of our new arch linux support
+- @u2mejc: Contributed the help refactor and persistent storage plugins
+
+Thanks to all the contributors who helped with this release!
+
+## Refactor
+
+- #1892: @michaelshobbs Refactor nginx proxy plugin to add usage flexibility
+- #1925: @josegonzalez Simplify bootstrap.sh installation method
+- #1953: @michaelshobbs Refactor commands into subcommands and add support for --app argument
+- #1983: @u2mejc Collapse help into expandable command topics
+- #1936: @michaelshobbs Cleanup shellcheck SC2086
+
+### Bug Fixes
+
+- #1934: @michaelshobbs Fix get_running_image_tag() with docker 1.10.x
+- #1935: @michaelshobbs Remove unnecessary nginx test
+- #1941: @cu12 Fix issue with plugins having plugins command
+- #1980: @cu12 Fix issue when Dockerfile present but BUILDPACK_URL is set
+- #1991: @MorrisJobke Only chown of existing files
+- #1993: @istarkov Fix bash incorrect test command
+- #2006: @baob Fix too many redirects
+- #2012: @michaelshobbs minor bug fixes around app.json and docker-options
+
+### New Features
+
+- #1830: @u2mejc Add core storage plugin to manage docker bind mounts
+- #1836: @michaelshobbs Support scripts.dokku. in app.json
+- #1918: @MorrisJobke Adds support for ArchLinux as host OS
+- #1924: @pmclanahan Use Procfile for process types in Dockerfile apps
+- #1939: @pmclanahan Add dokku git remote when specifying app name in bash client
+- #1958: @u2mejc Enable debug output for dokku global exports in trace
+- #1959: @josegonzalez Allow customizing ssh port for the default client
+- #1981: @josegonzalez Only remove containers with dokku label
+- #1987: @josegonzalez Do not restart stopped processes on config:set/unset
+
+### Documentation
+
+- #1687: @u2mejc Deprecate and remove dokku backup plugin, replace with documentation.
+- #1931: @josegonzalez Standardize on "relative" doc links
+- #1938: @npazo Add information about Slack channel
+- #1947: @basgys Add etcd to the list of plugins
+- #1951: @znz Fix typos
+- #1960: @josegonzalez Clarify which commands should be run where. Closes #1890
+- #1963: @josegonzalez Add floating sidebar on documentation linking to released versions
+- #1965: @trevorturk Clarify checks documentation
+- #1974: @simenbrekken Update link in Azure installation instructions. Fixes #1973
+- #1979: @josegonzalez Add specific documentation around user management. Closes #1978
+- #1985: @MikeSchroll Make history readable in github
+- #1990: @ligthyear Highlight features that are yet to come
+- #1992: @Sureiya Improved documentation for using official dokku_client.sh
+- #2000: @iamale Add dokku-monorepo to the plugin list in docs
+- #2002: @michaelshobbs clarify deployment tasks are supported in both buildpack and dockerfile apps
+- #2003: @michaelshobbs Add more useful post-deploy task and make blockquote
+- #2004: @josegonzalez Document 0.5.x container removal strategy. Closes #1982
+- #2007: @josegonzalez Document when configuration variables are available. Closes #1860
+- #2009: @samholmes1337 Clarify purpose and potential penalties of primary vhost
+- #2011: @josegonzalez Updated installation docs
+- #2013: @michaelshobbs Make help desc local consistent
+
+## 0.4.14
+
+Hah you got us. We have to ship another 0.4.x release to fix issues with
+running commands via `dokku run`. For quite a few releases, we've been
+ignoring the `--rm` flag, meaning containers were lying around if you were
+using `dokku run` in cron. This release fixes it, and is important enough
+to warrant a 0.4.x release.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1888: @u2mejc Remove broken symlinks when using copyfiles
+- #1887: @u2mejc Fix <command>:help hangs for certs, enter, tags, tar
+- #1901: @josegonzalez Add shebang to config/functions so editors see it as a shell script
+- #1907: @michaelshobbs Fix dokku run --rm regression
+- #1911: @2mia Add support for github url patterns when installing plugins
+- #1912: @mattberther Pass -i -t to docker exec only if tty present
+- #1923: @michaelshobbs Fix typo in generate_scale_file()
+
+### Documentation
+
+- #1882: @josegonzalez Add a note to warn users to peg to specific versions of buildpacks
+- #1883: @michaelshobbs Show plugn version when listing plugins
+- #1900: @josegonzalez Upgrade our CoC to 1.4 of the Contributor Covenant
+- #1913: @michaelshobbs document appropriate crontab usage
+- #1921: @josegonzalez Create ISSUE_TEMPLATE.md
+- #1922: @josegonzalez Link to our new ISSUE_TEMPLATE.md
+
+## 0.4.13
+
+We lied. *This* is the final 0.4.x release. This specific release fixes support for bash `4.2`, which may be the only bash version available for certain testing environments.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1871: @michaelshobbs Support bash 4.2 so we don't have to modify all plugin test envs
+- #1872: @kenips Update log to better reflect what's going on with CHECKS
+
+## 0.4.12
+
+This is a small bugfix release, which will be the final release before the 0.5.x line. You can follow along on bugs/features we hope to cleanup for 0.5.x [here](https://github.com/dokku/dokku/milestones/v0.5.0).
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1868: @alessio Prevent dokku to hang on events:help
+- #1870: @u2mejc Remove arg check from docker-options/functions, global var cleanup
+
+## 0.4.11
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1840: @alessio Append trailing slash '/' to $PLUGIN_DIR
+- #1841: @michaelshobbs Don't build nginx config if the app has not been deployed
+- #1844: @michaelshobbs Handle multiple old containers and don't attempt to rename a dead container
+- #1845: @michaelshobbs Update nodejs in test apps
+- #1849: @floriangosse Fix logrotate file for debian system
+- #1862: @michaelshobbs Install bash 4.3.x on circleci
+- #1863: @znz Fix a typo in IPV6 detection
+
+### New Features
+
+- #1842: @michaelshobbs skip cleanup in ci to speed up tests
+- #1848: @u2mejc Move docker-options functions to functions file, rework phase_file_path
+- #1855: @jvanbaarsen Add skip_keyfile option for deb package
+- #1864: @znz Remove nullglob from ps commands
+
+### Documentation
+
+- #1838: @Epigene Fixed typo in installation documentation
+- #1843: @sseemayer Move let's encrypt plugin to official plugins
+- #1854: @fedosov Update year in footer (2013-2016)
+- #1856: @madflow Fixed dead documentation link
+- #1859: @dhinus Fix command for debconf-set-selections
+
+## 0.4.10
+
+This release is mostly a bugfix release, though we have a few important changes:
+
+- `dokku plugin:update` can now be used to update a specific plugin. Previously, this could potentially result in an error a user would have to manually resolve.
+- We have started labeling all dokku-managed containers. In a future minor release, triggering a `dokku cleanup` will remove *only* exited containers that are managed by dokku. This change allows users to start containers outside of dokku and be assured that dokku would not inadvertently remove them.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1818: @josegonzalez Fix pre-receive git-hook in apps:rename
+- #1819: @andrewsomething Write out /home/dokku/HOSTNAME as specified by the web installer.
+- #1823: @josegonzalez Fix output formatting of dokku apps
+- #1827: @michaelshobbs Use docker 1.9.0 on circleci
+- #1834: @jvanbaarsen Make sure we ignore hidden files in the SSL cert check
+- #1835: @josegonzalez Add support to herokuish for more versions of docker-engine
+- #1837: @michaelshobbs Add back some deploy tests that test dokku functionality
+
+### New Features
+
+- #1826: @michaelshobbs Implement plugn update
+- #1828: @michaelshobbs Label all dokku-managed containers
+- #1829: @michaelshobbs Implement dokku report command
+
+### Documentation
+
+- #1822: --no-restart option after config:set not before
+
+## 0.4.9
+
+This release is significant for two reasons:
+
+- A bugfix for git submodule support that was broken in 0.4.7
+- Improved and tested support for modern variants of Ubuntu/Debian. This should also improve support for docker-based deployments of dokku, as well as potential support for the upcoming Ubuntu 16.04 release.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1810: @josegonzalez Fix debian packaging for usage inside of docker containers
+- #1814: @blackxored Add support for new method of extracting container IP
+- #1807: @josegonzalez Allow updating submodules at any revision
+
+### New Features
+
+- #1812: @josegonzalez Fully-tested debian packaging for modern Ubuntu/Debian distributions
+
+### Documentation
+
+- #1811: @josegonzalez Add dokku haproxy to plugins
+
+## 0.4.8
+
+If upgrading to 0.4.8, please note that we have tightened the application naming schema, per docker requirements. Upgrade your dokku installation to 0.4.7 first to take advantage of the `dokku apps:rename` command if you are having issues with the new requirement.
+
+### Bug Fixes
+
+- #1804: @josegonzalez Fix deprecated version constraint usage in debian control file
+- #1798: @michaelshobbs Ensure app name begins with lowercase alphanumeric character
+- #1808: @josegonzalez Fix path to dokku-installer
+
+### New Features
+
+- #1801: @josegonzalez Allow setting DOKKU_LIB_ROOT env var to modify the lib path on install
+- #1803: @michaelshobbs update plugn download url and version
+
+### Documentation
+
+- #1809: @josegonzalez Remove non-zero downtime version of letsencrypt plugin
+
+## 0.4.7
+
+A few notable new features:
+
+- The new `dokku apps:rename` command. It does not update linked containers, but is useful in many other cases.
+- Updated git clone methodology to be more performant for large repositories.
+- Moved the dokku-installer from Ruby to Python, allowing us to drop Ruby as a dependency. Python comes with the linux standard base, and should therefore be accessible on more systems.
+
+### Bug Fixes
+
+- #1776: @t-8ch Fix docker version constraints on jessie systems
+- #1777: @michaelshobbs Format test labels
+- #1782: @michaelshobbs make docker cp work on circleci
+- #1788: @michaelshobbs Updates for moving of dokku sshcommand and plugn repos
+- #1791: @michaelshobbs Don't run app deploy tests and spread out unit tests to 4 containers
+- #1793: @michaelshobbs Filter out Procfile comments
+
+### New Features
+
+- #1670: @zachfeldman Add apps:rename
+- #1771: @jvanbaarsen Make plugin hooks send out more information
+- #1778: @mmerickel Optimize git clone for large repositories
+- #1781: @jvanbaarsen Add post config update hook
+- #1789: @lvillani Make it possible to skip a deploy
+- #1790: @michaelshobbs Use pgup/pgdown for history shortcut in dev env
+- #1794: @josegonzalez Replace dokku-installer.rb with dokku-installer.py
+- #1797: @michaelshobbs Ensure we run plugin commands as root
+- #1799: @josegonzalez Add support for tutum-agent as docker alternative
+- #1800: @josegonzalez Respect DOKKU_ROOT in debian/postint
+
+### Documentation
+
+- #1779: @sseemayer Add link to new zero-downtime Let's Encrypt Plugin to docs
+- #1780: @jvanbaarsen Add documentation for the new domain plugin hooks
+- #1784: @duboff Tiny fix in SSL documentation
+
+## 0.4.6
+
+This is mostly a documentation change. A few notable changes:
+
+- Rebooting dokku servers should properly handle not starting stopped services.
+- Better support for newer versions of Debian/Ubuntu.
+- Moved the dokku project to the dokku github organization.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1717: @josegonzalez Avoid using the PPA for ubuntu versions 15.10 and higher
+- #1727: @louisbl Enable dokku-redeploy systemd service.
+- #1732: @michaelshobbs do not chown file that doesn't exist
+- #1745: @beverku Change herokuish to recommended package
+- #1767: @jvanbaarsen Remove shebang from config/functions
+- #1775: @Flink Match complete container name in named-containers plugin
+
+### New Features
+
+- #1718: @josegonzalez Add post-create hook
+- #1735: @michaelshobbs use ps:restore on instance boot
+
+### Documentation
+
+- #1720: @josegonzalez Add memory usage output as desired data for reporting issues
+- #1723: @josegonzalez Add herokuish version to desired debugging info
+- #1739: @michaelshobbs clarify location of nginx.conf.template in app repo
+- #1747: @josegonzalez Add Lets Encrypt plugin
+- #1748: @byrnedo Added unofficial Nats plugin to plugins.md
+- #1750: @jlachowski New graphite & statsd plugin with grafana frontend added
+- #1751: @josegonzalez Use flat-square style on image badges
+- #1752: @byrnedo Moved dokku-nats into official plugins section
+- #1753: @hhff Add .ca-bundle information to SSL docs
+- #1754: @josegonzalez Update all links to dokku repo
+- #1757: @josegonzalez Add DigitalOcean as a sponsor
+- #1761: @josegonzalez Fix link to docker-options documentation
+
+## 0.4.5
+
+This release is mostly a bugfix release. Two notable changes:
+
+- It is now possible to build complex authentication layers around dokku using the new user auth plugin trigger introduced in #1671.
+- We have a Code of Conduct in our repository. Please refer to this document if you have any questiosn regarding what is acceptable in the Dokku community.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1666: @michaelshobbs Revert dokku group changes and add dokku user to adm group
+- #1667: @u2mejc Fix dokku certs:add file input bug
+- #1682: @michaelshobbs Aet nullglob when looking for PORT files
+- #1684: @u2mejc Cause certs:remove to return non zero on error
+- #1690: @u2mejc Fix "App tls has not been deployed" error
+- #1696: @michaelshobbs chown plugins paths to dokku:dokku
+- #1698: @pmvieira Ensure curl is installed inside of source-based installations
+- #1700: @michaelshobbs copy nginx.ssl.template from app container
+- #1701: @michaelshobbs Don't call nginx_build_config twice
+- #1702: @josegonzalez Remove extra whitespace in command output
+- #1703: @josegonzalez Fix casing on help output
+- #1706: @michaelshobbs Respect DOKKU_RM_CONTAINER in run phase
+- #1707: @Flink Do a perfect match on the container name in named-containers plugin
+- #1708: @michaelshobbs ensure permissions are locked down on tls folder and contents
+- #1709: @michaelshobbs Fix Must specify DOMAIN error over ssh
+- #1712: @michaelshobbs filter incompatible docker option when building dockerfile vs herokuish apps
+- #1715: @michaelshobbs use patched static buildpack in test
+
+### New Features
+
+- #1665: @callahad Replace curl with wget
+- #1671: @josegonzalez User Auth plugin trigger
+- #1683: @u2mejc Add bats test for certs plugin
+- #1699: @michaelshobbs print where we find DOKKU_SCALE when we find it
+
+### Documentation
+
+- #1642: @cjblomqvist Add new plugin adding app name to env
+- #1674: @josegonzalez Expand buildpack deployment documentation
+- #1675: @josegonzalez Create CODE_OF_CONDUCT.md
+- #1677: @ignlg Added dokku-builders-plugin to plugins page
+- #1681: @josegonzalez Fix email in code of conduct
+- #1694: @MarcDiethelm Improve docker-options doc
+- #1713: @mbriskar Wkhtmltopdf plugin
+
+## 0.4.4
+
+This release adds a few interesting changes:
+
+- The `dokku logs` command now roughly maps to the `heroku logs` command, and supports most available options.
+- Native Microsoft Azure support is now available!
+- Quite a few shellcheck issues were fixed thanks to @callahad!
+- Experimental debian installation support. Going forward, we will try and make dokku compatible with all systemd installations, as well as investigate dockerfile-based deployment to continue simplifying installation.
+
+Thanks to all our contributors for making this release great!
+
+### Bug Fixes
+
+- #1606: @josegonzalez Install plugn 0.2.0 in Makefile installs
+- #1643: @Flink Fix generated nginx config when NO_VHOST=1
+- #1644: @mmerickel Watch dokku events through a logrotate
+- #1647: @callahad Resolve SC2115: 'Use "${var:?}" to ensure this never expands to /'
+- #1648: @callahad Resolve SC2154: 'variable is referenced but not assigned'
+- #1649: @callahad Resolve SC2164: 'Use cd ... || exit in case cd fails.'
+- #1650: @callahad Resolve SC2148: 'target shell is unknown'
+- #1651: @callahad Resolve SC2029: 'this expands on client side'
+- #1652: @callahad Resolve SC2143: 'Instead of [ -n $(foo | grep bar) ], use foo | grep -q bar'
+- #1653: @callahad Resolve SC2145: 'Argument mixes string and array.'
+- #1655: @callahad Resolve SC2162: 'read without -r mangles backslashes'
+- #1656: @callahad Resolve SC2001: 'See if you can use ${var//search/replace} instead'
+- #1660: @callahad Fixup debian/control for Debian
+- #1662: @xadh00m Only return users of group 'adm'
+
+### New Features
+
+- #1607: @josegonzalez Dokku support for Debian Jessie installation
+- #1610: @kdomanski Add post-stop plugn trigger
+- #1612: @Flink Add multiple options to the logs plugin
+- #1613: @kdomanski Add ps:restore to start applications which weren't manually stopped
+- #1628: @michaelshobbs Move RESTORE variable to DOKKU_APP namespace
+- #1634: @callahad Allow installation of bats via homebrew
+- #1645: @rvalyi Add ability to access git repo via ssh
+- #1664: @michaelshobbs Add $REV to pre-receive-app call
+
+### Documentation
+
+- #1605: @josegonzalez Make commented output a bit more readable
+- #1621: @josegonzalez Document `--force` option for `:destroy` commands
+- #1623: @sedouard Add Azure Documentation
+- #1624: @u2mejc Add trace to help output
+- #1626: @josegonzalez Add official dokku-copy-files-to-image plugin
+- #1630: @adamwolf Enabling tracing is actually 'dokku trace on'
+- #1633: @elia Add a warning regarding the use of `trace on`
+- #1635: @callahad Remove deprecated Linode stackscript
+- #1657: @kimausloos Various small doc updates
+
+## 0.4.3
+
+This release was mainly a documentation release/bugfix.
+
+One major removal was is that as of 0.4.3, we no longer restart containers automatically on failure via docker. This feature was introduced in 0.4.0, and caused issues with duplicate containers being started on server reboot. Until the docker api for container restarts stabilizes, we will not be able to provide this functionality within Dokku.
+
+If desired, you may replicate this functionality using the official `docker-options` plugin.
+
+### Bug Fixes
+
+- #1560: @darklow Fixes issue where SSL and non-SSL templates cannot be used at the same time
+- #1566: @michaelshobbs Fix logic error in enabling nginx
+- #1568: @josegonzalez Remove 'connection closed' messages from dokku ssh client
+- #1574: @josegonzalez Ensure the user has a valid hostname set during installation
+- #1585: @michaelshobbs Ensure dokku can read nginx logs and don't remove other perms
+- #1589: @michaelshobbs Patch broken nginx 1.8.0 logrotate script
+- #1591: @michaelshobbs Remove docker restart policy until the docker api stabilizes
+- #1603: @josegonzalez Add missing plugin triggers
+Quiet client #1568
+
+### New Features
+
+- #1490: @vijayviji Add windows-specific vagrant setup
+- #1563: @kdomanski Cleanup all dead containers in dokku cleanup
+- #1590: @michaelshobbs Trigger docker-args-build for dockerfile deployments
+- #1600: @josegonzalez Upgrade to Herokuish 0.3.4
+- #1602: @josegonzalez Add pre-receive-app plugin trigger
+
+### Documentation
+
+- #1556: @josegonzalez Use proper cdn link for css asset
+- #1557: @josegonzalez Code styling changes
+- #1561: @josegonzalez Set dokku-acl compatibility to 0.4.0+
+- #1562: @josegonzalez Documentation Overhaul
+- #1573: @mateusortiz Add link to license
+- #1577: @Flink Add official redirect plugin
+- #1587: @josegonzalez Update "reporting other issues" to include `docker inspect`
+- #1598: @adamwolf Add missing bootstrap.sh step
+- #1599: @ssd532 Fix a few grammatical mistakes
+- #1601: @ojacquemart Fix typo
+- #1604: @josegonzalez Add every type of favicon to all templates
+
+## 0.4.2
+
+This release was mainly a documentation release, with a few notable features:
+
+- You can now use the commercial version of docker-engine with dokku.
+- You can now name your containers using the official `named-containers` plugin
+
+Huge thanks to @Flink for working on our official plugins and adding official [basic auth](https://github.com/dokku/dokku-http-auth), [couchdb](https://github.com/dokku/dokku-couchdb), and [site maintenance](https://github.com/dokku/dokku-maintenance) plugins!
+
+### Bug Fixes
+
+- #1530: @Flink Fix nginx configuration for SSL
+
+### New Features
+
+- #1515: @leonardodino Allow local prebuilt stack sourcing
+- #1536 #1537: @josegonzalez Add docker-engine-cs as docker-engine alternative
+- #1511: @Flink Add `named-containers` as a core plugin
+
+### Documentation
+
+- #1520: @kimausloos Add `dokku` command-prefix to `plugin:install` command
+- #1519: @3onyc Fix typos in documentation
+- #1521: @edm00se Use correct url to bootstrap.sh in README.md
+- #1522: @josegonzalez Avoid redirects and use raw.githubusercontent.com for github links
+- #1523 #1548: @callahad Make room for the longer bootstrap.sh URL
+- #1524: @callahad Document idiosyncracies with Linode
+- #1529: @pzula Adds helpful information regarding whitespacing when setting config
+- #1525 #1550: @josegonzalez Add gratipay shield to readme
+- #1544 #1545 #1547 #1551: @josegonzalez @Flink Update compatibility for community plugins
+- #1546: @josegonzalez Add missing description to history output in HISTORY.md
+- #1552 #1553 #1555: @josegonzalez Various documentation styling tweaks
+
+## 0.4.1
+
+This release is primarily a bugfix and documentation update. In 0.4.0, we incorrectly handled setting environment variables in certain cases, resulting in misconfigured applications. We recommend that all users upgrade from 0.4.1 as soon as possible.
+
+One new feature is colorized logging output, which should make it easier to debug application logging output when deploying multiple processes.
+
+### Bug Fixes
+
+- #1494: @callahad Correctly install packages for DOKKU_TAG=v0.4.0
+- #1496: @callahad Don't prompt users when installing dokku package
+- #1514: @michaelshobbs Do not use exit 0 in config functions and fix CURL environment variable setting
+
+### New Features
+
+- #1482: @Flink Strip the `dokku-` part from plugins on install
+- #1500: @jazzzz Log user name and fingerprint in events
+- #1512: @Flink Colorize output from logs
+
+### Documentation
+
+- #1485: @matto1990 Update Slack plugin compatability
+- #1488: @josegonzalez Update plugins list with compatibility changes
+- #1491: @josegonzalez Promote [maintenance](https://github.com/dokku/dokku-maintenance) and [http basic auth](https://github.com/dokku/dokku-http-auth) plugins to official status
+- #1492: @josegonzalez Upgrade hostname plugin to 0.4.0+ compatibility
+- #1501: @josegonzalez Clarify bootstrap installation documentation
+- #1502: @josegonzalez Update dokku-apt compatibility
+- #1504: @michaelshobbs Change plugin install doc to show one-step method
+
 ## 0.4.0
 
 This is our first minor release in almost a year. Many new features and removals have occurred, so here is a neat summary:
 
-- Plugins are now triggered via `plugn`. Notably, you'll need add a `plugin.toml` to describe the plugin as well as use `plugn trigger` instead of `pluginhook` to trigger plugin callbacks. Please see the [plugin creation documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation/) for more details.
-- A few new official plugins have been added to the core, including [image tagging](http://progrium.viewdocs.io/dokku/application-deployment/), [certificate management](http://progrium.viewdocs.io/dokku/deployment/ssl-configuration/), a tar-based deploy solution, and much more. Check out the *New Features* section for more details.
-- We've removed a few deprecated plugin callbacks. Please see the [plugin triggers documentation](http://progrium.viewdocs.io/dokku/development/plugin-triggers/) to see what is available.
+- Plugins are now triggered via `plugn`. Notably, you'll need add a `plugin.toml` to describe the plugin as well as use `plugn trigger` instead of `pluginhook` to trigger plugin callbacks. Please see the [plugin creation documentation](http://dokku.viewdocs.io/dokku/development/plugin-creation/) for more details.
+- A few new official plugins have been added to the core, including [image tagging](http://dokku.viewdocs.io/dokku/application-deployment/), [certificate management](http://dokku.viewdocs.io/dokku/deployment/ssl-configuration/), a tar-based deploy solution, and much more. Check out the *New Features* section for more details.
+- We've removed a few deprecated plugin callbacks. Please see the [plugin triggers documentation](http://dokku.viewdocs.io/dokku/development/plugin-triggers/) to see what is available.
 - [Official datastorage plugins](https://github.com/dokku) have been created for the most commonly used datastores. If you previously used/maintained a community contributed plugin, please check these out. We'll be adding more official plugins as time goes on.
 
 Thanks to the *many* contributors for making this release our best release so far, and special thanks to both @michaelshobbs and @Flink for pushing along the `0.4.0` release!
@@ -109,13 +733,13 @@ This release is a bugfix release covering dokku packaging.
 - #1397: @josegonzalez Use https docker apt repo
 - #1394: @josegonzalez Remove `dokku plugins-install` from postinst hook
 
-### Docs Changes
+### Documentation
 
 - #1395: @adrianmoya Adding fqdn requirement
 
 ## 0.3.23
 
-This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://progrium.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!
+This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://dokku.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!
 
 ### Bug Fixes
 
@@ -136,7 +760,7 @@ This release is a bugfix release mostly covering installation and nginx issues.
 - #1359: @michaelshobbs allow DOKKU_WAIT_TO_RETIRE to be defined per app
 - #1365: @michaelshobbs support dockerfile images that don't include bash
 
-### Docs Changes
+### Documentation
 
 - #1305: @josegonzalez Updated documentation site
 - #1321: @fwolfst Mention alternative to nginx.conf templates: include-dir.
@@ -175,7 +799,7 @@ This release is a general bugfix release, with improvements to handling of nginx
 - #1291: @michaelshobbs Refactored interface for managing global/local app configuration
 - #1299: @SonicHedgehog Set X-Forwarded-Proto header if TLS is enabled when running checks
 
-### Docs Changes
+### Documentation
 
 - #1273: @alessio Add docs for the events plugin
 - #1276: @josegonzalez Reorder and deprecate a few plugins
@@ -216,7 +840,7 @@ This release pegs Dokku to Docker 1.6.2. Docker 1.7.0 introduced changes in `doc
 - #1251: @josegonzalez Fallback to using /etc/init.d/nginx reload directly to restart nginx
 - #1264: @josegonzalez Require lxc-docker-1.6.2
 
-### Docs Changes
+### Documentation
 
 - #1252: @josegonzalez Fix ssh port for vagrant installation. Closes #1139. [ci skip]
 - #1250: @josegonzalez SSL documentation is misleading
@@ -243,7 +867,7 @@ This release pegs Dokku to Docker 1.6.2. Docker 1.7.0 introduced changes in `doc
 - #1227: @Flink Use --no-cache when building Dockerfile
 - #1246: @josegonzalez Ensure we call apt-get before installing packages
 
-### Docs Changes
+### Documentation
 
 - #1168: @cjblomqvist [docs] Update git-rev plugin to point to maintained version
 - #1180: @sherbondy [docs] Clarify usage around official dokku `docker-options` plugin

ISSUE_TEMPLATE.md

@@ -0,0 +1,45 @@
+Description of problem:
+
+
+Output of the following commands
+
+- `uname -a`:
+- `free -m`:
+- `docker version`:
+- `docker -D info`:
+- `sigil -v`:
+- `docker run -ti gliderlabs/herokuish:latest herokuish version`:
+- `dokku version`:
+- `dokku plugin`:
+- `docker inspect CONTAINER_ID` (if applicable):
+  (BEWARE: `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
+- `cat /home/dokku/<app>/nginx.conf` (if applicable):
+- Link to the exact repository being deployed (if possible/applicable):
+- If a deploy is failing or behaving unexpectedly:
+  - Application name
+  - The type of application being deployed (node, php, python, ruby, etc.)
+  - If using buildpacks, which custom buildpacks are in use
+  - If using a `Dockerfile`, the contents of that file
+  - If it exists, the contents of your `Procfile`.
+- Output of failing dokku commands after running `dokku trace on`
+  (BEWARE: `trace on` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
+
+Environment details (AWS, VirtualBox, physical, etc.):
+
+How was dokku installed?:
+
+How reproducible:
+
+
+Steps to Reproduce:
+1.
+2.
+3.
+
+Actual Results:
+
+
+Expected Results:
+
+
+Additional info:

Makefile

@@ -1,7 +1,8 @@
 DOKKU_VERSION = master
 
-SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand
-PLUGN_URL ?= https://github.com/progrium/plugn/releases/download/v0.1.0/plugn_0.1.0_linux_x86_64.tgz
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.4.0/sshcommand
+PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz
+SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
 PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
 DOKKU_LIB_ROOT ?= /var/lib/dokku
@@ -26,6 +27,7 @@ endif
 
 include tests.mk
 include deb.mk
+include arch.mk
 
 all:
 	# Type "make install" to install.
@@ -38,7 +40,6 @@ package_cloud:
 	package_cloud push dokku/dokku/ubuntu/trusty herokuish*.deb
 	package_cloud push dokku/dokku/ubuntu/trusty sshcommand*.deb
 	package_cloud push dokku/dokku/ubuntu/trusty plugn*.deb
-	package_cloud push dokku/dokku/ubuntu/trusty rubygem*.deb
 	package_cloud push dokku/dokku/ubuntu/trusty dokku*.deb
 
 packer:
@@ -57,6 +58,7 @@ copyfiles:
 		rm -rf ${PLUGINS_PATH}/$$plugin && \
 		cp -R plugins/$$plugin ${CORE_PLUGINS_PATH}/available && \
 		ln -s ${CORE_PLUGINS_PATH}/available/$$plugin ${PLUGINS_PATH}/available; \
+		find /var/lib/dokku/ -xtype l -delete;\
 		PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn enable $$plugin ;\
 		PLUGIN_PATH=${PLUGINS_PATH} plugn enable $$plugin ;\
 		done
@@ -72,12 +74,12 @@ version:
 	git describe --tags > ~dokku/VERSION  2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
 
 plugin-dependencies: plugn
-	dokku plugin:install-dependencies --core
+	sudo -E dokku plugin:install-dependencies --core
 
 plugins: plugn docker
-	dokku plugin:install --core
+	sudo -E dokku plugin:install --core
 
-dependencies: apt-update sshcommand plugn docker help2man man-db
+dependencies: apt-update sshcommand plugn docker help2man man-db sigil
 	$(MAKE) -e stack
 
 apt-update:
@@ -98,12 +100,16 @@ plugn:
 	wget -qO /tmp/plugn_latest.tgz ${PLUGN_URL}
 	tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin
 
+sigil:
+	wget -qO /tmp/sigil_latest.tgz ${SIGIL_URL}
+	tar xzf /tmp/sigil_latest.tgz -C /usr/local/bin
+
 docker: aufs
 	apt-get install -qq -y curl
 	egrep -i "^docker" /etc/group || groupadd docker
 	usermod -aG docker dokku
 ifndef CI
-	curl -sSL https://get.docker.com/ | sh
+	wget -nv -O - https://get.docker.com/ | sh
 ifdef DOCKER_VERSION
 	apt-get install -qq -y docker-engine=${DOCKER_VERSION} || (apt-cache madison docker-engine ; exit 1)
 endif
@@ -121,9 +127,9 @@ ifdef BUILD_STACK
 	@echo "Start building herokuish from source"
 	docker images | grep gliderlabs/herokuish || (git clone ${STACK_URL} /tmp/herokuish && cd /tmp/herokuish && IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest VERSION=master make -e ${BUILD_STACK_TARGETS} && rm -rf /tmp/herokuish)
 else
-ifeq ($(shell echo ${PREBUILT_STACK_URL} | egrep -q 'http.*://' && echo $$?),0)
+ifeq ($(shell echo ${PREBUILT_STACK_URL} | egrep -q 'http.*://|file://' && echo $$?),0)
 	@echo "Start importing herokuish from ${PREBUILT_STACK_URL}"
-	docker images | grep gliderlabs/herokuish || curl --silent -L ${PREBUILT_STACK_URL} | gunzip -cd | docker import - gliderlabs/herokuish
+	docker images | grep gliderlabs/herokuish || wget -nv -O - ${PREBUILT_STACK_URL} | gunzip -cd | docker import - gliderlabs/herokuish
 else
 	@echo "Start pulling herokuish from ${PREBUILT_STACK_URL}"
 	docker images | grep gliderlabs/herokuish || docker pull ${PREBUILT_STACK_URL}
@@ -140,12 +146,7 @@ count:
 	@find tests -type f -not -name .DS_Store | xargs cat | sed 's/^$$//g' | wc -l
 
 dokku-installer:
-	apt-get install -qq -y ruby
-	test -f /var/lib/dokku/.dokku-installer-created || gem install rack -v 1.5.2 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || gem install rack-protection -v 1.5.3 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || gem install sinatra -v 1.4.5 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || gem install tilt -v 1.4.1 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || ruby contrib/dokku-installer.rb onboot
+	test -f /var/lib/dokku/.dokku-installer-created || python contrib/dokku-installer.py onboot
 	test -f /var/lib/dokku/.dokku-installer-created || service dokku-installer start
 	test -f /var/lib/dokku/.dokku-installer-created || service nginx reload
 	test -f /var/lib/dokku/.dokku-installer-created || touch /var/lib/dokku/.dokku-installer-created
@@ -155,4 +156,3 @@ vagrant-acl-add:
 
 vagrant-dokku:
 	vagrant ssh -- "sudo -H -u root bash -c 'dokku $(RUN_ARGS)'"
-

README.md

@@ -1,4 +1,4 @@
-# Dokku [![Build Status](https://img.shields.io/circleci/project/progrium/dokku.svg "Build Status")](https://circleci.com/gh/progrium/dokku/tree/master) [![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=dokku) [![Documentation](https://img.shields.io/badge/docs-viewdocs-blue.svg "Viewdocs")](http://progrium.viewdocs.io/dokku/)
+# Dokku [![Build Status](https://img.shields.io/circleci/project/dokku/dokku/master.svg?style=flat-square "Build Status")](https://circleci.com/gh/dokku/dokku/tree/master) [![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg?style=flat-square "IRC Freenode")](https://webchat.freenode.net/?channels=dokku) [![Slack Group](https://img.shields.io/badge/irc-slack-blue.svg?style=flat-square "Slack Group")](https://glider-slackin.herokuapp.com/) [![Documentation](https://img.shields.io/badge/docs-viewdocs-blue.svg?style=flat-square "Viewdocs")](http://dokku.viewdocs.io/dokku/) [![Gratipay](https://img.shields.io/gratipay/dokku.svg?style=flat-square)](https://gratipay.com/dokku/)
 
 Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. Sponsored by our friends at [Deis](http://deis.io/).
 
@@ -10,24 +10,24 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S
 
 To install the latest stable release, you can run the following commands as a user that has access to `sudo`:
 
-    wget https://raw.github.com/progrium/dokku/v0.4.0/bootstrap.sh
-    sudo DOKKU_TAG=v0.4.0 bash bootstrap.sh
+    wget https://raw.githubusercontent.com/dokku/dokku/v0.5.6/bootstrap.sh
+    sudo DOKKU_TAG=v0.5.6 bash bootstrap.sh
 
 ### Upgrading
 
-[View the docs for upgrading](http://progrium.viewdocs.io/dokku/upgrading) from an older version of Dokku.
+[View the docs for upgrading](http://dokku.viewdocs.io/dokku/upgrading) from an older version of Dokku.
 
 ## Documentation
 
-Full documentation - including advanced installation docs - are available online at [docs](http://progrium.viewdocs.io/dokku/)
+Full documentation - including advanced installation docs - are available online at [docs](http://dokku.viewdocs.io/dokku/)
 
 ## Support
 
-You can use [Github Issues](https://github.com/progrium/dokku/issues), check [Troubleshooting](http://progrium.viewdocs.io/dokku/troubleshooting) in the documentation, or join us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku)
+You can use [Github Issues](https://github.com/dokku/dokku/issues), check [Troubleshooting](http://dokku.viewdocs.io/dokku/troubleshooting) in the documentation, or join us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku)
 
 ## Contribution
 
-After checking [Github Issues](https://github.com/progrium/dokku/issues), the [Troubleshooting Guide](http://progrium.viewdocs.io/dokku/troubleshooting) or having a chat with us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku), feel free to fork and create a Pull Request.
+After checking [Github Issues](https://github.com/dokku/dokku/issues), the [Troubleshooting Guide](http://dokku.viewdocs.io/dokku/troubleshooting) or having a chat with us on [freenode in #dokku](https://webchat.freenode.net/?channels=%23dokku), feel free to fork and create a Pull Request.
 
 While we may not merge your PR as is, they serve to start conversations and improve the general dokku experience for all users.
 
@@ -37,4 +37,4 @@ Dokku is currently sponsored by the enterprise grade, multi-host PaaS project [D
 
 ## License
 
-MIT
+[MIT License](https://github.com/dokku/dokku/blob/master/LICENSE) © Jeff Lindsay

SPONSORS

@@ -1 +1,2 @@
-Deis	http://deis.io
+Deis	       http://deis.io
+DigitalOcean https://www.digitalocean.com/

Vagrantfile

@@ -2,6 +2,7 @@
 # vi: set ft=ruby :
 
 BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-14.04"
+BOX_CPUS = ENV["BOX_CPUS"] || "1"
 BOX_MEMORY = ENV["BOX_MEMORY"] || "1024"
 DOKKU_DOMAIN = ENV["DOKKU_DOMAIN"] || "dokku.me"
 DOKKU_IP = ENV["DOKKU_IP"] || "10.0.0.2"
@@ -18,27 +19,57 @@ Vagrant::configure("2") do |config|
   config.ssh.forward_agent = true
 
   config.vm.box = BOX_NAME
-  config.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
 
   config.vm.provider :virtualbox do |vb|
     vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
     # Ubuntu's Raring 64-bit cloud image is set to a 32-bit Ubuntu OS type by
     # default in Virtualbox and thus will not boot. Manually override that.
     vb.customize ["modifyvm", :id, "--ostype", "Ubuntu_64"]
+    vb.customize ["modifyvm", :id, "--cpus", BOX_CPUS]
     vb.customize ["modifyvm", :id, "--memory", BOX_MEMORY]
   end
 
+  config.vm.provider :vmware_fusion do |v, override|
+    v.vmx["memsize"] = BOX_MEMORY
+  end
+
   config.vm.define "empty", autostart: false
 
   config.vm.define "dokku", primary: true do |vm|
+    vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
     vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
+
+    # Use the same nameserver as the host machine in order to avoid the "too many redirects" problem.
+    vm.vm.provider :virtualbox do |vb|
+      vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
+      vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
+    end
+
     vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
     vm.vm.provision :shell, :inline => "cd /root/dokku && make dokku-installer"
+    vm.vm.provision :shell do |s|
+      s.inline = <<-EOT
+        echo '"\e[5~": history-search-backward' > /root/.inputrc
+        echo '"\e[6~": history-search-forward' >> /root/.inputrc
+        echo 'set show-all-if-ambiguous on' >> /root/.inputrc
+        echo 'set completion-ignore-case on' >> /root/.inputrc
+      EOT
+    end
+  end
+
+  # For windows users. Sharing folder from windows creates problem with sym links and so, sync the repo instead from GOS.
+  config.vm.define "dokku-windows", autostart: false do |vm|
+    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
+    vm.vm.hostname = "#{DOKKU_DOMAIN}"
+    vm.vm.network :private_network, ip: DOKKU_IP
+    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null"
+    vm.vm.provision :shell, :inline => "cd /vagrant/ && export DOKKU_BRANCH=`git symbolic-ref -q --short HEAD 2>/dev/null` && export DOKKU_TAG=`git describe --tags --exact-match 2>/dev/null` && cd /root/ && cp /vagrant/bootstrap.sh ./ && bash bootstrap.sh"
   end
 
   config.vm.define "dokku-deb", autostart: false do |vm|
+    vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
     vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
@@ -46,13 +77,24 @@ Vagrant::configure("2") do |config|
   end
 
   config.vm.define "build", autostart: false do |vm|
+    vm.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
     vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
-    vm.vm.provision :shell, :inline => "apt-get update > /dev/null && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
+    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
     vm.vm.provision :shell, :inline => "cd /root/dokku && make deb-all"
   end
 
+  config.vm.define "build-arch", autostart: false do |vm|
+    vm.vm.box = "bugyt/archlinux"
+    vm.vm.synced_folder File.dirname(__FILE__), "/dokku"
+    vm.vm.synced_folder "#{File.dirname(__FILE__)}/../dokku-arch", "/dokku-arch"
+    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
+    vm.vm.hostname = "#{DOKKU_DOMAIN}"
+    vm.vm.network :private_network, ip: DOKKU_IP
+    vm.vm.provision :shell, :inline => "cd /dokku && make arch-all", privileged: false
+  end
+
   if Pathname.new(PUBLIC_KEY_PATH).exist?
     config.vm.provision :file, source: PUBLIC_KEY_PATH, destination: '/tmp/id_rsa.pub'
     config.vm.provision :shell, :inline => "rm -f /root/.ssh/authorized_keys && mkdir -p /root/.ssh && sudo cp /tmp/id_rsa.pub /root/.ssh/authorized_keys"

arch.mk

@@ -0,0 +1,28 @@
+.PHONY: arch-all arch-dokku
+
+arch-all: arch-dokku
+	echo "Done"
+
+arch-setup:
+	echo "-> Updating pacman repository and installing package helper"
+	sudo pacman -Sy
+	sudo pacman -S --needed --noconfirm pkgbuild-introspection
+
+	echo "-> Download, build and install cower (dependency of pacaur) and pacaur"
+	curl -so /tmp/cower.tar.gz https://aur.archlinux.org/cgit/aur.git/snapshot/cower.tar.gz
+	curl -so /tmp/pacaur.tar.gz https://aur.archlinux.org/cgit/aur.git/snapshot/pacaur.tar.gz
+	tar -xzf /tmp/cower.tar.gz -C /tmp
+	tar -xzf /tmp/pacaur.tar.gz -C /tmp
+	gpg --recv-key 1EB2638FF56C0C53
+	cd /tmp/cower; makepkg -sri --noconfirm
+	cd /tmp/pacaur; makepkg -sri --noconfirm
+
+	echo "-> Installing build requirements"
+	pacaur --noconfirm --noedit -S plugn
+
+arch-dokku: arch-setup
+	echo "-> Update package sums, create metadata file and test the build of the package"
+	git describe --tags > /tmp/VERSION
+	cat /tmp/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/STABLE_VERSION
+	sed -i -e "s/pkgver=.*/pkgver=`cat /tmp/STABLE_VERSION`/" /dokku-arch/PKGBUILD
+	cd /dokku-arch; updpkgsums; mksrcinfo; makepkg -fd

bootstrap.sh

@@ -1,95 +1,136 @@
-#!/bin/bash
-#
+#!/usr/bin/env bash
+set -eo pipefail; [[ $TRACE ]] && set -x
+
 # A script to bootstrap dokku.
 # It expects to be run on Ubuntu 14.04 via 'sudo'
 # If installing a tag higher than 0.3.13, it may install dokku via a package (so long as the package is higher than 0.3.13)
 # It checks out the dokku source code from Github into ~/dokku and then runs 'make install' from dokku source.
 
-# We wrap this whole script in a function, so that we won't execute
+# We wrap this whole script in functions, so that we won't execute
 # until the entire script is downloaded.
-# That's good because it prevents our output overlapping with curl's.
+# That's good because it prevents our output overlapping with wget's.
 # It also means that we can't run a partially downloaded script.
 
+ensure-environment() {
+  local FREE_MEMORY
+  echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
+  if ! command -v apt-get &>/dev/null; then
+    echo "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
+    exit 1
+  fi
 
-bootstrap () {
+  hostname -f > /dev/null 2>&1 || {
+    echo "This installation script requires that you have a hostname set for the instance. Please set a hostname for 127.0.0.1 in your /etc/hosts"
+    exit 1
+  }
+
+  FREE_MEMORY=$(grep MemTotal /proc/meminfo | awk '{print $2}')
+  if [[ "$FREE_MEMORY" -lt 1003600 ]]; then
+    echo "For dokku to build containers, it is strongly suggested that you have 1024 megabytes or more of free memory"
+    echo "If necessary, please consult this document to setup swap: http://dokku.viewdocs.io/dokku/advanced-installation/#vms-with-less-than-1gb-of-memory"
+  fi
+}
+
+install-requirements() {
+  echo "--> Ensuring we have the proper dependencies"
+  apt-get update -qq > /dev/null
+  if [[ $(lsb_release -sr) == "12.04" ]]; then
+    apt-get -qq -y install python-software-properties
+  fi
+}
+
+install-dokku() {
+  if [[ -n $DOKKU_BRANCH ]]; then
+    install-dokku-from-source "origin/$DOKKU_BRANCH"
+  elif [[ -n $DOKKU_TAG ]]; then
+    local DOKKU_SEMVER="${DOKKU_TAG//v}"
+    major=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[1]}')
+    minor=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[2]}')
+    patch=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[3]}')
+
+    # 0.3.13 was the first version with a debian package
+    if [[ "$major" -eq "0" ]] && [[ "$minor" -eq "3" ]] && [[ "$patch" -ge "13" ]]; then
+      install-dokku-from-package "$DOKKU_SEMVER"
+      echo "--> Running post-install dependency installation"
+      dokku plugins-install-dependencies
+    # 0.4.0 implemented a `plugin` plugin
+    elif [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
+      install-dokku-from-package "$DOKKU_SEMVER"
+      echo "--> Running post-install dependency installation"
+      sudo -E dokku plugin:install-dependencies --core
+    else
+      install-dokku-from-source "$DOKKU_TAG"
+    fi
+  else
+    install-dokku-from-package
+    echo "--> Running post-install dependency installation"
+    sudo -E dokku plugin:install-dependencies --core
+  fi
+}
 
 
-set -eo pipefail
-export DEBIAN_FRONTEND=noninteractive
-export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}
-
-echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
-if ! command -v apt-get &>/dev/null; then
-  echo "This installation script requires apt-get. For manual installation instructions, consult http://progrium.viewdocs.io/dokku/advanced-installation ."
-  exit 1
-fi
-
-apt-get update -qq > /dev/null
-which curl > /dev/null || apt-get install -qq -y curl
-[[ $(lsb_release -sr) == "12.04" ]] && apt-get install -qq -y python-software-properties
-
-dokku_install_source() {
-  apt-get install -qq -y git make software-properties-common
+install-dokku-from-source() {
+  local DOKKU_CHECKOUT="$1"
+  apt-get -qq -y install git make software-properties-common
   cd /root
   if [[ ! -d /root/dokku ]]; then
-    git clone $DOKKU_REPO /root/dokku
+    git clone "$DOKKU_REPO" /root/dokku
   fi
 
   cd /root/dokku
   git fetch origin
-  git checkout $DOKKU_CHECKOUT
+  [[ -n $DOKKU_CHECKOUT ]] && git checkout "$DOKKU_CHECKOUT"
   make install
 }
 
-dokku_install_package() {
+install-dokku-from-package() {
+  local DOKKU_CHECKOUT="$1"
+  local NO_INSTALL_RECOMMENDS=""
+
+  if [[ -n $DOKKU_DOCKERFILE ]]; then
+    NO_INSTALL_RECOMMENDS=" --no-install-recommends "
+  fi
+
   echo "--> Initial apt-get update"
   apt-get update -qq > /dev/null
-  apt-get install -qq -y apt-transport-https
+  apt-get -qq -y install apt-transport-https
 
   echo "--> Installing docker"
-  curl -sSL https://get.docker.com/ | sh
+  if uname -r | grep -q linode; then
+    echo "--> NOTE: Using Linode? Docker might complain about missing AUFS support."
+    echo "    See http://dokku.viewdocs.io/dokku/getting-started/install/linode/"
+    echo "    Installation will continue in 10 seconds."
+    sleep 10
+  fi
+  wget -nv -O - https://get.docker.com/ | sh
 
   echo "--> Installing dokku"
-  curl -sSL https://packagecloud.io/gpg.key | apt-key add -
+  wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
   echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | tee /etc/apt/sources.list.d/dokku.list
   apt-get update -qq > /dev/null
 
+  [[ -n $DOKKU_VHOST_ENABLE ]]  && echo "dokku dokku/vhost_enable boolean $VHOST_ENABLE"         | sudo debconf-set-selections
+  [[ -n $DOKKU_WEB_CONFIG ]]    && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG"       | sudo debconf-set-selections
+  [[ -n $DOKKU_HOSTNAME ]]      && echo "dokku dokku/hostname string $DOKKU_HOSTNAME"            | sudo debconf-set-selections
+  [[ -n $DOKKU_SKIP_KEY_FILE ]] && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | sudo debconf-set-selections
+  [[ -n $DOKKU_KEY_FILE ]]      && echo "dokku dokku/key_file string $DOKKU_KEY_FILE"            | sudo debconf-set-selections
+
   if [[ -n $DOKKU_CHECKOUT ]]; then
-    apt-get install dokku=$DOKKU_CHECKOUT
+    # shellcheck disable=SC2086
+    apt-get -qq -y $NO_INSTALL_RECOMMENDS install "dokku=$DOKKU_CHECKOUT"
   else
-    apt-get install dokku
+    # shellcheck disable=SC2086
+    apt-get -qq -y $NO_INSTALL_RECOMMENDS install dokku
   fi
 }
 
-if [[ -n $DOKKU_BRANCH ]]; then
-  export DOKKU_CHECKOUT="origin/$DOKKU_BRANCH"
-  dokku_install_source
-elif [[ -n $DOKKU_TAG ]]; then
-  export DOKKU_SEMVER="${DOKKU_TAG//v}"
-  major=$(echo $DOKKU_SEMVER | awk '{split($0,a,"."); print a[1]}')
-  minor=$(echo $DOKKU_SEMVER | awk '{split($0,a,"."); print a[2]}')
-  patch=$(echo $DOKKU_SEMVER | awk '{split($0,a,"."); print a[3]}')
-
-  # 0.3.13 was the first version with a debian package
-  if [[ "$major" -eq "0" ]] && [[ "$minor" -ge "3" ]] && [[ "$patch" -ge "13" ]]; then
-    export DOKKU_CHECKOUT="$DOKKU_SEMVER"
-    dokku_install_package
-    echo "--> Running post-install dependency installation"
-    # 0.4.0 implemented a `plugin` plugin
-    if [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
-      dokku plugin:install-dependencies --core
-    else
-      dokku plugins-install-dependencies
-    fi
-  else
-    export DOKKU_CHECKOUT="$DOKKU_TAG"
-    dokku_install_source
-  fi
-else
-  dokku_install_package
-  dokku plugin:install-dependencies --core
-fi
+main() {
+  export DEBIAN_FRONTEND=noninteractive
+  export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/dokku/dokku.git"}
 
+  ensure-environment
+  install-requirements
+  install-dokku
 }
 
-bootstrap
+main "$@"

circle.yml

@@ -1,4 +1,8 @@
 machine:
+  pre:
+    - echo 'DOCKER_OPTS="-s btrfs -e lxc --userland-proxy=false"' | sudo tee -a /etc/default/docker
+    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci-cp-workaround'
+    - sudo chmod 0755 /usr/bin/docker
   services:
     - docker
 dependencies:
@@ -6,8 +10,11 @@ dependencies:
     - "~/docker"
   override:
     - ./tests/ci/parallel_runner.sh setup: { timeout: 300 }
+    - echo "export DOKKU_SKIP_CLEANUP=true" > /home/dokku/.dokkurc/dokku_skip_cleanup
+    # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
+    - sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
   post:
     - sudo -E make -e lint
 test:
   override:
-    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 1800 }
+    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 3600 }

contrib/dokku-installer.py

@@ -0,0 +1,220 @@
+#!/usr/bin/env python2.7
+
+import cgi
+import json
+import os
+import SimpleHTTPServer
+import SocketServer
+import subprocess
+import sys
+import threading
+
+VERSION = 'v0.5.6'
+
+hostname = ''
+try:
+    command = "bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || wget -q -O - icanhazip.com'"
+    hostname = subprocess.check_output(command, shell=True)
+    if ':' in hostname:
+        hostname = ''
+except subprocess.CalledProcessError:
+    pass
+
+key_file = os.getenv('KEY_FILE', '/root/.ssh/authorized_keys')
+
+admin_keys = []
+if os.path.isfile(key_file):
+    try:
+        command = "cat {0}".format(key_file)
+        admin_keys = subprocess.check_output(command, shell=True).strip().split("\n")
+    except subprocess.CalledProcessError:
+        pass
+
+
+def check_boot():
+    if 'onboot' not in sys.argv:
+        return
+    init_dir = os.getenv('INIT_DIR', '/etc/init')
+    systemd_dir = os.getenv('SYSTEMD_DIR', '/etc/systemd/system')
+    nginx_dir = os.getenv('NGINX_DIR', '/etc/nginx/conf.d')
+
+    if os.path.exists(init_dir):
+        with open('{0}/dokku-installer.conf'.format(init_dir), 'w') as f:
+            f.write("start on runlevel [2345]\n")
+            f.write("exec {0} selfdestruct\n".format(os.path.abspath(__file__)))
+    if os.path.exists(systemd_dir):
+        with open('{0}/dokku-installer.service'.format(systemd_dir), 'w') as f:
+            f.write("[Unit]\n")
+            f.write("Description=Dokku web-installer\n")
+            f.write("\n")
+            f.write("[Service]\n")
+            f.write("ExecStart={0} selfdestruct\n".format(os.path.abspath(__file__)))
+            f.write("\n")
+            f.write("[Install]\n")
+            f.write("WantedBy=multi-user.target\n")
+            f.write("WantedBy=graphical.target\n")
+    if os.path.exists(nginx_dir):
+        with open('{0}/dokku-installer.conf'.format(nginx_dir), 'w') as f:
+            f.write("upstream dokku-installer { server 127.0.0.1:2000; }\n")
+            f.write("server {\n")
+            f.write("  listen      80;\n")
+            f.write("  location    / {\n")
+            f.write("    proxy_pass  http://dokku-installer;\n")
+            f.write("  }\n")
+            f.write("}\n")
+
+    subprocess.call('rm -f /etc/nginx/sites-enabled/*', shell=True)
+    sys.exit(0)
+
+
+class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+    def do_GET(self):
+        content = PAGE.replace('{VERSION}', VERSION)
+        content = content.replace('{HOSTNAME}', hostname)
+        content = content.replace('{ADMIN_KEYS}', "\n".join(admin_keys))
+        self.send_response(200)
+        self.end_headers()
+        self.wfile.write(content)
+
+    def do_POST(self):
+        if self.path not in ['/setup', '/setup/']:
+            return
+
+        params = cgi.FieldStorage(fp=self.rfile,
+                                  headers=self.headers,
+                                  environ={
+                                      'REQUEST_METHOD': 'POST',
+                                      'CONTENT_TYPE': self.headers['Content-Type']})
+
+        dokku_root = os.getenv('DOKKU_ROOT', '/home/dokku')
+        if 'vhost' in params and params['vhost'].value == 'true':
+            with open('{0}/VHOST'.format(dokku_root), 'w') as f:
+                f.write(params['hostname'].value)
+        else:
+            try:
+                os.remove('{0}/VHOST'.format(dokku_root))
+            except OSError:
+                pass
+        with open('{0}/HOSTNAME'.format(dokku_root), 'w') as f:
+            f.write(params['hostname'].value)
+
+
+        command = ['sshcommand', 'acl-add', 'dokku', 'admin']
+        for key in params['keys'].value.split("\n"):
+            proc = subprocess.Popen(command, stdin=subprocess.PIPE)
+            proc.stdin.write(key)
+            proc.stdin.close()
+            proc.wait()
+
+        if 'selfdestruct' in sys.argv:
+            DeleteInstallerThread()
+
+        self.send_response(200)
+        self.end_headers()
+        self.wfile.write(json.dumps({'status': 'ok'}))
+
+
+class DeleteInstallerThread(object):
+    def __init__(self, interval=1):
+        thread = threading.Thread(target=self.run, args=())
+        thread.daemon = True
+        thread.start()
+
+    def run(self):
+        command = "rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start"
+        try:
+            subprocess.call(command, shell=True)
+        except:
+            pass
+
+        command = "rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && stop dokku-installer"
+        try:
+            subprocess.call(command, shell=True)
+        except:
+            pass
+
+
+def main():
+    check_boot()
+
+    port = int(os.getenv('PORT', 2000))
+    httpd = SocketServer.TCPServer(("", port), GetHandler)
+    print "Listening on 0.0.0.0:{0}, CTRL+C to stop".format(port)
+    httpd.serve_forever()
+
+
+PAGE = """
+<html>
+<head>
+  <title>Dokku Setup</title>
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+</head>
+<body>
+  <div class="container" style="width: 640px;">
+  <form id="form" role="form">
+    <h1>Dokku Setup <small>{VERSION}</small></h1>
+    <div class="form-group">
+      <h3><small style="text-transform: uppercase;">Admin Access</small></h3>
+      <label for="key">Public Key</label><br />
+      <textarea class="form-control" name="keys" rows="7" id="key">{ADMIN_KEYS}</textarea>
+    </div>
+    <div class="form-group">
+      <h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
+      <div class="form-group">
+        <label for="hostname">Hostname</label>
+        <input class="form-control" type="text" id="hostname" name="hostname" value="{HOSTNAME}" />
+      </div>
+      <div class="checkbox">
+        <label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
+      </div>
+      <p>Your app URLs will look like:</p>
+      <pre id="example">http://hostname:port</pre>
+    </div>
+    <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
+  </form>
+  </div>
+  <div id="error-output"></div>
+  <script>
+    function setup() {
+      if ($.trim($("#key").val()) == "") {
+        alert("Your admin public key cannot be blank.")
+        return
+      }
+      if ($.trim($("#hostname").val()) == "") {
+        alert("Your hostname cannot be blank.")
+        return
+      }
+      data = $("#form").serialize()
+      $("input,textarea,button").prop("disabled", true);
+      $.post('/setup', data)
+        .done(function() {
+          $("#result").html("Success!")
+          window.location.href = "http://progrium.viewdocs.io/dokku/application-deployment";
+        })
+        .fail(function(data) {
+          $("#result").html("Something went wrong...")
+          $("#error-output").html(data.responseText)
+        });
+    }
+    function update() {
+      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
+        alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
+        $("#vhost").prop('checked', false);
+      }
+      if ($("#vhost").is(':checked')) {
+        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
+      } else {
+        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
+      }
+    }
+    $("#vhost").change(update);
+    $("#hostname").change(update);
+    update();
+  </script>
+</body>
+</html>
+"""
+
+if __name__ == "__main__":
+    main()

contrib/dokku-installer.rb

@@ -1,125 +0,0 @@
-#!/usr/bin/env ruby
-require "sinatra"
-require "open3"
-
-if ARGV[0] == "onboot"
-  File.open("/etc/init/dokku-installer.conf", "w") do |f|
-    f.puts "start on runlevel [2345]"
-    f.puts "exec #{File.absolute_path(__FILE__)} selfdestruct"
-  end
-  File.open("/etc/nginx/conf.d/dokku-installer.conf", "w") do |f|
-    f.puts "upstream dokku-installer { server 127.0.0.1:2000; }"
-    f.puts "server {"
-      f.puts "  listen      80;"
-      f.puts "  location    / {"
-      f.puts "    proxy_pass  http://dokku-installer;"
-      f.puts "  }"
-    f.puts "}"
-  end
-  `rm -f /etc/nginx/sites-enabled/*`
-  puts "Installed Upstart service and default Nginx virtualhost for installer to run on boot."
-  exit
-end
-
-version   = "v0.4.0"
-dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
-admin_keys  = `cat /root/.ssh/authorized_keys`.split("\n")
-hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
-template  = DATA.read
-
-set :port, 2000
-set :environment, :production
-disable :protection
-
-get "/" do
-  ERB.new(template).result binding
-end
-
-post "/setup" do
-  if params[:vhost] == "true"
-    File.open("#{dokku_root}/VHOST", "w") {|f| f.write params[:hostname] }
-  else
-    `rm #{dokku_root}/VHOST`
-  end
-  File.open("#{dokku_root}/HOSTNAME", "w") {|f| f.write params[:hostname] }
-  keys = params[:keys].split("\n")
-  keys.each do |k|
-    Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => k)
-  end
-  Thread.new {
-    `rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start`
-    `rm /etc/init/dokku-installer.conf && stop dokku-installer`
-  }.run if ARGV[0] == "selfdestruct"
-end
-
-__END__
-<html>
-<head>
-  <title>Dokku Setup</title>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-</head>
-<body>
-  <div class="container" style="width: 640px;">
-  <form id="form" role="form">
-    <h1>Dokku Setup <small><%= version %></small></h1>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Admin Access</small></h3>
-      <label for="key">Public Key</label><br />
-      <textarea class="form-control" name="keys" rows="7" id="key"><% admin_keys.each do |key| %><%= key + "\n" %><% end %></textarea>
-    </div>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
-      <div class="form-group">
-        <label for="hostname">Hostname</label>
-        <input class="form-control" type="text" id="hostname" name="hostname" value="<%= hostname %>" />
-      </div>
-      <div class="checkbox">
-        <label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
-      </div>
-      <p>Your app URLs will look like:</p>
-      <pre id="example">http://hostname:port</pre>
-    </div>
-    <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
-  </form>
-  </div>
-  <div id="error-output"></div>
-  <script>
-    function setup() {
-      if ($.trim($("#key").val()) == "") {
-        alert("Your admin public key cannot be blank.")
-        return
-      }
-      if ($.trim($("#hostname").val()) == "") {
-        alert("Your hostname cannot be blank.")
-        return
-      }
-      data = $("#form").serialize()
-      $("input,textarea,button").prop("disabled", true);
-      $.post('/setup', data)
-        .done(function() {
-          $("#result").html("Success!")
-          window.location.href = "http://progrium.viewdocs.io/dokku/application-deployment";
-        })
-        .fail(function(data) {
-          $("#result").html("Something went wrong...")
-          $("#error-output").html(data.responseText)
-        });
-    }
-    function update() {
-      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
-        alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
-        $("#vhost").prop('checked', false);
-      }
-      if ($("#vhost").is(':checked')) {
-        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
-      } else {
-        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
-      }
-    }
-    $("#vhost").change(update);
-    $("#hostname").change(update);
-    update();
-  </script>
-</body>
-</html>

contrib/dokku_client.sh

@@ -23,7 +23,7 @@ random_name() {
  UPPER_APPNAME="${MOVES[${NUM1}]}-${MOVES[${NUM2}]}-${NAMES[${NUM3}]}"
 
  [[ "$BASH_VERSION" =~ 4.* ]] && lower_appname=${UPPER_APPNAME,,}
- [[ -z "$lower_appname" ]] && lower_appname=$(echo $UPPER_APPNAME | tr '[:upper:]' '[:lower:]')
+ [[ -z "$lower_appname" ]] && lower_appname=$(echo "$UPPER_APPNAME" | tr '[:upper:]' '[:lower:]')
  echo "$lower_appname"
 }
 
@@ -41,6 +41,8 @@ if [[ -z $DOKKU_HOST ]]; then
   fi
 fi
 
+export DOKKU_PORT=${DOKKU_PORT:=22}
+
 if [[ ! -z $DOKKU_HOST ]]; then
   _dokku() {
     appname=""
@@ -52,76 +54,43 @@ if [[ ! -z $DOKKU_HOST ]]; then
       echo "This is not a git repository"
     fi
 
-    if [[ "$appname" != "" ]] && [[ -n "$*" ]]; then
-      case "$1" in
-        apps|backup*|help|plugins*|ps:restartall|trace|version)
-          true
-          ;;
-        apps:destroy)
-          if [[ -z "$2" ]] || [[ "$2" == "force" ]]; then
-            donotshift="YES"
-          fi
-          ;;
-        *)
-          donotshift="YES"
-          ;;
-      esac
-    fi
-
-    if [[ "$1" = "apps:create" ]] && [[ -z "$2" ]]; then
-      appname=$(random_name)
-      counter=0
-      while ssh "dokku@$DOKKU_HOST" apps 2>/dev/null| grep -q "$appname"; do
-        if [[ $counter -ge 100 ]]; then
-          echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
-          ssh "dokku@$DOKKU_HOST" apps
-          exit 1
-        else
+    case "$1" in
+      apps:create)
+        if [[ -z "$2" ]]; then
           appname=$(random_name)
-          counter=$((counter+1))
+          counter=0
+          while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_HOST" apps 2>/dev/null| grep -q "$appname"; do
+            if [[ $counter -ge 100 ]]; then
+              echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
+              ssh -p "$DOKKU_PORT" "dokku@$DOKKU_HOST" apps
+              exit 1
+            else
+              appname=$(random_name)
+              counter=$((counter+1))
+            fi
+          done
+        else
+          appname="$2"
         fi
-      done
-      if git remote add dokku "dokku@$DOKKU_HOST:$appname"
-      then
-        echo "-----> Dokku remote added at $DOKKU_HOST"
-        echo "-----> Application name is $appname"
-      else
-        echo "!      Dokku remote not added! Do you already have a dokku remote?"
-        return
-      fi
-      git push dokku master
-      return $?
-    fi
-
-    if [[ -z "$donotshift" ]]; then
-      ssh -t "dokku@$DOKKU_HOST" "$@"
-      exit $?
-    fi
-
-    if [[ -z "$verb" ]]; then
-      if [[ ! "$1" =~ --* ]]; then
-        verb=$1
-        shift
-
-        if [[ "$1" == "$appname" ]]; then
-          shift
+        if git remote add dokku "dokku@$DOKKU_HOST:$appname"; then
+          echo "-----> Dokku remote added at $DOKKU_HOST"
+          echo "-----> Application name is $appname"
+        else
+          echo "!      Dokku remote not added! Do you already have a dokku remote?"
+          return
         fi
+        git push dokku master
+        return $?
+        ;;
+    apps:destroy)
+      git remote remove dokku
+      ;;
+    esac
 
-        args="$*"
-      else
-        long_args="--"
-        for arg in "$@"; do
-          if [[ "$arg" =~ --* ]]; then
-            long_args+=" $arg"
-            args=("${args[@]/$arg}")
-          else
-             verb="$arg"
-          fi
-        done
-      fi
-    fi
-    # shellcheck disable=SC2086
-    ssh -t "dokku@$DOKKU_HOST" $long_args "$verb" "$appname" "${args[@]}"
+    [[ -n "$@" ]] && [[ -n "$appname" ]] && app_arg="--app $appname"
+    # echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_HOST -- $app_arg $@"
+    # shellcheck disable=SC2068,SC2086
+    ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_HOST -- $app_arg $@
   }
 
   if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then

contrib/stackscript.sh

@@ -1,174 +0,0 @@
-#!/bin/bash
-# <UDF name="hostname" default="" label="Hostname for dokku instance" example="example.com">
-# <UDF name="ssh_key" default="" label="Public SSH Key for root user" example="Sets the root user's public ssh key, which is also automatically imported into the dokku installer">
-# <UDF name="notify_email" default="" Label="Send Finish Notification To" example="Email address to send notification to when finished." />
-
-logit() {
-  # Simple logging function that prepends an easy-to-find marker '=> ' and a timestamp to a message
-  TIMESTAMP=$(date -u +'%m/%d %H:%M:%S')
-  MSG="=> ${TIMESTAMP} $1"
-  echo ${MSG}
-}
-
-set_ssh_key() {
-  if [[ -n "${SSH_KEY}" ]]; then
-    logit "Setting root ssh key"
-    mkdir -p /root/.ssh
-    chmod 700 /root/.ssh
-    echo "$SSH_KEY" > /root/.ssh/authorized_keys
-    chmod 600 /root/.ssh/authorized_keys
-    chown -R root:root /root/.ssh
-  fi
-}
-
-set_passwordless_ssh() {
-  logit "Turn off password authentication and root login for SSH"
-  echo 'PasswordAuthentication no' >> /etc/ssh/sshd_config
-  service ssh restart
-}
-
-system_primary_ip() {
-  # returns the primary IP assigned to eth0
-  ifconfig eth0 | awk -F: '/inet addr:/ {print $2}' | awk '{ print $1 }'
-}
-
-set_hostname() {
-  logit "Set up hostname"
-  if [[ -n "${HOSTNAME}" ]]; then
-    echo $HOSTNAME > /etc/hostname
-    echo $IPADDR $FQDN $HOSTNAME >> /etc/hosts
-  else
-    system_primary_ip > /etc/hostname
-    echo "$(system_primary_ip) localhost" >> /etc/hosts
-  fi
-
-  IPADDR=$(/sbin/ifconfig eth0 | awk '/inet / { print $2 }' | sed 's/addr://')
-  hostname -F /etc/hostname
-}
-
-postfix_install_loopback_only() {
-  logit "Installing and configuring Postfix"
-  # Installs postfix and configure to listen only on the local interface. Also
-  # allows for local mail delivery
-
-  echo "postfix postfix/destinations string localhost.localdomain, localhost" | debconf-set-selections
-  echo "postfix postfix/mailname string localhost" | debconf-set-selections
-  echo "postfix postfix/main_mailer_type select Internet Site" | debconf-set-selections
-  echo "postfix postfix/myhostname string localhost" | debconf-set-selections
-  sudo apt-get install -qq -y postfix > /dev/null 2>&1
-  /usr/sbin/postconf -e "inet_interfaces = loopback-only"
-  #/usr/sbin/postconf -e "local_transport = error:local delivery is disabled"
-
-  touch /tmp/restart-postfix
-}
-
-notify_install_via_email() {
-  if [[ -n "${NOTIFY_EMAIL}" ]]; then
-    logit "Sending notification email to ${NOTIFY_EMAIL}"
-    /usr/sbin/sendmail "${NOTIFY_EMAIL}" <<EOD
-To: ${NOTIFY_EMAIL}
-Subject: Dokku installation is complete
-From: Dokku StackScript <no-reply@${HOSTNAME}>
-
-Your Dokku installation is complete and now ready to be configured: http://$(system_primary_ip) . Please visit this url to complete the setup of your Dokku instance.
-
-Enjoy using Dokku!
-EOD
-  fi
-}
-
-notify_restart_via_email() {
-  if [[ -n "${NOTIFY_EMAIL}" ]]; then
-    logit "Sending notification email to ${NOTIFY_EMAIL} of required restart"
-    /usr/sbin/sendmail "${NOTIFY_EMAIL}" <<EOD
-To: ${NOTIFY_EMAIL}
-Subject: Dokku Linode instance must be restarted
-From: Dokku StackScript <no-reply@${HOSTNAME}>
-
-The following linode instance must be restarted:
-
-    ${LINODE_LISHUSERNAME}
-
-Before restarting, please go to this url:
-
-    https://manager.linode.com/linodes/dashboard/${LINODE_LISHUSERNAME}
-
-Then click "Edit" next to the selected configuration profile and make the following changes:
-
-- Change the "Kernel" option to the current "pv-grub" release
-- Set the "Distro helper" option to "no"
-
-Then save your changes. Next, reboot the instance from the Linode Dashboard. You'll receive an email once the instance is available to continue the dokku installation.
-EOD
-  fi
-}
-
-setup_linode() {
-  logit "Installing via linode"
-  DEBIAN_FRONTEND=noninteractive apt-get install -qq -y linux-virtual
-  DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y grub2 grub-pc
-  DEBIAN_FRONTEND=noninteractive apt-get install -qq -y grub
-  mkdir -p /boot/grub
-  update-grub -y
-  sed -i 's/kopt=root=UUID=.* ro/kopt=root=\/dev\/xvda console=hvc0 ro quiet/g' /boot/grub/menu.lst
-  sed -i 's/# groot=(hd0,0)/# groot=(hd0)/g' /boot/grub/menu.lst
-  update-grub
-
-  cp /etc/rc.local /etc/rc.local-bak
-  cat << "EOF" > /etc/rc.local
-#!/bin/sh -e
-sudo apt-get update >> /root/setup_linode.txt 2>&1
-sudo apt-get install -y linux-image-extra-"$(uname -r)" >> /root/setup_linode.txt 2>&1
-modprobe aufs >> /root/setup_linode.txt 2>&1
-
-sudo apt-get install -y apparmor cgroup-lite >> /root/setup_linode.txt 2>&1
-
-sudo apt-get install -y dokku >> /root/setup_linode.txt 2>&1
-
-# Clean up this script so it only runs once
-rm -f /etc/rc.local
-mv /etc/rc.local-bak /etc/rc.local
-exit 0
-EOF
-  chmod +x /etc/rc.local
-}
-
-install_prerequisites() {
-  logit "Installing pre-requisites"
-  sudo apt-get update -qq > /dev/null
-  sudo apt-get install -qq -y apt-transport-https curl > /dev/null 2>&1
-
-  logit "Installing docker"
-  curl -sSL https://get.docker.com/ | sh
-
-  logit "Installing dokku"
-  curl -sSL https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
-  echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
-  sudo apt-get update -qq > /dev/null
-}
-
-install_dokku() {
-  logit "Installing pre-requisites"
-  sudo apt-get install -qq -y linux-image-extra-"$(uname -r)" > /dev/null 2>&1
-
-  logit "Installing dokku"
-  sudo apt-get install -qq -y dokku > /dev/null 2>&1
-
-  logit "Done!"
-}
-
-exec &> /root/stackscript.log
-
-set_ssh_key
-set_passwordless_ssh
-postfix_install_loopback_only
-set_hostname
-install_prerequisites
-
-if [[ -n "$LINODE_ID" ]]; then
-  setup_linode
-  notify_restart_via_email
-else
-  install_dokku
-  notify_install_via_email
-fi

deb.mk

@@ -1,83 +1,86 @@
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.3
+HEROKUISH_VERSION ?= 0.3.12
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
 
 DOKKU_DESCRIPTION = 'Docker powered mini-Heroku in around 100 lines of Bash'
-DOKKU_REPO_NAME ?= progrium/dokku
+DOKKU_REPO_NAME ?= dokku/dokku
 DOKKU_ARCHITECTURE = amd64
 
 PLUGN_DESCRIPTION = 'Hook system that lets users extend your application with plugins'
-PLUGN_REPO_NAME ?= progrium/plugn
-PLUGN_VERSION ?= 0.2.0
+PLUGN_REPO_NAME ?= dokku/plugn
+PLUGN_VERSION ?= 0.2.1
 PLUGN_ARCHITECTURE = amd64
 PLUGN_PACKAGE_NAME = plugn_$(PLUGN_VERSION)_$(PLUGN_ARCHITECTURE).deb
+PLUGN_URL = https://github.com/dokku/plugn/releases/download/v$(PLUGN_VERSION)/plugn_$(PLUGN_VERSION)_linux_x86_64.tgz
 
 SSHCOMMAND_DESCRIPTION = 'Turn SSH into a thin client specifically for your app'
-SSHCOMMAND_REPO_NAME ?= progrium/sshcommand
-SSHCOMMAND_VERSION ?= 0.1.0
+SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
+SSHCOMMAND_VERSION ?= 0.4.0
 SSHCOMMAND_ARCHITECTURE = amd64
 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v$(SSHCOMMAND_VERSION)/sshcommand
 
-GEM_ARCHITECTURE = amd64
+SIGIL_DESCRIPTION = 'Standalone string interpolator and template processor'
+SIGIL_REPO_NAME ?= gliderlabs/sigil
+SIGIL_VERSION ?= 0.4.0
+SIGIL_ARCHITECTURE = amd64
+SIGIL_PACKAGE_NAME = sigil_$(SIGIL_VERSION)_$(SIGIL_ARCHITECTURE).deb
+SIGIL_URL = https://github.com/gliderlabs/sigil/releases/download/v$(SIGIL_VERSION)/sigil_$(SIGIL_VERSION)_Linux_x86_64.tgz
 
-GOROOT = /usr/lib/go
-GOBIN = /usr/bin/go
-GOPATH = /home/vagrant/gocode
-
-.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-gems deb-plugn deb-setup deb-sshcommand
+.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-plugn deb-setup deb-sshcommand deb-sigil
 
 install-from-deb:
-	echo "--> Initial apt-get update"
+	@echo "--> Initial apt-get update"
 	sudo apt-get update -qq > /dev/null
-	sudo apt-get install -qq -y apt-transport-https curl
+	sudo apt-get install -qq -y apt-transport-https
 
-	echo "--> Installing docker"
-	curl -sSL https://get.docker.com/ | sh
+	@echo "--> Installing docker"
+	wget -nv -O - https://get.docker.com/ | sh
 
-	echo "--> Installing dokku"
-	curl -sSL https://packagecloud.io/gpg.key | apt-key add -
-	echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list
+	@echo "--> Installing dokku"
+	wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
+	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list
 	sudo apt-get update -qq > /dev/null
-	sudo apt-get install dokku
+	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku
 
-deb-all: deb-herokuish deb-dokku deb-gems deb-plugn deb-sshcommand
+deb-all: deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil
 	mv /tmp/*.deb .
-	echo "Done"
+	@echo "Done"
 
 deb-setup:
-	echo "-> Updating deb repository and installing build requirements"
-	sudo apt-get update -qq > /dev/null
-	sudo apt-get install -qq -y gcc git ruby1.9.1-dev 2>&1 > /dev/null
-	command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
-	ssh -o StrictHostKeyChecking=no git@github.com || true
+	@echo "-> Updating deb repository and installing build requirements"
+	@sudo apt-get update -qq > /dev/null
+	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -qq -y gcc git ruby-dev ruby1.9.1 > /dev/null 2>&1
+	@command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+	@ssh -o StrictHostKeyChecking=no git@github.com || true
 
 deb-herokuish: deb-setup
 	rm -rf /tmp/tmp /tmp/build $(HEROKUISH_PACKAGE_NAME)
 	mkdir -p /tmp/tmp /tmp/build
 
-	echo "-> Creating deb files"
-	echo "#!/usr/bin/env bash" >> /tmp/tmp/post-install
-	echo "sleep 5" >> /tmp/tmp/post-install
-	echo "count=\`sudo docker images | grep gliderlabs/herokuish | wc -l\`" >> /tmp/tmp/post-install
-	echo 'if [ "$$count" -ne 0 ]; then' >> /tmp/tmp/post-install
-	echo "  echo 'Removing old herokuish image'" >> /tmp/tmp/post-install
-	echo "  sudo docker rmi gliderlabs/herokuish" >> /tmp/tmp/post-install
-	echo "fi" >> /tmp/tmp/post-install
-	echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install
-	echo "sudo docker build -t gliderlabs/herokuish /var/lib/herokuish 1> /dev/null" >> /tmp/tmp/post-install
+	@echo "-> Creating deb files"
+	@echo "#!/usr/bin/env bash" >> /tmp/tmp/post-install
+	@echo "sleep 5" >> /tmp/tmp/post-install
+	@echo "count=\`sudo docker images | grep gliderlabs/herokuish | wc -l\`" >> /tmp/tmp/post-install
+	@echo 'if [ "$$count" -ne 0 ]; then' >> /tmp/tmp/post-install
+	@echo "  echo 'Removing old herokuish image'" >> /tmp/tmp/post-install
+	@echo "  sudo docker rmi gliderlabs/herokuish" >> /tmp/tmp/post-install
+	@echo "fi" >> /tmp/tmp/post-install
+	@echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install
+	@echo "sudo docker build -t gliderlabs/herokuish /var/lib/herokuish 1> /dev/null" >> /tmp/tmp/post-install
 
-	echo "-> Cloning repository"
-	git clone -q "git@github.com:$(HEROKUISH_REPO_NAME).git" /tmp/tmp/herokuish > /dev/null
+	@echo "-> Cloning repository"
+	git clone -q "https://github.com/$(HEROKUISH_REPO_NAME).git" /tmp/tmp/herokuish > /dev/null
 	rm -rf /tmp/tmp/herokuish/.git /tmp/tmp/herokuish/.gitignore
 
-	echo "-> Copying files into place"
+	@echo "-> Copying files into place"
 	mkdir -p "/tmp/build/var/lib"
 	cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish
 
-	echo "-> Creating $(HEROKUISH_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine' --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' .
+	@echo "-> Creating $(HEROKUISH_PACKAGE_NAME)"
+	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1)' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' .
 	mv *.deb /tmp
 
 deb-dokku: deb-setup
@@ -87,16 +90,19 @@ deb-dokku: deb-setup
 	cp -r debian /tmp/build/DEBIAN
 	mkdir -p /tmp/build/usr/local/bin
 	mkdir -p /tmp/build/var/lib/dokku/core-plugins/available
-	mkdir -p /tmp/build/usr/local/share/man/man1
-	mkdir -p /tmp/build/usr/local/share/dokku/contrib
+	mkdir -p /tmp/build/usr/share/man/man1
+	mkdir -p /tmp/build/usr/share/dokku/contrib
+	mkdir -p /tmp/build/usr/share/doc/dokku
 
 	cp dokku /tmp/build/usr/local/bin
+	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
 	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
 	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
 	$(MAKE) help2man
 	$(MAKE) addman
-	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/local/share/man/man1/dokku.1
-	cp contrib/dokku-installer.rb /tmp/build/usr/local/share/dokku/contrib
+	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
+	gzip -9 /tmp/build/usr/share/man/man1/dokku.1
+	cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
 	git describe --tags > /tmp/build/var/lib/dokku/VERSION
 	cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
 	git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
@@ -104,51 +110,48 @@ deb-dokku: deb-setup
 	dpkg-deb --build /tmp/build "/vagrant/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
 	mv *.deb /tmp
 
-deb-gems: deb-setup
-	rm -rf /tmp/tmp /tmp/build rubygem-*.deb
-	mkdir -p /tmp/tmp /tmp/build
-
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp rack -v 1.5.2 > /dev/null
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp rack-protection -v 1.5.3 > /dev/null
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp sinatra -v 1.4.5 > /dev/null
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp tilt -v 1.4.1 > /dev/null
-
-	find /tmp/tmp/cache -name '*.gem' | xargs -rn1 fpm -d ruby -d ruby --prefix /var/lib/gems/1.9.1 -s gem -t deb -a $(GEM_ARCHITECTURE)
-	mv *.deb /tmp
-
 deb-plugn: deb-setup
 	rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME)
-	mkdir -p /tmp/tmp /tmp/build
+	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin
 
-	echo "-> Cloning repository"
-	git clone -q "git@github.com:$(PLUGN_REPO_NAME).git" /tmp/tmp/plugn > /dev/null
-	rm -rf /tmp/tmp/plugn/.git /tmp/tmp/plugn/.gitignore
+	@echo "-> Downloading package"
+	wget -q -O /tmp/tmp/plugn-$(PLUGN_VERSION).tgz $(PLUGN_URL)
+	cd /tmp/tmp/ && tar zxf /tmp/tmp/plugn-$(PLUGN_VERSION).tgz
 
-	echo "-> Copying files into place"
-	mkdir -p /tmp/build/usr/local/bin $(GOPATH)
-	sudo apt-get update -qq > /dev/null
-	sudo apt-get install -qq -y git golang mercurial 2>&1 > /dev/null
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && cd /tmp/tmp/plugn && make deps
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && cd /tmp/tmp/plugn && go build -o plugn
-	mv /tmp/tmp/plugn/plugn /tmp/build/usr/local/bin/plugn
+	@echo "-> Copying files into place"
+	cp /tmp/tmp/plugn /tmp/build/usr/local/bin/plugn && chmod +x /tmp/build/usr/local/bin/plugn
 
-	echo "-> Creating $(PLUGN_PACKAGE_NAME)"
+	@echo "-> Creating $(PLUGN_PACKAGE_NAME)"
 	sudo fpm -t deb -s dir -C /tmp/build -n plugn -v $(PLUGN_VERSION) -a $(PLUGN_ARCHITECTURE) -p $(PLUGN_PACKAGE_NAME) --url "https://github.com/$(PLUGN_REPO_NAME)" --description $(PLUGN_DESCRIPTION) --license 'MIT License' .
 	mv *.deb /tmp
 
-deb-sshcommand: deb-setup
+deb-sshcommand:
 	rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME)
-	mkdir -p /tmp/tmp /tmp/build
+	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin
 
-	echo "-> Cloning repository"
-	git clone -q "git@github.com:$(SSHCOMMAND_REPO_NAME).git" /tmp/tmp/sshcommand > /dev/null
-	rm -rf /tmp/tmp/sshcommand/.git /tmp/tmp/sshcommand/.gitignore
+	@echo "-> Downloading package"
+	wget -q -O /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) $(SSHCOMMAND_URL)
 
-	echo "-> Copying files into place"
+	@echo "-> Copying files into place"
 	mkdir -p "/tmp/build/usr/local/bin"
-	cp /tmp/tmp/sshcommand/sshcommand /tmp/build/usr/local/bin/sshcommand
+	cp /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) /tmp/build/usr/local/bin/sshcommand
 	chmod +x /tmp/build/usr/local/bin/sshcommand
 
-	echo "-> Creating $(SSHCOMMAND_PACKAGE_NAME)"
+	@echo "-> Creating $(SSHCOMMAND_PACKAGE_NAME)"
 	sudo fpm -t deb -s dir -C /tmp/build -n sshcommand -v $(SSHCOMMAND_VERSION) -a $(SSHCOMMAND_ARCHITECTURE) -p $(SSHCOMMAND_PACKAGE_NAME) --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" --description $(SSHCOMMAND_DESCRIPTION) --license 'MIT License' .
 	mv *.deb /tmp
+
+deb-sigil: deb-setup
+	rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME)
+	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin
+
+	@echo "-> Downloading package"
+	wget -q -O /tmp/tmp/sigil-$(SIGIL_VERSION).tgz $(SIGIL_URL)
+	cd /tmp/tmp/ && tar zxf /tmp/tmp/sigil-$(SIGIL_VERSION).tgz
+
+	@echo "-> Copying files into place"
+	cp /tmp/tmp/sigil /tmp/build/usr/local/bin/sigil && chmod +x /tmp/build/usr/local/bin/sigil
+
+	@echo "-> Creating $(SIGIL_PACKAGE_NAME)"
+	sudo fpm -t deb -s dir -C /tmp/build -n sigil -v $(SIGIL_VERSION) -a $(SIGIL_ARCHITECTURE) -p $(SIGIL_PACKAGE_NAME) --url "https://github.com/$(SIGIL_REPO_NAME)" --description $(SIGIL_DESCRIPTION) --license 'MIT License' .
+	mv *.deb /tmp

debian/control

@@ -1,9 +1,11 @@
 Package: dokku
-Version: 0.3.12
-Section: base
+Version: 0.5.6
+Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, software-properties-common, docker-engine | lxc-docker, gcc, python-software-properties, man-db, herokuish, sshcommand
-Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroupfs-mount | cgroup-lite, plugn
+Depends: locales, git, make, curl, gcc, man-db, sshcommand, sigil, docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1), software-properties-common, python-software-properties
+Recommends: herokuish
+Pre-Depends: nginx (>= 1.4.6), dnsutils, apparmor, cgroupfs-mount | cgroup-lite, plugn, sudo, python2.7, debconf
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
-Description: Docker powered mini-Heroku in around 100 lines of Bash
+Description: Docker-powered PaaS that helps build and manage the lifecycle of applications
+

debian/postinst

@@ -1,9 +1,10 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -eo pipefail; [[ $TRACE ]] && set -x
 
 . /usr/share/debconf/confmodule
 
 readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
+readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
 
 case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure)
@@ -17,43 +18,63 @@ case "$1" in
     egrep -i "^docker" /etc/group || groupadd docker
     usermod -aG docker dokku
 
-    # setup plugin directories
-    # should be replaced by `plugn init`
-    mkdir -p /var/lib/dokku/core-plugins/available /var/lib/dokku/plugins/available
-    mkdir -p /var/lib/dokku/core-plugins/enabled /var/lib/dokku/plugins/enabled
-    touch /var/lib/dokku/core-plugins/config.toml /var/lib/dokku/plugins/config.toml
+    echo "Setting up storage directories"
+    mkdir -p ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
+    chown dokku:dokku -R ${DOKKU_LIB_ROOT}/data
 
-    # migrate old plugins
-    find /var/lib/dokku/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do
+    echo "Setting up plugin directories"
+    # should be replaced by `plugn init`
+    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/available ${DOKKU_LIB_ROOT}/plugins/available
+    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/enabled ${DOKKU_LIB_ROOT}/plugins/enabled
+    touch ${DOKKU_LIB_ROOT}/core-plugins/config.toml ${DOKKU_LIB_ROOT}/plugins/config.toml
+
+    echo "Migrating old plugins"
+    find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
       if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
         continue
-      elif [ -f /var/lib/dokku/plugins/$plugin/.core ]; then
-        rm -rf /var/lib/dokku/plugins/$plugin
-      elif [ ! -d /var/lib/dokku/plugins/available/$plugin ]; then
-        mv /var/lib/dokku/plugins/$plugin /var/lib/dokku/plugins/available;
+      elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
+        rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
+      elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available;
       fi
     done
 
-    # enable all core plugins
-    find /var/lib/dokku/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do
-      if [ ! -d /var/lib/dokku/plugins/available/$plugin ]; then
-        ln -s /var/lib/dokku/core-plugins/available/$plugin /var/lib/dokku/plugins/available/$plugin;
-        PLUGIN_PATH=/var/lib/dokku/core-plugins plugn enable $plugin
-        PLUGIN_PATH=/var/lib/dokku/plugins plugn enable $plugin
+    echo "Enabling all core plugins"
+    find ${DOKKU_LIB_ROOT}/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+      if [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+        ln -s ${DOKKU_LIB_ROOT}/core-plugins/available/$plugin ${DOKKU_LIB_ROOT}/plugins/available/$plugin;
+        PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn enable $plugin
+        PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn enable $plugin
       fi
     done
+    find -L ${DOKKU_LIB_ROOT} -type l -delete
+    chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins
 
+    echo "Install all core plugins"
     dokku plugin:install --core
 
-    rm -f /home/dokku/VERSION
-    cp /var/lib/dokku/STABLE_VERSION /home/dokku/VERSION
+    rm -f ${DOKKU_ROOT}/VERSION
+    cp ${DOKKU_LIB_ROOT}/STABLE_VERSION ${DOKKU_ROOT}/VERSION
 
-    if [ -f /etc/init/dokku-installer.conf ] && service dokku-installer status 2> /dev/null | grep waiting; then
-        sudo service dokku-installer start
+    if [[ -f /etc/nginx/conf.d/dokku-installer.conf ]]; then
+      echo "Setting up dokku-installer"
+      /usr/share/dokku/contrib/dokku-installer.py onboot
+
+      if command -v systemctl &>/dev/null; then
+        echo "Enabling dokku-installer"
+        systemctl enable dokku-installer
+      fi
+
+      installer_status="$(service dokku-installer status 2> /dev/null || true)"
+      if echo $installer_status | grep -Eq "(inactive|waiting)" > /dev/null; then
+        echo "Starting dokku-installer"
+        service dokku-installer start || echo "Unable to start dokku-installer"
+      fi
     fi
 
     db_get "dokku/web_config"
     if [ "$RET" = "true" ]; then
+      db_stop
       exit 0
     fi
 
@@ -70,7 +91,9 @@ case "$1" in
 
     if [ -z "${DEBCONF_RECONFIGURE}" ]; then
       db_get "dokku/key_file"
-      sshcommand acl-add dokku default < "$RET"
+      if [ -f "$RET" ]; then
+        sshcommand acl-add dokku default < "$RET" || true
+      fi
     fi
     ;;
 
@@ -80,4 +103,5 @@ case "$1" in
     ;;
 esac
 
+db_stop
 exit 0

debian/postrm

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -eo pipefail; [[ $TRACE ]] && set -x
+
+readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
+readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
+
+main() {
+  if [[ -f /etc/systemd/system/dokku-installer.conf ]] || [[ -f /etc/init/dokku-installer.conf ]]; then
+    service dokku-installer stop || true
+  fi
+
+  rm -f /etc/init/dokku-installer.conf
+  rm -f /etc/init/dokku-redeploy.conf
+  rm -f /etc/systemd/system/dokku-installer.conf
+  rm -f /etc/systemd/system/dokku-redeploy.service
+  rm -f /etc/update-motd.d/99-dokku
+
+  (nginx -t && service nginx reload) || true
+
+  if [[ "$1" == "purge" ]]; then
+    rm -f ${DOKKU_ROOT}/.dokkurc ${DOKKU_ROOT}/dokkurc ${DOKKU_ROOT}/tls
+    rm -f ${DOKKU_ROOT}/.ssh/authorized_keys ${DOKKU_ROOT}/.sshcommand
+    rm -f ${DOKKU_ROOT}/ENV ${DOKKU_ROOT}/HOSTNAME ${DOKKU_ROOT}/VERSION
+    rm -rf ${DOKKU_ROOT}/.cache
+    rm -rf ${DOKKU_LIB_ROOT}/core-plugins
+
+    rm -f ${DOKKU_LIB_ROOT}/plugins/config.toml
+    if [[ -d ${DOKKU_LIB_ROOT} ]]; then
+      find -L ${DOKKU_LIB_ROOT} -type l -delete
+      find ${DOKKU_LIB_ROOT} -type d -empty -delete
+    fi
+
+    if [[ -d ${DOKKU_ROOT} ]]; then
+      find -L ${DOKKU_ROOT} -type l -delete
+      find ${DOKKU_ROOT} -type d -empty -delete
+    fi
+
+    if [[ -e /usr/share/debconf/confmodule ]]; then
+      . /usr/share/debconf/confmodule
+      db_purge
+    fi
+  fi
+}
+
+main "$@"

debian/preinst

@@ -1,5 +1,5 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -eo pipefail; [[ $TRACE ]] && set -x
 
 . /usr/share/debconf/confmodule
 
@@ -7,14 +7,8 @@ case "$1" in
   install)
     db_get "dokku/web_config"
     if [ "$RET" = "true" ]; then
-      INIT_CONF="/etc/init/dokku-installer.conf"
       NGINX_CONF="/etc/nginx/conf.d/dokku-installer.conf"
 
-      rm -f $INIT_CONF
-      touch $INIT_CONF
-      echo 'start on runlevel [2345]' >> $INIT_CONF
-      echo 'exec /usr/local/share/dokku/contrib/dokku-installer.rb selfdestruct' >> $INIT_CONF
-
       rm -f $NGINX_CONF
       touch $NGINX_CONF
 
@@ -33,7 +27,8 @@ case "$1" in
       exit 0
     fi
 
-    if [ -z "${DEBCONF_RECONFIGURE}" ]; then
+    db_get "dokku/skip_key_file"
+    if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then
       db_get "dokku/key_file"
       if [ ! -f "$RET" ]; then
           echo "Error: keyfile '$RET' not found."

debian/prerm

@@ -0,0 +1,55 @@
+#!/bin/bash
+set -eo pipefail; [[ $TRACE ]] && set -x
+
+readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
+readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
+
+ps_backtrace() {
+  if [ $# -lt 1 ]; then
+    echo "Usage: $0 PID" > /dev/stderr
+    exit 1
+  fi
+
+  declare -i pid=$1;
+  ppid=0;
+  header_modifier="";
+  while : ; do
+    if [ $ppid -ne 0 ]; then
+      header_modifier=h;
+    fi;
+    ppid=$(ps -o ppid= $pid);
+    ps uww $header_modifier -p $pid;
+    if [ $pid -eq 1 ]; then
+      break;
+    fi;
+    pid=$ppid;
+  done;
+}
+
+main() {
+  # HACK: Ensure that we only delete data when purging dokku from the system
+  if ps_backtrace $BASHPID 2> /dev/null | grep dpkg | grep -- "--purge" > /dev/null; then
+    echo "Processing purge"
+
+    echo "Destroying deployed applications"
+    for app in $(DOKKU_QUIET_OUTPUT=1 dokku apps); do
+      dokku --force apps:destroy $app
+    done
+
+    # HACK: Only disable core plugins, as we don't know what data users store in non-core plugin directories
+    echo "Disabling all core plugins"
+    find ${DOKKU_LIB_ROOT}/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+      if [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+        rm ${DOKKU_LIB_ROOT}/plugins/available/$plugin;
+        PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn disable $plugin
+        PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn disable $plugin
+      fi
+    done
+  else
+    echo "Processing $1"
+  fi
+
+  dokku cleanup
+}
+
+main "$@"

debian/templates

@@ -1,19 +1,24 @@
 Template: dokku/web_config
-Description: Use the web-based config page?
+Description: Enable the web-based config page?
 Type: boolean
 Default: true
 
 Template: dokku/vhost_enable
-Description: Use vhost based deployments?
+Description: Enable vhost-based deployments?
 Type: boolean
 Default: false
 
 Template: dokku/hostname
-Description: Machine's hostname or IP
+Description: Hostname or IP for server:
 Type: string
 Default: dokku.me
 
+Template: dokku/skip_key_file
+Description: Skip key file requirement?
+Type: boolean
+Default: false
+
 Template: dokku/key_file
-Description: Keyfile for initial user
+Description: Keyfile for initial user:
 Type: string
 Default: /root/.ssh/id_rsa.pub

docs/advanced-installation.md

@@ -3,7 +3,7 @@
 You can always install dokku straight from the latest - potentially unstable - master release via the following bash command:
 
 ```shell
-wget -qO- https://raw.github.com/progrium/dokku/master/bootstrap.sh | sudo DOKKU_BRANCH=master bash
+wget -qO- https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh | sudo DOKKU_BRANCH=master bash
 ```
 
 ## Development
@@ -19,7 +19,7 @@ sudo make install
 The `Makefile` allows source URLs to be overridden to include customizations from your own repositories. The `DOCKER_URL`, `PLUGN_URL`, `SSHCOMMAND_URL` and `STACK_URL` environment variables may be set to override the defaults (see the `Makefile` for how these apply). Example:
 
 ```shell
-sudo SSHCOMMAND_URL=https://raw.github.com/yourusername/sshcommand/master/sshcommand make install
+sudo SSHCOMMAND_URL=https://raw.githubusercontent.com/yourusername/sshcommand/master/sshcommand make install
 ```
 
 ## Bootstrap a server from your own repository
@@ -27,7 +27,7 @@ sudo SSHCOMMAND_URL=https://raw.github.com/yourusername/sshcommand/master/sshcom
 The bootstrap script allows the dokku repository URL to be overridden to bootstrap a host from your own clone of dokku using the `DOKKU_REPO` environment variable. Example:
 
 ```shell
-wget https://raw.github.com/progrium/dokku/master/bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/master/bootstrap.sh
 chmod +x bootstrap.sh
 sudo DOKKU_REPO=https://github.com/yourusername/dokku.git DOKKU_BRANCH=master ./bootstrap.sh
 ```
@@ -37,7 +37,7 @@ sudo DOKKU_REPO=https://github.com/yourusername/dokku.git DOKKU_BRANCH=master ./
 Dokku ships with a pre-built version of version of the [herokuish](https://github.com/gliderlabs/herokuish) component by default. If you want to build your own version you can specify that with an env variable.
 
 ```shell
-git clone https://github.com/progrium/dokku.git
+git clone https://github.com/dokku/dokku.git
 cd dokku
 sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make install
 ```
@@ -48,13 +48,7 @@ Once dokku is installed, if you are not using the web-installer, you'll want to
 
 Set up a domain and a wildcard domain pointing to that host. Make sure `/home/dokku/VHOST` is set to this domain. By default it's set to whatever hostname the host has. This file is only created if the hostname can be resolved by dig (`dig +short $(hostname -f)`). Otherwise you have to create the file manually and set it to your preferred domain. If this file still is not present when you push your app, dokku will publish the app with a port number (i.e. `http://example.com:49154` - note the missing subdomain).
 
-You'll have to add a public key associated with a username by doing something like this from your local machine:
-
-    $ cat ~/.ssh/id_rsa.pub | ssh dokku.me "sudo sshcommand acl-add dokku $USER"
-
-If you are using the vagrant installation, you can use the following command to add your public key to dokku:
-
-    $ cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
+Follow the [user management documentation](/dokku/deployment/user-management) in order to add users to dokku.
 
 That's it!
 

docs/appendices/0.5.0-migration-guide.md

@@ -0,0 +1,25 @@
+# 0.5.0 Migration Guide
+
+## nginx-vhosts
+
+- The nginx-vhosts template language is now [sigil](https://github.com/gliderlabs/sigil)
+  - No need to escape literal `$` characters (or other "bash-isms")
+  - Template variables are represented as {{ .VARIABLE_NAME }}
+  - A detailed list of template variables can be found [here](/dokku/nginx#available-template-variables)
+- A custom nginx-vhosts template must be named `nginx.conf.sigil`
+  - The default path for this custom template is the root of your repo (i.e. `/app` in the container or `WORKDIR` if defined in a dockerfile app)
+  - Dokku no longer looks for this file in `/home/dokku/myapp` on the dokku server
+  - Check out an example template [here](/dokku/nginx/)
+- Support for server-wide SSL certs have been dropped in favor of using the `certs` plugin
+  - `dokku certs:add myapp < certs.tar`
+- All domains for an SSL-enabled app will be redirected to https by default
+  - This can be overridden with a custom template
+- Replaced "magic" `NO_VHOST` variable with `domains:enable/disable`
+- Simplified zero downtime control
+  - `checks:enable/disable`
+
+## Dockerfile apps with exposed ports
+
+- Dockerfiles with `EXPOSE` clauses will get [all **tcp** ports proxied by default](/dokku/deployment/dockerfiles/#exposed-ports)
+  - Note that nginx will proxy the same port numbers to listen publicly
+  - UDP ports can be exposed by disabling the [nginx proxy](/dokku/proxy/) with `dokku proxy:disable myapp`

docs/application-deployment.md

@@ -1,105 +1,164 @@
-# Deploy an App
+# Deploying to Dokku
 
-Now you can deploy apps on your Dokku. Let's deploy the [Heroku Node.js sample app](https://github.com/heroku/node-js-sample). All you have to do is add a remote to name the app. It's created on-the-fly.
+## Deploy tutorial
 
-```
-$ cd node-js-sample
-$ git remote add dokku dokku@dokku.me:node-js-app
-$ git push dokku master
-Counting objects: 296, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (254/254), done.
-Writing objects: 100% (296/296), 193.59 KiB, done.
-Total 296 (delta 25), reused 276 (delta 13)
------> Building node-js-app ...
-       Node.js app detected
------> Resolving engine versions
+Once Dokku has been configured with at least one user, applications can be deployed via a `git push` command. To quickly see Dokku deployment in action, you can use the Heroku Ruby on Rails example app.
 
-... blah blah blah ...
-
------> Application deployed:
-       http://node-js-app.dokku.me
+```shell
+# from your local machine
+git clone git@github.com:heroku/ruby-rails-sample.git
 ```
 
-You're done!
+### Create the app
+
+Create the application on the Dokku host. You will need to ssh onto the host to run this command.
+
+```shell
+# on your dokku host
+dokku apps:create ruby-rails-sample
+```
+
+### Create the backing services
+
+When you create a new app, Dokku by default *does not* provide any datastores such as MySQL or PostgreSQL. You will need to install plugins to handle that, but fortunately [Dokku has official plugins](/dokku/plugins/#official-plugins-beta) for common datastores. Our sample app requires a PostgreSQL service:
+
+```shell
+# on your dokku host
+# install the postgres plugin
+# plugin installation requires root, hence the user change
+sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git
+
+# create a postgres service with the name rails-database
+dokku postgres:create rails-database
+```
+
+> Each services may take a few moments to create.
+
+### Linking backing services to applications
+
+Once the service creation is complete, set the `POSTGRES_URL` environment variable by linking the service.
+
+```shell
+# on your dokku host
+# each official datastore offers a `link` method to link a service to any application
+dokku postgres:link rails-database ruby-rails-sample
+```
+
+> You can link a single service to multiple applications or use one service per application.
+
+### Deploy the app
+
+Now you can deploy the `ruby-rails-sample` app to your Dokku server. All you have to do is add a remote to name the app. Applications are created on-the-fly on the Dokku server.
+
+```shell
+# from your local machine
+git remote add dokku dokku@dokku.me:ruby-rails-sample
+git push dokku master
+```
+
+You should see output similar to the following:
+
+```
+Counting objects: 231, done.
+Delta compression using up to 8 threads.
+Compressing objects: 100% (162/162), done.
+Writing objects: 100% (231/231), 36.96 KiB | 0 bytes/s, done.
+Total 231 (delta 93), reused 147 (delta 53)
+-----> Cleaning up...
+-----> Building ruby-rails-sample from herokuish...
+-----> Adding BUILD_ENV to build environment...
+-----> Ruby app detected
+-----> Compiling Ruby/Rails
+-----> Using Ruby version: ruby-2.2.1
+-----> Installing dependencies using 1.9.7
+       Running: bundle install --without development:test --path vendor/bundle --binstubs vendor/bundle/bin -j4 --deployment
+       Fetching gem metadata from https://rubygems.org/...........
+       Fetching version metadata from https://rubygems.org/...
+       Fetching dependency metadata from https://rubygems.org/..
+       Using rake 10.4.2
+
+...
+```
+
+When the deploy finishes, the application's URL will be shown.
+
+```shell
+=====> Application deployed:
+       http://ruby-rails-sample.dokku.me
+```
+
+Dokku supports deploying applications via [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) with [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks) or using a project's [dockerfile](https://docs.docker.com/reference/builder/).
+
+### Removing a deployed app
+
+You can also remove an application from your Dokku installation. This will unlink all linked services and destroy any config related to the application. Note that linked services will retain their data for later use (or removal).
+
+```shell
+# on your dokku host
+# replace APP with the name of your application
+dokku apps:destroy APP
+```
+
+This will prompt you to verify the application's name before destroying it. You may also use the `--force` flag to circumvent this verification process:
+
+```shell
+# on your dokku host
+# replace APP with the name of your application
+dokku --force apps:destroy APP
+```
+
+### Renaming a deployed app
+
+> New as of 0.4.7
+
+You can rename a deployed app using the `apps:rename` CLI tool:
+
+```shell
+# on your dokku host
+dokku apps:rename OLD_NAME NEW_NAME
+```
+
+This will copy all of your app's contents into a new app directory with the name of your choice, delete your old app, then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved.
+
+### Deploying non-master branch
 
 Dokku only supports deploying from its master branch, so if you'd like to deploy a different local branch use: ```git push dokku <local branch>:master```
 
-Right now Herokuish supports buildpacks for Node.js, Ruby, Python, [and more](https://github.com/gliderlabs/herokuish#buildpacks).
-Please check the documentation for your particular build pack as you may need to include configuration files (such as a Procfile) in your project root.
+You can also support pushing multiple branches using the [receive-branch](/dokku/development/plugin-triggers/#receive-branch) plugin trigger in a custom plugin.
 
-## Deploying to server over SSH
+### Skipping deployment
 
-Pushing to the dokku remote may prompt you to input a password for the dokku user. It's preferable, however, to use key-based authentication, and you can add your public key to the dokku user's authorized_keys file with:
+If you only want to rebuild and tag a container, you can skip the deployment phase by setting `$DOKKU_SKIP_DEPLOY` to `true` by running:
 
-```
-cat ~/.ssh/id_rsa.pub | ssh [sudouser]@[yourdomain].com "sudo sshcommand acl-add dokku [description]"
+``` shell
+# on your dokku host
+dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
 ```
 
-## Deploying with private git submodules
+### Deploying with private git submodules
 
-Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `~dokku/.ssh` and potentially add github.com (or your VCS host key) into `~dokku/.ssh/known_hosts`. A decent test like this should help confirm you've done it correctly.
+Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add github.com (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly.
 
-```
+```shell
+# on your dokku host
 su - dokku
 ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 ssh -T git@github.com
 ```
 
-## Specifying a custom buildpack
-
-If buildpack detection isn't working well for you or you want to specify a custom buildpack for one repository you can create & commit a file in the root of your git repository named `.env` containing `export BUILDPACK_URL=<repository>` before pushing. This will tell herokuish to fetch the specified buildpack and use it instead of relying on the built-in buildpacks & their detection methods.
-
-## Dockerfile deployment
-
-Deployment of `Dockerfile` repos is supported as of v0.3.15. Simply place a Dockerfile in the root of your repo and push to dokku. If you are converting from a heroku/dokku buildpack deployment, ensure you are not setting `$BUILDPACK_URL` or including a `.buildpacks` file in the root of your repo.
-
-By default, we will extract the first `EXPOSE` port and tell nginx to proxy your app to that port. Alternatively, you can set `$DOKKU_DOCKERFILE_PORT` in your app's dokku configuration.
-
-By default no arguments are passed to `docker run` when deploying the container and the `CMD` or `ENTRYPOINT` defined in the `Dockerfile` are executed. You can take advantage of docker ability of overriding the `CMD` or passing parameters to your `ENTRYPOINT` setting `$DOKKU_DOCKERFILE_START_CMD`. Let's say for example you are deploying a base nodejs image, with the following `ENTRYPOINT`:
-
-```
-ENTRYPOINT ["node"]
-```
-
-You can do:
-
-```
-dokku config:set DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
-```
-
-To tell docker what to run.
-
-Setting `$DOKKU_DOCKERFILE_CACHE_BUILD` to `true` or `false` will enable or disable docker's image layer cache. Lastly, for more granular build control, you may also pass any `docker build` option to `docker`, by setting `$DOKKU_DOCKER_BUILD_OPTS`.
-
-## Default vhost
-
-You might notice the default vhost for Nginx will be one of the apps. If an app doesn't exist, it will use this vhost and it may be confusing for it to go to another app. You can create a default vhost using a configuration under `sites-enabled`. You just have to change one thing in the main nginx.conf:
-
-Swap both conf.d include line and the sites-enabled include line. From:
-```
-include /etc/nginx/conf.d/*.conf;
-include /etc/nginx/sites-enabled/*;
-```
-to
-```
-include /etc/nginx/sites-enabled/*;
-include /etc/nginx/conf.d/*.conf;
-```
-
-Alternatively, you may push an app to your dokku host with a name like "00-default". As long as it lists first in `ls /home/dokku/*/nginx.conf | head`, it will be used as the default nginx vhost.
+Note that if the buildpack or dockerfile build process require ssh key access for other reasons, the above may not always apply.
 
 ## Deploying to subdomains
 
 The name of remote repository is used as the name of application to be deployed, as for example above:
 
-    $ git remote add dokku dokku@dokku.me:node-js-app
+    $ git remote add dokku dokku@dokku.me:ruby-rails-sample
     $ git push dokku master
 
 Is deployed to,
 
     remote: -----> Application deployed:
-    remote:        http://node-js-app.dokku.me
+    remote:        http://ruby-rails-sample.dokku.me
 
 You can also specify fully qualified names, say `app.dokku.me`, as
 
@@ -121,95 +180,32 @@ This is in particular useful, then you want to deploy to root domain, as
     remote: -----> Application deployed:
     remote:        http://dokku.me
 
-## Zero downtime deploy
+## Dokku/Docker Container Management Compatibility
 
-Following a deploy, dokku will now wait `DOKKU_DEFAULT_CHECKS_WAIT` seconds (default: `10`), and if the container is still running, then route traffic to the new container.
+Dokku is, at its core, a docker container manager. Thus, it does not necessarily play well with other out-of-band processes interacting with the docker daemon. One thing to note as in [issue #1220](https://github.com/dokku/dokku/issues/1220), dokku executes a cleanup function prior to every deployment.
 
-This can be problematic for applications whose boot up time can vary and can lead to `502 Bad Gateway` errors.
+As of 0.5.x, this function removes all containers with the label `dokku` where the status is either `dead` or `exited`, as well as all `dangling` images. Previous versions would remove `dead` or `exited` containers, regardless of their label.
 
-Dokku provides a way to run a set of more precise checks against the new container, and only switch traffic over if all checks complete successfully.
+## Adding deploy users
 
-To specify checks, add a `CHECKS` file to the root of your project directory. This is a text file with one line per check. Empty lines and lines starting with `#` are ignored.
+See the [user management documentation](/dokku/deployment/user-management).
 
-A check is a relative URL and may be followed by expected content from the page, for example:
+## Default vhost
 
-```
-/about      Our Amazing Team
-```
+See the [nginx documentation](/dokku/nginx/#default-site).
 
-Dokku will wait `DOKKU_CHECKS_WAIT` seconds (default: `5`) before running the checks to give server time to start. For shorter/longer wait, change the `DOKKU_CHECKS_WAIT` environment variable.  This can also be overridden in the CHECKS file by setting WAIT=nn.
+## Dockerfile deployment
 
-Dokku will wait `DOKKU_WAIT_TO_RETIRE` seconds (default: `60`) before stopping the old container such that no existing connections to it are dropped.
+See the [dockerfile documentation](/dokku/deployment/dockerfiles/).
 
-Dokku will retry the checks DOKKU_CHECKS_ATTEMPTS times until the checks are successful or DOKKU_CHECKS_ATTEMPTS is exceeded.  In the latter case, the deployment is considered failed. This can be overridden in the CHECKS file by setting ATTEMPTS=nn.
+## Specifying a custom buildpack
 
-Checks can be skipped entirely by setting `DOKKU_SKIP_ALL_CHECKS` to `true` either globally or per application. You can choose to skip only default checks by setting `DOKKU_SKIP_DEFAULT_CHECKS` to `true` either globally or per application.
-
-See [checks-examples.md](checks-examples.md) for examples and output.
-
-## Removing a deployed app
-
-SSH onto the server, then execute:
-
-```shell
-dokku apps:destroy myapp
-```
+See the [buildpack documentation](/dokku/deployment/buildpacks/).
 
 ## Image tagging
 
-The dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
+See the [image tagging documentation](/dokku/deployment/images).
 
-```
-tags <app>                                       List all app image tags
-tags:create <app> <tag>                          Add tag to latest running app image
-tags:deploy <app> <tag>                          Deploy tagged app image
-tags:destroy <app> <tag>                         Remove app image tag
-```
+## Zero downtime deploy
 
-Example:
-```
-root@dokku:~# dokku tags node-js-app
-=====> Image tags for dokku/node-js-app
-REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
-dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
-
-root@dokku:~# dokku tags:create node-js-app v0.9.0
-=====> Added v0.9.0 tag to dokku/node-js-app
-
-root@dokku:~# dokku tags node-js-app
-=====> Image tags for dokku/node-js-app
-REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
-dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
-dokku/node-js-app   v0.9.0              936a42f25901        About a minute ago   1.025 GB
-
-root@dokku:~# dokku tags:deploy node-js-app v0.9.0
------> Releasing node-js-app (dokku/node-js-app:v0.9.0)...
------> Deploying node-js-app (dokku/node-js-app:v0.9.0)...
------> Running pre-flight checks
-       For more efficient zero downtime deployments, create a file CHECKS.
-       See http://progrium.viewdocs.io/dokku/checks-examples.md for examples
-       CHECKS file not found in container: Running simple container check...
------> Waiting for 10 seconds ...
------> Default container check successful!
-=====> node-js-app container output:
-       Detected 512 MB available memory, 512 MB limit per process (WEB_MEMORY)
-       Recommending WEB_CONCURRENCY=1
-       > node-js-sample@0.1.0 start /app
-       > node index.js
-       Node app is running at localhost:5000
-=====> end node-js-app container output
------> Running post-deploy
------> Configuring node-js-app.dokku.me...
------> Creating http nginx.conf
------> Running nginx-pre-reload
-       Reloading nginx
------> Shutting down old containers in 60 seconds
-=====> 025eec3fa3b442fded90933d58d8ed8422901f0449f5ea0c23d00515af5d3137
-=====> Application deployed:
-       http://node-js-app.dokku.me
-
-```
-
-## Dokku/Docker Container Management Compatibility
-
-Dokku is, at it's core, a docker container manager. Thus, it does not necessarily play well with other out-of-band processes interacting with the docker daemon. One thing to note as in [issue #1220](https://github.com/progrium/dokku/issues/1220), dokku executes a cleanup function prior to every deployment. This function removes all exited containers and all 'unattached' images.
+See the [zero-downtime deploy documentation](/dokku/checks-examples/).

docs/assets/favicons/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/mstile-310x150.png"/>
+      <TileColor>#da532c</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>

docs/assets/favicons/manifest.json

@@ -0,0 +1,41 @@
+{
+    "name": "Dokku",
+    "icons": [
+        {
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.6\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "sizes": "36x36",
+            "type": "image\/png",
+            "density": "0.75"
+        },
+        {
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.6\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "sizes": "48x48",
+            "type": "image\/png",
+            "density": "1.0"
+        },
+        {
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.6\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "sizes": "72x72",
+            "type": "image\/png",
+            "density": "1.5"
+        },
+        {
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.6\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "sizes": "96x96",
+            "type": "image\/png",
+            "density": "2.0"
+        },
+        {
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.6\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "sizes": "144x144",
+            "type": "image\/png",
+            "density": "3.0"
+        },
+        {
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.5.6\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image\/png",
+            "density": "4.0"
+        }
+    ]
+}

docs/assets/style.css

@@ -1,12 +1,14 @@
 body {
+  font-family: 'Open Sans', sans-serif;
+  font-weight: 400;
+  font-size: 12px;
   padding-bottom: 40px;
   color: #5a5a5a;
+  -webkit-font-smoothing: antialiased;
 }
-
 h1 {
   color: #5a5a5a;
-  font-family: 'montserrat', Optima, Segoe, "Segoe UI", Candara, Calibri, Arial, sans-serif;
-  font-weight: 700;
+  font-weight: 400;
   line-height: 1.1;
   margin-bottom: 12px;
   margin-top: 12px;
@@ -20,34 +22,48 @@ h1 {
   color: #fff;
   font-size: 23px;
   margin: 0;
-  padding: 0;
+  padding: 0 0 0 1em;
+}
+.header a {
+  color: #fff;
+  background-position: center left;
+  display: block;
+  width: 100%;
+  height: 100%;
+  -webkit-background-size: contain;
+  -moz-background-size: contain;
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.header .navbar-brand a {
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/dokku.png);
+  text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
 .blurb p {
   font-size: 17px;
   font-weight: 300;
-  margin: 18px 0 18px;
+  margin: 18px 0;
   text-align: center;
 }
-
 .quickstart-code {
   display: block;
-  font-size: 12px;
   line-height: 1.3em;
   margin: 45px auto;
-  max-width: 650px;
+  max-width: 750px;
   padding: 0;
 }
 .quickstart-code .title {
   background-color: #dfdfdf;
   background-image: linear-gradient(top, #f7f7f7 0%, #dfdfdf 7%, #ccc 100%);
-  border-bottom: 1px solid #111;
+  border-radius: 5px 5px 0 0;
+  box-shadow: 0 3px 0 rgba(0, 0, 0, 0.5);
   color: #444;
   display: block;
   font-weight: 400;
@@ -55,18 +71,47 @@ h1 {
   margin: 0 20px;
   padding: 3px 0;
   text-align: center;
-  text-shadow: 0 1px 0 rgba(255,255,255,0.5);
-  border-radius: 5px 5px 0 0;
-  box-shadow: 0 3px 0 rgba(0,0,0,0.5);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.quickstart-code .tabs {
+  background-color: #bcbcbc;
+  border-top: 1px solid #686868;
+  color: #444;
+  display: flex;
+  display: -webkit-flex;
+  font-weight: bold;
+  margin: 0 20px;
+  padding: 0;
+  text-align: center;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.quickstart-code .tab {
+  border-right: 1px solid #686868;
+  cursor: pointer;
+  flex: 1;
+  -webkit-flex: 1;
+}
+.quickstart-code .tab-active {
+  background-color: #ededed;
+  border-radius: 0 0 5px 5px;
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
+}
+.quickstart-code .tab:last-of-type {
+  border-right: none;
 }
 .quickstart-code .shell {
   background-color: #171717;
+  border-radius: 0 0 5px 5px;
+  border-top: 1px solid #bcbcbc;
+  box-shadow: 0 5px 30px rgba(0, 0, 0, 0.3);
+  display: none;
   font-family: Menlo, Consolas, "Courier New", Courier, "Liberation Mono", monospace;
   margin: 0 20px;
   padding: 20px;
   text-shadow: none;
-  border-radius: 0 0 5px 5px;
-  box-shadow: 0 5px 30px rgba(0,0,0,0.3);
+}
+.quickstart-code .shell-active {
+  display: block;
 }
 .quickstart-code .line {
   display: block;
@@ -76,16 +121,28 @@ h1 {
 .quickstart-code .line span {
   display: inline-block;
 }
+.quickstart-code .line .output {
+  color: #aaa;
+}
 .quickstart-code .path {
   color: #2a8fbd;
+  content: '~';
   user-select: none;
 }
 .quickstart-code .prompt {
-  color: #ff9900;
+  color: #f90;
   user-select: none;
 }
 .quickstart-code .command {
-  color: #ffffcc;
+  color: #ffc;
+}
+.alternate-instructions {
+  display: block;
+  line-height: 1.3em;
+  margin: 45px auto;
+  max-width: 750px;
+  padding: 0;
+  text-align: center;
 }
 .marketing .col-lg-4 {
   margin-bottom: 20px;
@@ -95,7 +152,6 @@ h1 {
   margin-right: 10px;
   margin-left: 10px;
 }
-
 .featurette-divider {
   margin: 20px 0;
 }
@@ -107,19 +163,372 @@ h1 {
 .featurette-heading .text-muted {
   font-weight: 300;
 }
+.featurette img {
+  width: 400px;
+}
+.slack-channel {
+  background-color: #EEF1F7;
+  font-size: 16px;
+  font-weight: 300;
+  margin-bottom: 2.5em;
+  padding: 2.5em 0;
+  text-align: center
+}
+.slack-channel .inline-container {
+  display: inline-block;
+  margin-left: 0.5em
+}
+.slack-button {
+  background-image: -webkit-linear-gradient(#FCFCFC, #EAEAEA);
+  background-image: linear-gradient(#FCFCFC, #EAEAEA);
+  border: 1px solid #ddd;
+  padding: 0.25rem 0.5rem;
+}
+.slack-button img {
+  height: 1em;
+}
+.team-members img {
+  -moz-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+  -webkit-border-radius: 3px;
+  -webkit-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+  border-radius: 3px;
+  border: 8px solid white;
+  box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+  display: block;
+  height: 200px;
+  margin: 20px auto 20px auto;
+}
+.team-members .fund-link {
+  display: block;
+  font-size: 80%;
+}
+.team-member {
+  min-height: 320px;
+}
+.team-member-image img:last-child { display: none }
+.team-member-image:hover img:first-child { display: none; }
+.team-member-image:hover img:last-child { display: inline-block; }
 
+.list-group-item {
+  border: none;
+  font-weight: normal;
+  padding: .2rem .5rem;
+  color: #157577;
+}
+a.list-group-item {
+  color: #666
+}
+.list-group-item.disabled:first-child, .list-group-item.disabled:first-child:focus, .list-group-item.disabled:first-child:hover {
+  margin-top: 0;
+}
+.list-group-item.disabled, .list-group-item.disabled:focus, .list-group-item.disabled:hover {
+  background: none;
+  color: #bbb;
+  cursor: default;
+  font-weight: normal;
+  margin-bottom: 1em;
+  margin-top: 2em;
+  text-transform: uppercase;
+}
+.anchorjs-link {
+  color: #24cbce;
+}
+.markdown-body {
+  -webkit-font-smoothing: antialiased;
+  box-sizing: border-box;
+  color: rgb(71, 74, 84);
+  font-size: 14px;
+  font-weight: normal;
+  height: 20px;
+  line-height: 20px;
+  text-align: left;
+}
+.markdown-body h1 {
+  border-bottom: 1px solid #dfdfdf;
+  color: #444;
+  font-size: 24px;
+  padding-bottom: 1em;
+  margin-top: 0;
+  text-rendering: optimizelegibility;
+}
+.markdown-body h2 {
+  font-size: 17px;
+  font-weight: 700;
+  color: #555;
+  margin-top: 2em;
+  text-transform: uppercase;
+}
+.markdown-body h3 {
+  font-size: 15px;
+  font-weight: 700;
+  color: #555;
+  margin: 1em 0;
+}
+.markdown-body h4 {
+  font-size: 14px;
+  font-weight: 700;
+  color: #555;
+  margin: 1em 0;
+}
+.markdown-body h1 + h2 {
+  margin-top: 1em;
+}
+code {
+  padding: 0;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
+  margin: 0;
+  font-size: 85%;
+  background-color: #fff;
+  background-color: rgba(0, 0, 0, 0.06);
+  color: #333;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+code:before {
+  letter-spacing: -0.2em;
+  content: "\00a0";
+}
+code:after {
+  letter-spacing: -0.2em;
+  content: "\00a0";
+}
+pre code:before, pre code:after {
+  letter-spacing: 0;
+  content: "";
+}
+pre {
+  display: block;
+  line-height: 1.428571429;
+  word-break: normal;
+  word-wrap: normal;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+  box-shadow: 0 0 0 3px #eee;
+  overflow: auto;
+  padding: 10px;
+  background-color: #fff;
+  color: #4d4d4c;
+  margin: 2em 0;
+}
+blockquote {
+  border-left: 4px solid #5bc0de;
+  background-color: #f4f8fa;
+  padding: 15px 15px 1px;
+  margin-bottom: 30px;
+}
+.new-as-of {
+  border-left: 4px solid #d1f2a5;
+  background-color: #effab4;
+}
+.not-yet-released {
+  border-left: 4px solid #ef5b58;
+  background-color: #f9ad76;
+}
+.fa:before {
+  -webkit-font-smoothing: antialiased
+}
+.clearfix {
+  *zoom: 1
+}
+.clearfix:before, .clearfix:after {
+  display: table;
+  content: ""
+}
+.clearfix:after {
+  clear: both
+}
+a .fa {
+  display: inline-block;
+  text-decoration: inherit
+}
+li .fa {
+  display: inline-block
+}
+li .fa-large:before, li .fa-large:before {
+  width: 1.875em
+}
+ul.fas {
+  list-style-type: none;
+  margin-left: 2em;
+  text-indent: -0.8em
+}
+ul.fas li .fa {
+  width: 0.8em
+}
+ul.fas li .fa-large:before, ul.fas li .fa-large:before {
+  vertical-align: baseline
+}
+.rst-versions {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 300px;
+  color: #fcfcfc;
+  background: #15518d;
+  border-top: solid 10px #343131;
+  font-family: "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif;
+  z-index: 400
+}
+.rst-versions a {
+  color: #7c8e98;
+  text-decoration: none
+}
+.rst-versions .rst-badge-small {
+  display: none
+}
+.rst-versions .rst-current-version {
+  padding: 12px;
+  background-color: #2475c3;
+  display: block;
+  text-align: right;
+  cursor: pointer;
+  color: #d8edf8;
+  *zoom: 1
+}
+.rst-versions .rst-current-version:before, .rst-versions .rst-current-version:after {
+  display: table;
+  content: ""
+}
+.rst-versions .rst-current-version:after {
+  clear: both
+}
+.rst-versions .rst-current-version .fa {
+  color: #fcfcfc
+}
+.rst-versions .rst-current-version .fa-book {
+  float: left;
+  line-height: 30px
+}
+.rst-versions .rst-current-version .icon-book {
+  float: left
+}
+.rst-versions .rst-current-version.rst-out-of-date {
+  background-color: #E74C3C;
+  color: #fff
+}
+.rst-versions .rst-current-version.rst-active-old-version {
+  background-color: #F1C40F;
+  color: #000
+}
+.rst-versions.rst-badge {
+  border: none;
+  bottom: 20px;
+  display: block;
+  left: auto;
+  max-width: 300px;
+  right: 20px;
+  width: auto;
+}
+.rst-versions.rst-badge .icon-book {
+  float: none
+}
+.rst-versions.rst-badge .fa-book {
+  float: none
+}
+.rst-versions.rst-badge.shift-up .rst-current-version {
+  text-align: right
+}
+.rst-versions.rst-badge.shift-up .rst-current-version .fa-book {
+  float: left
+}
+.rst-versions.rst-badge.shift-up .rst-current-version .icon-book {
+  float: left
+}
+.rst-versions.rst-badge .rst-current-version {
+  width: auto;
+  height: 30px;
+  line-height: 30px;
+  padding: 0 6px;
+  display: block;
+  text-align: center
+}
+.rst-other-versions {
+  display: none;
+  padding: 12px;
+  text-align: left;
+}
+.shift-up .rst-other-versions {
+  display: block;
+}
+.rst-other-versions a {
+  border: 0;
+}
+.rst-other-versions hr {
+  display: block;
+  border: 0;
+  margin: 20px 0;
+  padding: 0;
+  border-top: solid 1px #d6edf9
+}
+.rst-other-versions dl {
+  margin: 0;
+}
+.rst-other-versions dd {
+  display: inline-block;
+  margin: 0
+}
+.rst-other-versions dd a {
+  display: inline-block;
+  padding: 6px;
+  color: #fcfcfc
+}
+.dev-warning, .outdated-warning {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  padding: 8px 20px 8px;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  background-image: -webkit-linear-gradient(-45deg, rgba(0, 0, 0, 0.04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0.04) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(0, 0, 0, 0.04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0.04) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(0, 0, 0, 0.04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0.04) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(0, 0, 0, 0.04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0.04) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(135deg, rgba(0, 0, 0, 0.04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, 0.04) 50%, rgba(0, 0, 0, 0.04) 75%, transparent 75%, transparent);
+  font-family: "Roboto", Corbel, Avenir, "Lucida Grande", "Lucida Sans", sans-serif;
+  font-size: 14px;
+  text-align: center;
+  background-color: #ffe761;
+}
+@media screen and (max-width: 768px) {
+  .rst-versions {
+    width: 85%;
+    display: none
+  }
+  .rst-versions.shift {
+    display: block
+  }
+  img {
+    width: 100%;
+    height: auto
+  }
+}
 @media (min-width: 768px) {
-  .quickstart-code {
+  .col-md-offset-right-2 {
+    margin-right: 20.666667%;
+  }
+  .quickstart-code shell {
     font-size: 14px;
+  }
+  .quickstart-code {
     line-height: 22px;
   }
   .featurette-heading {
     font-size: 50px;
   }
 }
-
 @media (min-width: 992px) {
+  .featurette img {
+    width: 300px;
+  }
   .featurette-heading {
-    margin-top: 120px;
+    margin-top: 30px;
+  }
+}
+@media (max-width: 992px) {
+  .featurette img {
+    width: 200px;
   }
 }

docs/assets/versions.json

@@ -0,0 +1,7 @@
+{
+  "max-versions": [
+    "0.3.26",
+    "0.4.14",
+    "0.5.6"
+  ]
+}

docs/backup-recovery.md

@@ -0,0 +1,45 @@
+# Backup and Recovery
+
+> The backup plugin was deprecated in 0.4.x, below are backup recommendations for 0.5.x and later.
+
+## Backup and Migration Tutorial
+
+Because Dokku is git based, rebuilding a deployed app is as easy as pushing from git. You can push to a new server by updating the dokku remote in you local app's repo.
+
+```
+$ git remote rm dokku
+$ git remote add dokku dokku@[dokku.me:dokku.me]
+$ git push dokku [master]
+```
+## Databases
+
+Some plugins, like the official [dokku-postgres] plugin, have built-in commands that allow non-volatile data be exported and imported. 
+
+For [dokku-postgres], use:
+```
+dokku postgres:export [db_name] > [db_name].dump
+dokku postgres:import [db_name] < [db_name].dump
+```
+
+## Volumes and Static Assets
+
+Dokku doesn't enforce a [300mb] limit on apps, but it's best practice to keep binary assets outside of git. Since containers are considered volatile in Dokku, external stores like s3 or storage mounts should be used for non-volatile items like user uploads. The dokku storage core plugin can be used to mount local directories / volumes inside the docker container.
+
+```
+storage:list <app>, List bind mounts for app's container(s) (host:container)
+storage:mount <app> <host-dir:container-dir>, Create a new bind mount
+storage:unmount <app> <host-dir:container-dir>, Remove an existing bind mount
+```
+
+## Disaster Recovery
+
+The best plan for disaster recovery is to always keep multiple (remote) copies of your local repo, static assets and periodic database dumps. In case of an emergency when your git repo and backups are completely lost, you can recover the last pushed copy from your remote dokku server (assuming you still have the ssh key).
+
+```
+mkdir [app-name] ; cd !$
+git init && git remote add dokku dokku@[dokku.me:app-name]
+git pull dokku/master && git checkout dokku/master
+```
+
+[dokku-postgres]: <https://github.com/dokku/dokku-postgres>
+[300mb]: <https://devcenter.heroku.com/articles/slug-compiler#slug-size>

docs/checks-examples.md

@@ -1,51 +1,126 @@
-# Checks Examples
+# Zero Downtime Deploys
 
-The CHECKS file may contain empty lines, comments (lines starting with #),
-settings (NAME=VALUE) and check instructions.
+> New as of 0.5.0
 
-The format of a check instruction is a path, optionally followed by the
-expected content.  For example:
+```
+checks <app>                                                                                 Show zero-downtime status
+checks:disable <app>                                                                         Disable zero-downtime checks
+checks:enable <app>                                                                          Enable zero-downtime checks
+```
 
-	  /                       My Amazing App
-	  /stylesheets/index.css  .body
-	  /scripts/index.js       $(function()
-	  /images/logo.png
+Following a deploy, dokku will wait `10` seconds before routing traffic to the new container to give your application time to boot up. If the application is not running after this time, then the deploy is failed and your old container will continue serving traffic. You can modify this value globally or on a per-application basis:
 
-To check an application that supports multiple hostnames, use relative URLs
-that include the hostname, for example:
+```shell
+dokku config:set --global DOKKU_DEFAULT_CHECKS_WAIT=30
+dokku config:set <app> DOKKU_DEFAULT_CHECKS_WAIT=30
+```
 
-	 //admin.example.com     Admin Dashboard
-	 //static.example.com/logo.png
+You can also choose to skip checks completely on a per-application basis:
 
-You can also specify the protocol to explicitly check HTTPS requests.
+```shell
+dokku checks:disable <app>
+```
 
-The default behavior is to wait for 5 seconds before running the first check,
-and timeout each check to 30 seconds.
+Dokku will wait `60` seconds before stopping the old container so that existing connections are given a chance to complete. You can modify this value globally or on a per-application basis:
 
-By default, checks will be attempted 5 times.  (Retried 4 times)
+```shell
+dokku config:set --global DOKKU_WAIT_TO_RETIRE=120
+dokku config:set <app> DOKKU_WAIT_TO_RETIRE=120
+```
 
-You can change these by setting WAIT, TIMEOUT and ATTEMPTS to different values, for
-example:
+> Note that during this time, multiple containers may be running on your server, which can be an issue for memory-hungry applications on memory-constrained servers.
 
-	  WAIT=30     # Wait 1/2 minute
-	  TIMEOUT=60  # Timeout after a minute
-	  ATTEMPTS=10  # attempt checks 10 times
+## Checks
 
-# Example: Successful Rails Deployment
-In this example, a rails applicaiton is successfully deployed to dokku.  The initial round of checks fails while the server is starting, but once it starts they succeed and the deployment is successful.
-ATTEMPTS is set to 6, but the third attempt succeeds.
+If your application needs a longer period to boot up - perhaps to load data into memory, or because of slow boot time - you may also use dokku's `checks` functionality to more precisely check whether an application can serve traffic or not.
 
-## CHECKS file
+To specify checks, add a `CHECKS` file to the root of your project directory. The `CHECKS` file should be plain text and may contain:
+
+  * Check instructions
+  * Settings (NAME=VALUE)
+  * Comments (lines starting with #)
+  * Empty lines
+
+> For dockerfile-based deploys, the file *must* be in `/app/CHECKS` within the container. `/app` is used by default as the root container directory for buildpack-based deploys.
+
+### Check Instructions
+
+The format of a check instruction is a path or relative URL, optionally followed by the expected content:
+
+```
+/about  Our Amazing Team
+```
+
+The `CHECKS` file can contain multiple checks:
+
+```
+/                       My Amazing App
+/stylesheets/index.css  .body
+/scripts/index.js       $(function()
+/images/logo.png
+```
+
+To check an application that supports multiple hostnames, use relative URLs that include the hostname:
+
+```
+//admin.example.com  Admin Dashboard
+//static.example.com/logo.png
+```
+
+You can also specify the protocol to explicitly check HTTPS requests:
+
+```
+https://admin.example.com  Admin Dashboard
+https://static.example.com/logo.png
+```
+
+### Check Settings
+
+The default behavior is to wait for `5` seconds before running the checks, to timeout the checks after `30` seconds, and to attempt the checks `5` times. If the checks fail `5` times, the deployment is considered failed and the old container will continue serving traffic.
+
+You can change the default behavior by setting `WAIT`, `TIMEOUT`, and `ATTEMPTS` to different values in the `CHECKS` file:
+
+```
+WAIT=30     # Wait 1/2 minute
+TIMEOUT=60  # Timeout after a minute
+ATTEMPTS=10 # Attempt checks 10 times
+
+/  My Amazing App
+```
+
+You can also override the default `WAIT`, `TIMEOUT`, and `ATTEMPTS` variables for the global dokku installation:
+
+```shell
+dokku config:set --global DOKKU_CHECKS_WAIT=30
+dokku config:set --global DOKKU_CHECKS_TIMEOUT=60
+dokku config:set --global DOKKU_CHECKS_ATTEMPTS=10
+```
+
+If your application runs multiple processes (a background worker configured in your `Procfile`, for example) and you have checks to ensure that your web application has booted up, you may want to disable the default check wait time for that application to avoid the `10` second wait per non-web process:
+
+```shell
+dokku config:set <app> DOKKU_DEFAULT_CHECKS_WAIT=0
+```
+
+## Example: Successful Rails Deployment
+
+In this example, a Rails application is successfully deployed to dokku. The initial round of checks fails while the server is starting, but once it starts they succeed and the deployment is successful. `WAIT` is set to `10` because our application takes a while to boot up. `ATTEMPTS` is set to `6`, but the third attempt succeeds.
+
+### CHECKS file
 
 ````
-WAIT=5
+WAIT=10
 ATTEMPTS=6
-/check.txt simple_check
+/check.txt  simple_check
 ````
 
-> check.txt is a text file returning the string 'simple_check'
+For this check to work, we've added a line to `config/routes.rb` that simply returns a string:
 
-## Deploy Output
+````
+get '/check.txt', to: proc {[200, {}, ['simple_check']]}
+````
+
+### Deploy Output
 
 > Note: The output has been trimmed for brevity
 
@@ -66,19 +141,19 @@ git push dokku master
 -----> Releasing myapp...
 -----> Deploying myapp...
 -----> Running pre-flight checks
------> Attempt 1/6 Waiting for 5 seconds ...
+-----> Attempt 1/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/check.txt => "simple_check"
  !
 curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
  !    Check attempt 1/6 failed.
------> Attempt 2/6 Waiting for 5 seconds ...
+-----> Attempt 2/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/check.txt => "simple_check"
  !
 curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
  !    Check attempt 2/6 failed.
------> Attempt 3/6 Waiting for 5 seconds ...
+-----> Attempt 3/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/check.txt => "simple_check"
 -----> All checks successful!
@@ -101,22 +176,23 @@ curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
        http://myapp.dokku.example.com
 ````
 
-# Example: Failing Rails Deployment
-In this example, a Rails application fails to deploy.  The reason for the failure is that the postgres database connection fails.  The initial checks will fail while we wait for the server to start up, just like in the above example.  However, once the server does start accepting connections, we will see an error 500 due to the postgres database connection failure.
+## Example: Failing Rails Deployment
+
+In this example, a Rails application fails to deploy. The reason for the failure is that the postgres database connection fails. The initial checks will fail while we wait for the server to start up, just like in the above example. However, once the server does start accepting connections, we will see an error 500 due to the postgres database connection failure.
 
 Once the attempts have been exceeded, the deployment fails and we see the container output, which shows the Postgres connection errors.
 
-## CHECKS file
+### CHECKS file
 
 ````
-WAIT=5
+WAIT=10
 ATTEMPTS=6
 /
 ````
 
 > The check to the root url '/' would normally access the database.
 
-## Deploy Output
+### Deploy Output
 
 > Note: The output has been trimmed for brevity
 
@@ -137,37 +213,37 @@ Procfile declares types -> web
 Releasing myapp...
 Deploying myapp...
 Running pre-flight checks
------> Attempt 1/6 Waiting for 5 seconds ...
+-----> Attempt 1/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/ => ""
  !
 curl: (7) Failed to connect to 172.17.0.188 port 5000: Connection refused
  !    Check attempt 1/6 failed.
------> Attempt 2/6 Waiting for 5 seconds ...
+-----> Attempt 2/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/ => ""
  !
 curl: (7) Failed to connect to 172.17.0.188 port 5000: Connection refused
  !    Check attempt 2/6 failed.
------> Attempt 3/6 Waiting for 5 seconds ...
+-----> Attempt 3/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/ => ""
  !
 curl: (22) The requested URL returned error: 500 Internal Server Error
  !    Check attempt 3/6 failed.
------> Attempt 4/6 Waiting for 5 seconds ...
+-----> Attempt 4/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/ => ""
  !
 curl: (22) The requested URL returned error: 500 Internal Server Error
  !    Check attempt 4/6 failed.
------> Attempt 5/6 Waiting for 5 seconds ...
+-----> Attempt 5/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/ => ""
  !
 curl: (22) The requested URL returned error: 500 Internal Server Error
  !    Check attempt 5/6 failed.
------> Attempt 6/6 Waiting for 5 seconds ...
+-----> Attempt 6/6 Waiting for 10 seconds ...
        CHECKS expected result:
        http://localhost/ => ""
  !
@@ -201,3 +277,10 @@ To dokku@dokku.example.com:myapp
  ! [remote rejected] dokku -> master (pre-receive hook declined)
 error: failed to push some refs to 'dokku@dokku.example.com:myapp'
 ````
+
+### Configuring docker stop timeout
+
+[By default](https://docs.docker.com/engine/reference/commandline/stop/), docker will wait 10 seconds from the time the `stop` command is passed to a container before it attempts to kill said container. This timeout can be configured on a per-app basis in dokku by setting the `DOKKU_DOCKER_STOP_TIMEOUT` configuration variable. This timeout applies to normal zero-downtime deployments as well as the `ps:stop` and `apps:destroy` commands.
+```
+$ dokku config:set $APP DOKKU_DOCKER_STOP_TIMEOUT=20
+```

docs/community/clients.md

@@ -11,7 +11,11 @@ Of all methods, this is the *most* official method of interacting with your dokk
 To install, simply clone the dokku repository down and add the `dokku` alias pointing at the script:
 
 ```shell
-git clone git@github.com:progrium/dokku.git ~/.dokku
+git clone git@github.com:dokku/dokku.git ~/.dokku
+
+# optional: make sure that the dokku_client.sh version matches your dokku version
+cd ~/.dokku
+git checkout <tag/branch>
 
 # add the following to either your
 # .bashrc, .bash_profile, or .profile file
@@ -33,6 +37,8 @@ alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
 
 Configure the `DOKKU_HOST` environment variable or run `dokku` from a repository with a git remote named dokku pointed at your dokku host in order to use the script as normal.
 
+You can also configure a `DOKKU_PORT` environment variable if you are running ssh on a non-standard port. This defaults to `22`.
+
 ## (nodejs) dokku-toolbelt
 
 Dokku-toolbelt is a node-based cli wrapper that proxies requests to the dokku command running on remote hosts. You can install it via the following shell command (assuming you have nodejs and npm installed):

docs/components.md

@@ -2,7 +2,7 @@
 
  * [Docker](https://github.com/dotcloud/docker) - Container runtime and manager
  * [Herokuish](https://github.com/gliderlabs/herokuish) - Buildpack builder
- * [plugn](https://github.com/progrium/plugn) - Shell based plugins and hooks
- * [sshcommand](https://github.com/progrium/sshcommand) - Fixed commands over SSH
+ * [plugn](https://github.com/dokku/plugn) - Shell based plugins and hooks
+ * [sshcommand](https://github.com/dokku/sshcommand) - Fixed commands over SSH
 
 Looking to keep codebase as simple and hackable as possible, so try to keep your line count down.

docs/configuration-management.md

@@ -1,16 +1,57 @@
-# Configuration management
+# Environment Variables
 
 Typically an application will require some configuration to run properly. Dokku supports application configuration via environment variables. Environment variables may contain private data, such as passwords or API keys, so it is not recommended to store them in your application's repository.
 
 The `config` plugin provides the following commands to manage your variables:
 
 ```
-config <app> - display the config vars for an app
-config:get <app> KEY - display a config value for an app
-config:set <app> KEY1=VALUE1 [KEY2=VALUE2 ...] - set one or more config vars
-config:unset <app> KEY1 [KEY2 ...] - unset one or more config vars
+config (<app>|--global)                                   Display all global or app-specific config vars
+config:get (<app>|--global) KEY                           Display a global or app-specific config value
+config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...] Set one or more config vars
+config:unset (<app>|--global) KEY1 [KEY2 ...]             Unset one or more config vars
 ```
 
-The variables are available both at run time and during the application build/compilation step. You no longer need a `user-env` plugin as Dokku handles this functionality in a way equivalent to how Heroku handles it.
+The variables are available both at run time and during the application build/compilation step for buildpack-based deploys. For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
 
-> Note: Global `BUILD_ENV` files are currently migrated into a global `ENV` file and sourced before app-specific variables. This means that app-specific variables will take precedence over global variables. Configuring your global `ENV` file is manual, and should be considered potentially dangerous as configuration applies to all applications.
+> Note: Global `ENV` files are sourced before app-specific `ENV` files. This means that app-specific variables will take precedence over global variables. Configuring your global `ENV` file is manual, and should be considered potentially dangerous as configuration applies to all applications.
+
+You can set multiple environment variables at once:
+
+```shell
+dokku config:set node-js-app ENV=prod COMPILE_ASSETS=1
+```
+
+When setting variables with whitespaces, you need to escape them:
+
+```shell
+dokku config:set node-js-app KEY=\"VAL\ WITH\ SPACES\"
+```
+
+When setting or unsetting environment variables, you may wish to avoid an application restart. This is useful when developing plugins or when setting multiple environment variables in a scripted manner. To do so, use the `--no-restart` flag:
+
+```shell
+dokku config:set --no-restart node-js-app ENV=prod
+```
+
+If you wish to have the variables output in an `eval`-compatible form, you can use the `--export` flag:
+
+```shell
+dokku config node-js-app --export
+# outputs variables in the form:
+#
+#   export ENV='prod'
+#   export COMPILE_ASSETS='1'
+
+# source in all the node-js-app app environment variables
+eval $(dokku config node-js-app --export)
+```
+
+You can also output the variables in a single-line for usage in command-line utilities with the `--shell` flag:
+
+```shell
+dokku config node-js-app --shell
+
+# outputs variables in the form:
+#
+#   ENV='prod' COMPILE_ASSETS='1'
+```

docs/deployment/buildpacks.md

@@ -0,0 +1,77 @@
+# Buildpack Deployment
+
+Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) for deployment, though this may be overridden by committing a valid `Dockerfile` to the root of your repository and pushing the repository to your Dokku installation. To avoid this automatic `Dockerfile` deployment detection, you may do one of the following:
+
+- Use `dokku config:set` to set the `BUILDPACK_URL` environment variable.
+- Add `BUILDPACK_URL` to a committed `.env` file in the root of your repository.
+- Create a `.buildpacks` file in the root of your repository.
+
+## Specifying a custom buildpack
+
+In certain cases you may want to specify a custom buildpack. While dokku uses herokuish to support all the [official heroku buildpacks](https://github.com/gliderlabs/herokuish#buildpacks), it is possible that the buildpack detection does not work well for your application. As well, you may wish to use a custom buildpack to handle specific application logic.
+
+To use a specific buildpack, you can run the following dokku command:
+
+```shell
+# replace APP with the name of your application
+# replace REPOSITORY_URL with your buildpack's url
+dokku config:set APP BUILDPACK_URL=REPOSITORY_URL
+
+# example: using a specific ruby buildpack version
+dokku config:set APP BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-ruby.git#v142
+```
+
+Please check the documentation for your particular buildpack as you may need to include configuration files (such as a Procfile) in your project root.
+
+## Using multiple buildpacks
+
+You can only set a single buildpack using the `BUILDPACK_URL`, though there may be times when you wish to use multiple buildpacks. To do so, simply create a `.buildpacks` file in the base of your repository. This file should list all the buildpacks, one-per-line. For instance, if you wish to use both the `nodejs` and `ruby` buildpacks, your `.buildpacks` file should contain the following:
+
+```shell
+https://github.com/heroku/heroku-buildpack-nodejs.git#v87
+https://github.com/heroku/heroku-buildpack-ruby.git#v142
+```
+
+> Always remember to pin your buildpack versions when using the multi-buildpacks method, or you may find deploys changing your deployed environment.
+
+You may also choose to set just a single buildpack in this file, though that is up to you.
+
+Please check the documentation for your particular buildpack(s) as you may need to include configuration files (such as a Procfile) in your project root.
+
+## Using a specific buildpack version
+
+As Dokku pins all buildpacks via herokuish releases, there may be occasions where a local buildpack version is out of date. If you wish to use a more recent version of the buildpack, you may use any of the above methods to specify a buildpack **without** the git sha attached like so:
+
+```shell
+# using the latest nodejs buildpack
+# replace APP with the name of your application
+dokku config:set APP BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs
+```
+
+You may also wish to use a **specific** version of a buildpack, which is also simple
+
+```shell
+# using v87 of the nodejs buildpack
+# replace APP with the name of your application
+dokku config:set APP BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs#v87
+```
+
+## Clearing buildpack cache
+
+Building containers with buildpacks currently results in a persistent `cache` directory between deploys. If you need to clear this cache directory for any reason, you may do so by running the following shell command:
+
+```shell
+# replace APP with the name of your application
+sudo rm -rf /home/dokku/APP/cache/*
+```
+
+## Curl Build Timeouts
+
+Certain buildpacks may time out in retrieving dependencies via curl. This can happen when your network connection is poor or if there is significant network congestion. You may see a message similar to `gzip: stdin: unexpected end of file` after a curl command.
+
+If you see output similar this when deploying , you may need to override the curl timeouts to increase the length of time allotted to those tasks. You can do so via the `config` plugin:
+
+```shell
+dokku config:set --global CURL_TIMEOUT=600
+dokku config:set --global CURL_CONNECT_TIMEOUT=30
+```

docs/deployment/deployment-tasks.md

@@ -0,0 +1,57 @@
+# Deployment Tasks
+
+> New as of 0.5.0
+
+Sometimes you need to run a command on at deployment time, but before an app is completely deployed.
+Common use cases include:
+
+* Checking a database is initialised
+* Running database migrations
+* Any commands required to set up the server (e.g. something like a Django `collectstatic`)
+
+## `app.json` and `scripts.dokku`
+
+Dokku accomplishes this by using an `app.json` file. We (mostly) use the same format as Heroku's [app.json](https://devcenter.heroku.com/articles/app-json-schema).
+However, dokku currently only supports the nodes `scripts.dokku.predeploy` and `scripts.dokku.postdeploy`.
+Simply place an `app.json` file in the root of your repository or for dockerfile apps, `ADD` it to /app.
+>NOTE: postdeploy changes are *NOT* committed to the app image.
+
+### Example app.json
+
+```
+{
+  "name": "barebones nodejs",
+  "description": "A barebones Node.js app using Express 4.",
+  "keywords": [
+    "nodejs",
+    "express"
+  ],
+  "repository": "https://github.com/michaelshobbs/node-js-sample",
+  "scripts": {
+    "dokku": {
+      "predeploy": "touch /app/predeploy.test",
+      "postdeploy": "curl https://some.external.api.service.com/deployment?state=success"
+    }
+  },
+  "env": {
+    "SECRET_TOKEN": {
+      "description": "A secret key for verifying the integrity of signed cookies.",
+      "value": "secret"
+    },
+    "WEB_CONCURRENCY": {
+      "description": "The number of processes to run.",
+      "generator": "echo 5"
+    }
+  },
+  "image": "gliderlabs/herokuish",
+  "addons": [
+    "dokku-postgres",
+    "dokku-redis"
+  ],
+  "buildpacks": [
+    {
+      "url": "https://github.com/heroku/heroku-buildpack-nodejs"
+    }
+  ]
+}
+```

docs/deployment/dockerfiles.md

@@ -0,0 +1,74 @@
+# Dockerfile Deployment
+
+> New as of 0.3.15
+
+While Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) for deployment, you can also use docker's native `Dockerfile` system to define a container.
+
+> Dockerfile support is considered a **Power User** feature. By using Dockerfile-based deployment, you agree that you will not have the same comfort as that enjoyed by Buildpack users, and Dokku features may work differently. Differences between the two systems will be documented here.
+
+To use a dockerfiles for deployment, commit a valid `Dockerfile` to the root of your repository and push the repository to your Dokku installation. If this file is detected, Dokku will default to using it to construct containers **except** in the following two cases:
+
+- The application has a `BUILDPACK_URL` environment variable set via the `dokku config:set` command or in a committed `.env` file. In this case, Dokku will use your specified buildpack.
+- The application has a `.buildpacks` file in the root of the repository. In this case, Dokku will use your specified buildpack(s).
+
+## Exposed ports
+
+> Changed as of 0.5.0
+
+Dokku will extract all tcp ports exposed using the `EXPOSE` directive (one port per line) and setup nginx to proxy the same port numbers to listen publicly. If you would like to change the exposed port, you should do so within your `Dockerfile` and app.
+
+> NOTE: Nginx does not support proxying UDP. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`
+
+If you do not explicitly `EXPOSE` a port in your `Dockerfile`, dokku will configure the nginx proxy to listen on port 80 (and 443 for TLS) and forward traffic to your app listening on port 5000 inside the container. Just like buildpack apps, you can also use the `$PORT` environment variable in your app to maintain portability.
+
+When ports are exposed through the default nginx proxy, they are proxied externally as HTTP ports. At this time, in no case do we proxy plain TCP or UDP ports. If you'd like to investigate alternative proxy methods, please refer to our [proxy documentation](/dokku/proxy/).
+
+## Customizing the run command
+
+By default no arguments are passed to `docker run` when deploying the container and the `CMD` or `ENTRYPOINT` defined in the `Dockerfile` are executed. You can take advantage of docker ability of overriding the `CMD` or passing parameters to your `ENTRYPOINT` setting `$DOKKU_DOCKERFILE_START_CMD`. Let's say for example you are deploying a base nodejs image, with the following `ENTRYPOINT`:
+
+```
+ENTRYPOINT ["node"]
+```
+
+You can do:
+
+```
+dokku config:set APP DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
+```
+
+To tell docker what to run.
+
+Setting `$DOKKU_DOCKERFILE_CACHE_BUILD` to `true` or `false` will enable or disable docker's image layer cache. Lastly, for more granular build control, you may also pass any `docker build` option to `docker`, by setting `$DOKKU_DOCKER_BUILD_OPTS`.
+
+### Procfiles and Multiple Processes
+
+> New as of 0.5.0
+
+You can also customize the run command using a `Procfile`, much like you would on Heroku or
+with a buildpack deployed app. The `Procfile` should contain one or more lines defining [process
+types and associated commands](https://devcenter.heroku.com/articles/procfile#declaring-process-types).
+When you deploy your app a Docker image will be built, the `Procfile` will be extracted from the image
+(it must be in the folder defined in your `Dockerfile` as `WORKDIR` or `/app`) and the commands
+in it will be passed to `docker run` to start your process(es). Here's an example `Procfile`:
+
+```
+web: bin/run-prod.sh
+worker: bin/run-worker.sh
+```
+
+And `Dockerfile`:
+
+```
+FROM debian:jessie
+WORKDIR /app
+COPY . ./
+CMD ["bin/run-dev.sh"]
+```
+
+When you deploy this app the `web` process will automatically be scaled to 1 and your Docker container
+will be started basically using the command `docker run bin/run-prod.sh`. If you want to also run
+a worker container for this app, you can run `dokku ps:scale worker=1` and a new container will be
+started by running `docker run bin/run-worker.sh` (the actual `docker run` commands are a bit more
+complex, but this is the basic idea). If you use an `ENTRYPOINT` in your `Dockerfile`, the lines
+in your `Procfile` will be passed as arguments to the `ENTRYPOINT` script instead of being executed.

docs/deployment/domain-configuration.md

@@ -0,0 +1,98 @@
+# Domain Configuration
+
+> New as of 0.3.10
+
+```shell
+domains:add <app> DOMAIN                                                                     Add a domain to app
+domains [<app>]                                                                              List domains
+domains:clear <app>                                                                          Clear all domains for app
+domains:disable <app>                                                                        Disable VHOST support
+domains:enable <app>                                                                         Enable VHOST support
+domains:remove <app> DOMAIN                                                                  Remove a domain from app
+domains:set-global <domain>                                                                  Set global domain name
+```
+
+## Customizing hostnames
+
+Applications typically have the following structure for their hostname:
+
+```
+scheme://subdomain.domain.tld
+```
+
+The `subdomain` is inferred from the pushed application name, while the `domain.tld` is set during initial configuration and stored in the `$DOKKU_ROOT/VHOST` file. It can then be modified with `dokku domains:set-global`. This value is used as a default TLD for all applications on a host.
+
+If a FQDN such as `other.tld` is used as the application name, the default `$DOKKU_ROOT/VHOST` will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
+
+You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. For example, you can reverse the subdomain with the following sample `nginx-hostname` plugin trigger:
+
+```shell
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1"; SUBDOMAIN="$2"; VHOST="$3"
+
+NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
+echo "$NEW_SUBDOMAIN.$VHOST"
+```
+
+If the `nginx-hostname` has no output, the normal hostname algorithm will be executed.
+
+## Disabling VHOSTS
+
+If desired, it is possible to disable vhosts with the domains plugin.
+
+```shell
+dokku domains:disable myapp
+```
+
+On subsequent deploys, the nginx virtualhost will be discarded. This is useful when deploying internal-facing services that should not be publicly routeable. As of 0.4.0, nginx will still be configured to proxy your app on some random high port. This allows internal services to maintain the same port between deployments. You may change this port by setting `DOKKU_NGINX_PORT` and/or `DOKKU_NGINX_SSL_PORT` (for services configured to use SSL.)
+
+
+The domains plugin allows you to specify custom domains for applications. This plugin is aware of any ssl certificates that are imported via `certs:add`. Be aware that disabling domains (with `domains:disable`) will override any custom domains.
+
+```shell
+# where `myapp` is the name of your app
+
+# add a domain to an app
+dokku domains:add myapp example.com
+
+# list custom domains for app
+dokku domains myapp
+
+# clear all custom domains for app
+dokku domains:clear myapp
+
+# remove a custom domain from app
+dokku domains:remove myapp example.com
+```
+
+## Default site
+
+By default, dokku will route any received request with an unknown HOST header value to the lexicographically first site in the nginx config stack. If this is not the desired behavior, you may want to add the following configuration to the global nginx configuration. This will catch all unknown HOST header values and return a `410 Gone` response. You can replace the `return 410;` with `return 444;` which will cause nginx to not respond to requests that do not match known domains (connection refused).
+
+```
+server {
+  listen 80 default_server;
+  listen [::]:80 default_server;
+
+  server_name _;
+  return 410;
+  log_not_found off;
+}
+```
+
+You may also wish to use a separate vhost in your `/etc/nginx/sites-enabled` directory. To do so, create the vhost in that directory as `/etc/nginx/sites-enabled/00-default.conf`. You will also need to change two lines in the main `nginx.conf`:
+
+```
+# Swap both conf.d include line and the sites-enabled include line. From:
+include /etc/nginx/conf.d/*.conf;
+include /etc/nginx/sites-enabled/*;
+
+# to the following
+
+include /etc/nginx/sites-enabled/*;
+include /etc/nginx/conf.d/*.conf;
+```
+
+Alternatively, you may push an app to your dokku host with a name like "00-default". As long as it lists first in `ls /home/dokku/*/nginx.conf | head`, it will be used as the default nginx vhost.

docs/deployment/images.md

@@ -0,0 +1,121 @@
+# Image Tagging
+
+> New as of 0.4.0
+
+The dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
+
+```
+tags <app>                                       List all app image tags
+tags:create <app> <tag>                          Add tag to latest running app image
+tags:deploy <app> <tag>                          Deploy tagged app image
+tags:destroy <app> <tag>                         Remove app image tag
+```
+
+Example:
+
+```
+root@dokku:~# dokku tags node-js-app
+=====> Image tags for dokku/node-js-app
+REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
+dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
+
+root@dokku:~# dokku tags:create node-js-app v0.9.0
+=====> Added v0.9.0 tag to dokku/node-js-app
+
+root@dokku:~# dokku tags node-js-app
+=====> Image tags for dokku/node-js-app
+REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
+dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
+dokku/node-js-app   v0.9.0              936a42f25901        About a minute ago   1.025 GB
+
+root@dokku:~# dokku tags:deploy node-js-app v0.9.0
+-----> Releasing node-js-app (dokku/node-js-app:v0.9.0)...
+-----> Deploying node-js-app (dokku/node-js-app:v0.9.0)...
+-----> Running pre-flight checks
+       For more efficient zero downtime deployments, create a file CHECKS.
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
+       CHECKS file not found in container: Running simple container check...
+-----> Waiting for 10 seconds ...
+-----> Default container check successful!
+=====> node-js-app container output:
+       Detected 512 MB available memory, 512 MB limit per process (WEB_MEMORY)
+       Recommending WEB_CONCURRENCY=1
+       > node-js-app@0.1.0 start /app
+       > node index.js
+       Node app is running at localhost:5000
+=====> end node-js-app container output
+-----> Running post-deploy
+-----> Configuring node-js-app.dokku.me...
+-----> Creating http nginx.conf
+-----> Running nginx-pre-reload
+       Reloading nginx
+-----> Shutting down old containers in 60 seconds
+=====> 025eec3fa3b442fded90933d58d8ed8422901f0449f5ea0c23d00515af5d3137
+=====> Application deployed:
+       http://node-js-app.dokku.me
+
+```
+
+## Deploying from a Docker Registry
+
+You can alternatively add image pulled from a docker Registry and deploy app from it by using tagging feature. In this example, we are deploying from Docker Hub.
+
+1. Create dokku app as usual
+
+    ```shell
+    dokku apps:create test-app
+    ```
+
+2. Pull image from Docker Hub
+
+    ```shell
+    docker pull demo-repo/some-image:v12
+    ```
+
+3. Retag the image to match the created app
+
+    ```shell
+    docker tag demo-repo/some-image:v12 dokku/test-app:v12
+    ```
+
+4. Deploy tag
+
+    ```shell
+    dokku tags:deploy test-app v12
+    ```
+
+## Deploying an image from CI
+
+To ensure your builds are always reproducible, it's considered bad practice to store build
+artifacts in your repository. For some projects however, building artifacts during deployment
+to dokku may affect the performance of running applications.
+
+One solution is to build a finished Docker image on a CI service (or even locally) and deploy
+it directly to the host running dokku.
+
+1. Build image on CI (or locally)
+
+    ```shell
+    docker build -t dokku/test-app:v12
+    # Note: The image must be tagged `dokku/<app-name>:<version>`
+    ```
+
+2. Deploy image to dokku host
+
+    ```shell
+    docker save dokku/test-app:v12 | ssh my.dokku.host "docker load | dokku tags:deploy test-app v12"
+    ```
+
+> Note: You can also use a Docker Registry to push and pull
+> the image rather than uploading it directly.
+
+Here's a more complete example using the above method:
+
+```shell
+# build the image
+docker build -t dokku/test-app:v12
+# copy the image to the dokku host
+docker save dokku/test-app:v12 | bzip2 | ssh my.dokku.host "bunzip2 | docker load"
+# tag and deploy the image
+ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12 && dokku tags:create test-app latest"
+```

docs/deployment/one-off-processes.md

@@ -0,0 +1,149 @@
+# One-off Processes and Cron
+
+Sometimes you need to either inspect running containers or run a one-off command under an application. In those cases, Dokku makes it easy to either connect to a running container or run a fresh container.
+
+## Run a command in an app environment
+
+```
+run <app> <cmd>                                  Run a command in the environment of an application
+```
+
+The `run` command can be used to run a one-off process for a specific command. This will start a new container and run the desired command within that container. Note that this container will be stay around even after command completes. The container will be the same container as was used to start the currently deployed application.
+
+```shell
+# runs `ls -lah` in the `/app` directory of the application `node-js-app`
+dokku run node-js-app ls -lah
+```
+
+If you want to remove the container after a command has started, you can run the following command:
+
+```shell
+# keep `run` containers around
+dokku config:set --global DOKKU_RM_CONTAINER=1
+
+# revert the above setting and keep containers around
+dokku config:unset --global DOKKU_RM_CONTAINER
+```
+
+You may also use the `--rm-container` or `--rm` dokku flags to remove the containers automatically:
+
+```shell
+dokku --rm-container run node-js-app ls -lah
+dokku --rm run node-js-app ls -lah
+```
+
+### Using `run` for cron tasks
+
+You can always use a one-off container to run an application task:
+
+```shell
+dokku --rm run node-js-app some-command
+dokku --rm-container run node-js-app some-command
+```
+
+For tasks that should not be interrupted, run is the **preferred** method of handling cron tasks, as the container will continue running even during a deploy or scaling event. The trade-off is that there will be an increase in memory usage if there are multiple concurrent tasks running.
+
+## Entering existing containers
+
+> New as of 0.4.0
+
+```
+enter <app>  [<container-type> || --container-id <container-id>]   Connect to a specific app container
+```
+
+The `enter` command can be used to enter a running container. The following variations of the command exist:
+
+```shell
+dokku enter node-js-app web
+dokku enter node-js-app web.1
+dokku enter node-js-app --container-id ID
+```
+
+By default, it runs a `/bin/bash`, but can also be used to run a custom command:
+
+```shell
+# just echo hi
+dokku enter node-js-app web echo hi
+
+# run a long-running command, as one might for a cron task
+dokku enter node-js-app web python script/background-worker.py
+```
+
+### Using `enter` for cron tasks
+
+Your procfile can have the following entry:
+
+```
+cron: sleep infinity
+```
+
+With the `cron` process scaled to `1`:
+
+```shell
+dokku ps:scale node-js-app cron=1
+```
+
+You can now run all your commands in that container:
+
+```shell
+dokku enter api cron some-command
+```
+
+Note that you can also run multiple commands at the same time to reduce memory usage, though that may result in polluting the container environment.
+
+For tasks that will properly resume, you **should** use the above method, as running tasks will be interrupted during deploys and scaling events, and subsequent commands will always run with the latest container. Note that if you scale the cron container down, this may interrupt proper running of the task.
+
+## General Cron Recommendations
+
+Regularly scheduled tasks can be a bit of a pain with dokku. The following are general recommendations to follow to help ensure successful task runs.
+
+- Use the dokku user's crontab
+  - If you do not, dokku will attempt to execute with sudo dokku, and your cron run with fail with `sudo: no tty present and no askpass program specified`
+- Add a `MAILTO` environment variable to ship cron emails to yourself.
+- Add a `PATH` environment variable or specify the full path to binaries on the host.
+- Add a `SHELL` environment variable to specify bash when running commands.
+- Keep your cron tasks in time-sorted order.
+- Keep your server time in UTC so you don't need to translate daylight saving's time when reading the cronfile.
+- Run tasks at the lowest traffic times if possible.
+- Use cron to **trigger** jobs, not run them. Use a real queuing system such as rabbitmq to actually process jobs.
+- Try to keep tasks quiet so that mails only send on errors.
+- Do not silence standard error or standard out. If you silence the former, you will miss failures. Silencing the latter means you should actually make application changes to handle log levels.
+- Use a service such as [Dead Man's Snitch](https://deadmanssnitch.com) to verify that cron tasks completed successfully.
+- Add lots of comments to your cronfile, including what a task is doing, so that you don't spend time deciphering the file later.
+- Place your cronfiles in a pattern such as `/etc/cron.d/APP`.
+- Do not use non-ascii characters in your cronfile names. Cron is finicky.
+- Remember to have trailing newlines in your cronfile! Cron is finicky.
+
+The following is a sample cronfile that you can use for your applications:
+
+```
+# server cron jobs
+MAILTO="mail@example.com"
+PATH=/usr/local/bin:/usr/bin:/bin
+SHELL=/bin/bash
+
+# m   h   dom mon dow   username command
+# *   *   *   *   *     dokku    command to be executed
+# -   -   -   -   -
+# |   |   |   |   |
+# |   |   |   |   +----- day of week (0 - 6) (Sunday=0)
+# |   |   |   +------- month (1 - 12)
+# |   |   +--------- day of month (1 - 31)
+# |   +----------- hour (0 - 23)
+# +----------- min (0 - 59)
+
+### HIGH TRAFFIC TIME IS B/W 00:00 - 04:00 AND 14:00 - 23:59
+### RUN YOUR TASKS FROM 04:00 - 14:00
+### KEEP SORTED IN TIME ORDER
+
+### PLACE ALL CRON TASKS BELOW
+
+# removes unresponsive users from the subscriber list to decrease bounce rates
+0 0 * * * dokku dokku --rm run node-js-app some-command
+
+# sends out our email alerts to users
+0 1 * * * dokku dokku ps:scale node-js-app cron=1 && dokku enter node-js-app cron some-other-command && dokku ps:scale node-js-app cron=0
+
+### PLACE ALL CRON TASKS ABOVE, DO NOT REMOVE THE WHITESPACE AFTER THIS LINE
+
+```

docs/deployment/ssl-configuration.md

@@ -5,11 +5,14 @@
 Dokku supports SSL/TLS certificate inspection and CSR/Self-signed certificate generation via the `certs` plugin. Note that whenever SSL/TLS support is enabled SPDY is also enabled.
 
 ```
-certs:add <app> CRT KEY                                     Add an ssl endpoint to an app. Can also import from a tarball on stdin.
-certs:generate <app> DOMAIN                                 Generate a key and certificate signing request (and self-signed certificate)
-certs:info <app>                                            Show certificate information for an ssl endpoint.
-certs:remove <app>                                          Remove an SSL Endpoint from an app.
-certs:update <app> CRT KEY                                  Update an SSL Endpoint on an app. Can also import from a tarball on stdin
+certs:add <app> CRT KEY                          Add an ssl endpoint to an app. Can also import from a tarball on stdin.
+certs:generate <app> DOMAIN                      Generate a key and certificate signing request (and self-signed certificate)
+certs:info <app>                                 Show certificate information for an ssl endpoint.
+certs:remove <app>                               Remove an SSL Endpoint from an app.
+certs:update <app> CRT KEY                       Update an SSL Endpoint on an app. Can also import from a tarball on stdin
+
+# for 0.3.x
+dokku nginx:import-ssl <app> < certs.tar
 ```
 
 ## Per-application certificate management
@@ -22,17 +25,29 @@ The `certs:add` command can be used to push a `tar` containing a certificate `.c
 
 ```shell
 tar cvf cert-key.tar server.crt server.key
-# replace APP with your app name
-dokku certs:add < cert-key.tar
+# replace APP with the name of your application
+dokku certs:add <app> < cert-key.tar
 ```
 
+> Note: If your `.crt` file came alongside a `.ca-bundle`, you'll want to concatenate those into a single `.crt` file before adding it to the `.tar`.
+
+```shell
+cat yourdomain_com.crt yourdomain_com.ca-bundle > server.crt
+```
+
+#### SSL and Multiple Domains
+
+When an SSL certificate is associated to an application, the certificate will be associated with *all* domains currently associated with said application. Your certificate _should_ be associated with all of those domains, otherwise accessing the application will result in SSL errors. If you wish to remove one of the domains from the application, refer to the [domain configuration documentation](/dokku/deployment/domain-configuration/).
+
+Note that with the default nginx template, requests will be redirected to the `https` version of the domain. If this is not the desired state of request resolution, you may customize the nginx template in use. For more details, see the [nginx documentation](/dokku/nginx/).
+
 ### Certificate generation
 
 > Note: Using this method will create a self-signed certificate, which is only recommended for development or staging use, not production environments.
 
 The `certs:generate` command will walk you through the correct `openssl` commands to create a key, csr and a self-signed cert for a given app/domain. We automatically put the self-signed cert in place as well as add the specified domain to the application configuration.
 
-If you decide to obtain a CA signed certficate, you can import that certicate using the aformentioned `dokku certs:add` command.
+If you decide to obtain a CA signed certficate, you can import that certificate using the aformentioned `dokku certs:add` command.
 
 ### Certificate information
 
@@ -55,37 +70,55 @@ root@dokku:~/dokku# dokku certs:info node-js-app
 
 The `certs:remove` command only works on app-specific certificates. It will `rm` the app-specific tls directory, rebuild the nginx configuration, and reload nginx.
 
-## Global Certification
-
-Global certificate management is a manual process. To enable TLS connections for all your applications at once you will need a wildcard TLS certificate.
-
-To enable TLS across all apps, you can run the following commands:
-
-```shell
-mkdir -p /home/dokku/tls
-cp server.crt /home/dokku/tls/server.crt
-cp server.key /home/dokku/tls/server.key
-```
-
-Next, you will want to enable the certificates by editing `/etc/nginx/conf.d/dokku.conf` and uncommenting these two lines (remove the `#`):
-
-```
-ssl_certificate /home/dokku/tls/server.crt;
-ssl_certificate_key /home/dokku/tls/server.key;
-```
-
-The settings will take affect at the next deploy. If you would like to propagate the change to all apps immediately, you can also run the following command:
-
-```shell
-dokku ps:restartall
-```
-
-Once TLS is enabled, the application will be accessible by `https://` (redirection from `http://` is applied as well).
-
-> Note: TLS will not be enabled unless the application's VHOST matches the certificate's name. (i.e. if you have a cert for `*.example.com` TLS won't be enabled for `something.example.org` or `example.net`)
 
 ## HSTS Header
 
 The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.
 
 Beware that if you enable the header and a subsequent deploy of your application results in an HTTP deploy (for whatever reason), the way the header works means that a browser will not attempt to request the HTTP version of your site if the HTTPS version fails.
+
+## Running behind a load balancer
+
+Your application has access to the HTTP headers `X-Forwarded-Proto`, `X-Forwarded-For` and `X-Forwarded-Port`. These headers indicate the protocol of the original request (HTTP or HTTPS), the port number, and the IP address of the client making the request, respectively. The default configuration is for Nginx to set these headers.
+
+If your server runs behind an HTTP/S load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using the following [nginx custom template](/dokku/nginx/#customizing-the-nginx-configuration)
+
+```shell
+upstream {{ .APP }} {
+{{ range .DOKKU_APP_LISTENERS | split " " }}
+  server {{ . }};
+{{ end }}
+}
+
+server {
+  listen      [::]:{{ .NGINX_PORT }};
+  listen      {{ .NGINX_PORT }};
+  server_name {{ .NOSSL_SERVER_NAME }};
+  access_log  /var/log/nginx/{{ .APP }}-access.log;
+  error_log   /var/log/nginx/{{ .APP }}-error.log;
+
+  # set a custom header for requests
+  add_header X-Served-By www-ec2-01;
+
+  location    / {
+    proxy_pass  http://{{ .APP }};
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
+    proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+    proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
+    proxy_set_header X-Request-Start $msec;
+  }
+  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
+}
+```
+
+Only use this option if:
+1. All requests are terminated at the load balancer, and forwarded to Nginx
+2. The load balancer is configured to send the `X-Forwarded-` headers (this may be off by default)
+
+If it's possible to make HTTP/S requests directly to Nginx, bypassing the load balancer, or if the load balancer is not configured to set these headers, then it becomes possible for a client to set these headers to arbitrary values.
+
+This could result in security issue, for example, if your application looks at the value of the `X-Forwarded-Proto` to determine if the request was made over HTTPS.

docs/deployment/user-management.md

@@ -0,0 +1,48 @@
+# User Management
+
+While it is possible to use password-based authorization to push to Dokku, it is preferable to use key-based authentication for security.
+
+Users in dokku are managed via the `~/dokku/.ssh/authorized_keys` file. While you *can* manually edit this file, it is **highly** recommended that you follow the below steps to manage users on a dokku server.
+
+## SSHCommand
+
+Dokku uses the [`sshcommand`](https://github.com/dokku/sshcommand) utility to manage ssh keys for the dokku user. The following is the usage output for sshcommand.
+
+```
+sshcommand create <user> <command>              # creates a user forced to run command when SSH connects
+sshcommand acl-add <user> <ssh-key-name>        # adds named SSH key to user from STDIN
+sshcommand acl-remove <user> <ssh-key-name>     # removes SSH key by name
+sshcommand help                                 # displays the usage help message
+```
+
+In dokku's case, the `<user>` section is *always* `dokku`, as this is the system user that the dokku binary performs all it's actions. Keys are given unique names, which can be used in conjunction with the [user-auth](/dokku/development/plugin-triggers/#user-auth) plugin trigger to handle command authorization.
+
+## Adding deploy users
+
+You can add your public key to the dokku user's `~/dokku/.ssh/authorized_keys` file with the following command:
+
+```shell
+# from your local machine
+# replace dokku.me with your domain name or the host's IP
+# replace root with your server's root user
+# USER is the username you use to refer to this particular key
+cat ~/.ssh/id_rsa.pub | ssh root@dokku.me "sudo sshcommand acl-add dokku USER"
+```
+
+At it's base, the `sshcommand` *must* be run under a user with sudo access, as it sets keys for the dokku user.
+
+For instance, if you stored your public key at `~/.ssh/id_rsa.pub-open` and are deploying to EC2 where the default root-enabled user is `ubuntu`, you can run the following command to add your key under the `superuser` username:
+
+```
+cat ~/.ssh/id_rsa.pub-open | ssh ubuntu@dokku.me "sudo sshcommand acl-add dokku superuser"
+```
+
+If you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to dokku (it will use your host username as the `USER`):
+
+```
+cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
+```
+
+## Scoping commands to specific users
+
+See the [user auth plugin trigger documentation](/dokku/development/plugin-triggers/#user-auth).

docs/development/plugin-creation.md

@@ -3,38 +3,102 @@
 If you create your own plugin:
 
 1. Take a look at the plugins shipped with dokku and hack away!
-2. Check out the [list of triggers](http://progrium.viewdocs.io/dokku/development/plugin-triggers) your plugin can implement.
+2. Check out the [list of triggers](/dokku/development/plugin-triggers) your plugin can implement.
 3. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
-4. Edit [this page](http://progrium.viewdocs.io/dokku/plugins) and add a link to it.
+4. Edit [this page](/dokku/plugins) and add a link to it.
 5. Subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases
 
-### Sample plugin
 
-The below plugin is a dummy `dokku hello` plugin. If your plugin exposes commands, this is a good template for your `commands` file:
+### Sample plugin
+The below plugin is a dummy `dokku hello` plugin.
+
+hello/subcommands/default
 
 ```shell
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
+hello_main_cmd() {
+  declare desc="prints Hello \$APP"
+  local cmd="hello"
+  # Support --app/$DOKKU_APP_NAME flag
+  # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@""
+  local argv=("$@")
+  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
+  set -- $cmd $@
+  ##
+
+  [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
+  verify_app_name "$2"
+  local APP="$2";
+
+  echo "Hello $APP"
+}
+
+hello_main_cmd "$@"
+```
+
+hello/subcommands/world
+
+```shell
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+hello_world_cmd() {
+  declare desc="prints Hello World"
+  local cmd="hello:world"
+  # Support --app/$DOKKU_APP_NAME flag
+  # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@""
+  local argv=("$@")
+  [[ ${argv[0]} == "$cmd" ]] && shift 1
+  [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
+  set -- $cmd $@
+  ##
+
+  [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
+  verify_app_name "$2"
+  local APP="$2";
+
+  echo "Hello world"
+}
+
+hello_world_cmd "$@"
+```
+
+hello/commands
+
+```shell
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 case "$1" in
-  hello)
-    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-    APP="$2"; IMAGE_TAG=$(get_running_image_tag $APP); IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-    verify_app_name "$APP"
-
-    echo "Hello $APP"
-    ;;
-
-  hello:world)
-    echo "Hello world"
-    ;;
-
-  help)
-    cat<<EOF
+  help | hello:help)
+    help_content_func () {
+      declare desc="return help_content string"
+      cat<<help_content
     hello <app>, Says "Hello <app>"
     hello:world, Says "Hello world"
-EOF
+help_content
+    }
+
+    if [[ $1 = "hello:help" ]] ; then
+        echo -e 'Usage: dokku hello[:world] [<app>]'
+        echo ''
+        echo 'Say Hello World.'
+        echo ''
+        echo 'Example:'
+        echo ''
+        echo '$ dokku hello:world'
+        echo 'Hello world'
+        echo ''
+        echo 'Additional commands:'
+        help_content_func | sort | column -c2 -t -s,
+    else
+        help_content_func
+    fi
     ;;
 
   *)
@@ -89,4 +153,5 @@ A few notes:
   dokku config:unset --no-restart APP KEY1 [KEY2 ...]
   ```
 - From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
-- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](http://progrium.viewdocs.io/dokku/development/plugin-triggers) doc for examples.
+- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](/dokku/development/plugin-triggers) doc for examples.
+- As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup`. If manually calling `docker run`, include `$DOKKU_GLOBAL_RUN_ARGS`. This will ensure you intermediate containers labeled correctly.

docs/development/plugin-triggers.md

@@ -1,6 +1,6 @@
 # Plugin triggers
 
-[Plugin triggers](https://github.com/progrium/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing dokku infrastructure. You can use them to modify the output of various dokku commands or override internal configuration.
+[Plugin triggers](https://github.com/dokku/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing dokku infrastructure. You can use them to modify the output of various dokku commands or override internal configuration.
 
 Plugin triggers are simply scripts that are executed by the system. You can use any language you want, so long as the script:
 
@@ -23,311 +23,27 @@ echo "$NEW_SUBDOMAIN.$VHOST"
 
 ## Available plugin triggers
 
-There are a number of plugin-related triggers. These can be optionally implemented by plugins and allow integration into the standard dokku setup/backup/teardown process.
+There are a number of plugin-related triggers. These can be optionally implemented by plugins and allow integration into the standard dokku setup/teardown process.
 
 The following plugin triggers describe those available to a dokku installation. As well, there is an example for each trigger that you can use as templates for your own plugin development.
 
 > The example plugin trigger code is not guaranteed to be implemented as in within dokkku, and are merely simplified examples. Please look at the dokku source for larger, more in-depth examples.
 
-### `install`
+### `bind-external-ip`
 
-- Description: Used to setup any files/configuration for a plugin.
-- Invoked by: `dokku plugin:install`.
-- Arguments: None
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Sets the hostname of the dokku server
-# based on the output of `hostname -f`
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-if [[ ! -f  "$DOKKU_ROOT/HOSTNAME" ]]; then
-  hostname -f > $DOKKU_ROOT/HOSTNAME
-fi
-```
-
-### `dependencies`
-
-- Description: Used to install system-level dependencies. Invoked by `plugin:install-dependencies`.
-- Invoked by: `dokku plugin:install-dependencies`
-- Arguments: None
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Installs nginx for the current plugin
-# Supports both opensuse and ubuntu
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-case "$DOKKU_DISTRO" in
-  ubuntu)
-    export DEBIAN_FRONTEND=noninteractive
-    apt-get install --force-yes -qq -y nginx
-    ;;
-
-  opensuse)
-    zypper -q in -y nginx
-    ;;
-esac
-```
-
-### `update`
-
-- Description: Can be used to run plugin updates on a regular interval. You can schedule the invoker in a cron-task to ensure your system gets regular updates.
-- Invoked by: `dokku plugin:update`.
-- Arguments: None
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Update the herokuish image from git source
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-cd /root/dokku
-sudo BUILD_STACK=true make install
-```
-
-### `commands help`
-
-- Description: Used to aggregate all plugin `help` output. Your plugin should implement a `help` command in your `commands` file to take advantage of this plugin trigger. This must be implemented inside the `commands` plugin file.
-- Invoked by: `dokku help`
-- Arguments: None
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Outputs help for the derp plugin
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-case "$1" in
-  help | derp:help)
-    cat<<EOF
-    derp:herp, Herps the derp
-    derp:serp [file], Shows the file's serp
-EOF
-    ;;
-
-  *)
-    exit $DOKKU_NOT_IMPLEMENTED_EXIT
-    ;;
-
-esac
-```
-
-### `backup-export`
-
-- Description: Used to backup files for a given plugin. If your plugin writes files to disk, this plugin trigger should be used to echo out their full paths. Any files listed will be copied by the backup plugin to the backup tar.gz.
-- Invoked by: `dokku backup:export`
-- Arguments: `$VERSION $DOKKU_ROOT`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Echos out the location of every `REDIRECT` file
-# that are used by the apps
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-shopt -s nullglob
-VERSION="$1"
-DOKKU_ROOT="$2"
-
-cat; for i in $DOKKU_ROOT/*/REDIRECT; do echo $i; done
-```
-
-### `backup-check`
-
-- Description: Checks that a backup being imported passes sanity checks.
-- Invoked by: `dokku backup:import`
-- Arguments: `$VERSION $BACKUP_ROOT $DOKKU_ROOT $BACKUP_TMP_DIR/.dokku_backup_apps`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-# TODO
-```
-
-### `backup-import`
-
-- Description: Allows a plugin to import specific files from a `$BACKUP_ROOT` to the `DOKKU_ROOT` directory.
-- Invoked by: `dokku backup:import`
-- Arguments: `$VERSION $BACKUP_ROOT $DOKKU_ROOT $BACKUP_TMP_DIR/.dokku_backup_apps`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Copies all redirect files from the backup
-# into the correct app path.
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-shopt -s nullglob
-VERSION="$1"
-BACKUP_ROOT="$2"
-DOKKU_ROOT="$3"
-
-cd $BACKUP_ROOT
-for file in */REDIRECT; do
-  cp $file "$DOKKU_ROOT/$file"
-done
-```
-
-### `pre-build-buildpack`
-
-- Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to applications using buildpacks.
-- Invoked by: `dokku build`
+- Description: Allows you to disable binding to the external box ip
+- Invoked by: `dokku deploy`
 - Arguments: `$APP`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
+# Force always binding to the docker ip, no matter
+# what the settings are for a given app.
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-# TODO
-```
-
-### `post-build-buildpack`
-
-- Description: Allows you to run commands after the build image is create for a given app. Only applies to applications using buildpacks.
-- Invoked by: `dokku build`
-- Arguments: `$APP`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-# TODO
-```
-
-### `pre-build-dockerfile`
-
-- Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to applications using a dockerfile.
-- Invoked by: `dokku build`
-- Arguments: `$APP`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-# TODO
-```
-
-### `post-build-dockerfile`
-
-- Description: Allows you to run commands after the build image is create for a given app. Only applies to applications using a dockerfile.
-- Invoked by: `dokku build`
-- Arguments: `$APP`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-# TODO
-```
-
-### `pre-release-buildpack`
-
-- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
-- Invoked by: `dokku release`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Installs the graphicsmagick package into the container
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
-
-dokku_log_info1" Installing GraphicsMagick..."
-
-CMD="cat > gm && \
-  dpkg -s graphicsmagick > /dev/null 2>&1 || \
-  (apt-get update && apt-get install -y graphicsmagick && apt-get clean)"
-
-ID=$(docker run -i -a stdin $IMAGE /bin/bash -c "$CMD")
-test $(docker wait $ID) -eq 0
-docker commit $ID $IMAGE > /dev/null
-```
-
-### `post-release-buildpack`
-
-- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
-- Invoked by: `dokku release`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Installs a package specified by the `CONTAINER_PACKAGE` env var
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
-
-dokku_log_info1" Installing $CONTAINER_PACKAGE..."
-
-CMD="cat > gm && \
-  dpkg -s CONTAINER_PACKAGE > /dev/null 2>&1 || \
-  (apt-get update && apt-get install -y CONTAINER_PACKAGE && apt-get clean)"
-
-ID=$(docker run -i -a stdin $IMAGE /bin/bash -c "$CMD")
-test $(docker wait $ID) -eq 0
-docker commit $ID $IMAGE > /dev/null
-```
-
-### `pre-release-dockerfile`
-
-- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
-- Invoked by: `dokku release`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
-
-# TODO
-```
-
-### `post-release-dockerfile`
-
-- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
-- Invoked by: `dokku release`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
-
-# TODO
+echo false
 ```
 
 ### `check-deploy`
@@ -356,91 +72,85 @@ if [[ "$DOKKU_DISABLE_DEPLOY" = "true" ]]; then
 fi
 ```
 
-### `pre-deploy`
+### `comands help` and `commands <PLUGIN_NAME>:help`
 
-- Description: Allows the running of code before the container's process is started.
-- Invoked by: `dokku deploy`
-- Arguments: `$APP $IMAGE_TAG`
+- Description: Your plugin should implement a `help` command in your `commands` file to take advantage of this plugin trigger. `commands help` is used by `dokku help` to aggregate all plugins abbreviated `help` output. Implementing  `<PLUGIN_NAME>:help` in your `commands` file gives users looking for help, a more detailed output. 'commands help' must be implemented inside the `commands` plugin file. It's recommended that `PLUGIN_NAME:help` be added to the commands file to ensure consistency among community plugins and give you a new avenue to share rich help content with your user.
+- Invoked by: `dokku help` and `commands <PLUGIN_NAME>:help`
+- Arguments: None
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Runs gulp in our container
+# Outputs help for the derp plugin
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
 
-dokku_log_info1 "Running gulp"
-id=$(docker run -d $IMAGE /bin/bash -c "cd /app && gulp default")
-test $(docker wait $id) -eq 0
-docker commit $id $IMAGE > /dev/null
-dokku_log_info1 "Building UI Complete"
+case "$1" in
+  help | hello:help)
+    help_content_func () {
+      declare desc="return help_content string"
+      cat<<help_content
+    hello <app>, Says "Hello <app>"
+    hello:world, Says "Hello world"
+help_content
+    }
+
+    if [[ $1 = "hello:help" ]] ; then
+        echo -e 'Usage: dokku hello[:world] [<app>]'
+        echo ''
+        echo 'Say Hello World.'
+        echo ''
+        echo 'Example:'
+        echo ''
+        echo '$ dokku hello:world'
+        echo 'Hello world'
+        echo ''
+        echo 'Additional commands:'
+        help_content_func | sort | column -c2 -t -s,
+    else
+        help_content_func
+    fi
+    ;;
+
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;
+
+esac
 ```
 
-### `post-deploy`
+### `dependencies`
 
-- Description: Allows running of commands after a deploy has completed. Dokku core currently uses this to switch traffic on nginx.
-- Invoked by: `dokku deploy`
-- Arguments: `$APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS`
+- Description: Used to install system-level dependencies. Invoked by `plugin:install-dependencies`.
+- Invoked by: `dokku plugin:install-dependencies`
+- Arguments: None
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Notify an external service that a successful deploy has occurred.
+# Installs nginx for the current plugin
+# Supports both opensuse and ubuntu
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-curl "http://httpstat.us/200"
-```
+export DEBIAN_FRONTEND=noninteractive
 
-### `pre-delete`
+case "$DOKKU_DISTRO" in
+  debian|ubuntu)
+    apt-get install --force-yes -qq -y nginx
+    ;;
 
-- Description: Can be used to run commands before an app is deleted.
-- Invoked by: `dokku apps:destroy`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Clears out the gulp asset build cache for applications
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-
-APP="$1"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-verify_app_name "$APP"
-
-if [[ -d $GULP_CACHE_DIR ]]; then
-  docker run --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
-fi
-```
-
-### `post-delete`
-
-- Description: Can be used to run commands after an application is deleted.
-- Invoked by: `dokku apps:destroy`
-- Arguments: `$APP $IMAGE_TAG`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Runs a command to ensure that an app's
-# postgres installation is removed
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-APP="$1";
-
-dokku postgres:destroy $APP
+  opensuse)
+    zypper -q in -y nginx
+    ;;
+esac
 ```
 
 ### `docker-args-build`
 
 - Description:
 - Invoked by: `dokku build`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_SOURCE_TYPE`
 - Example:
 
 ```shell
@@ -487,38 +197,19 @@ verify_app_name "$APP"
 # TODO
 ```
 
-### `bind-external-ip`
+### `git-post-pull`
 
-- Description: Allows you to disable binding to the external box ip
-- Invoked by: `dokku deploy`
+- Description:
+- Invoked by: `dokku git-upload-pack`
 - Arguments: `$APP`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Force always binding to the docker ip, no matter
-# what the settings are for a given app.
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-echo false
-```
-
-### `post-domains-update`
-
-- Description: Allows you to run commands once the domain for an application has been updated.
-- Invoked by: `dokku domains:add`, `dokku domains:clear`, `dokku domains:remove`
-- Arguments: `$APP`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-# Reloads haproxy for our imaginary haproxy plugin
-# that replaces the nginx-vhosts plugin
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-sudo service haproxy reload
+# TODO
 ```
 
 ### `git-pre-pull`
@@ -536,19 +227,23 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `git-post-pull`
+### `install`
 
-- Description:
-- Invoked by: `dokku git-upload-pack`
-- Arguments: `$APP`
+- Description: Used to setup any files/configuration for a plugin.
+- Invoked by: `dokku plugin:install`.
+- Arguments: None
 - Example:
 
 ```shell
 #!/usr/bin/env bash
+# Sets the hostname of the dokku server
+# based on the output of `hostname -f`
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-# TODO
+if [[ ! -f  "$DOKKU_ROOT/HOSTNAME" ]]; then
+  hostname -f > $DOKKU_ROOT/HOSTNAME
+fi
 ```
 
 ### `nginx-hostname`
@@ -587,6 +282,311 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 nginx -t
 ```
 
+### `post-build-buildpack`
+
+- Description: Allows you to run commands after the build image is create for a given app. Only applies to applications using buildpacks.
+- Invoked by: `dokku build`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `post-build-dockerfile`
+
+- Description: Allows you to run commands after the build image is create for a given app. Only applies to applications using a dockerfile.
+- Invoked by: `dokku build`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `post-create`
+
+- Description: Can be used to run commands after an application is created.
+- Invoked by: `dokku apps:create`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Runs a command to ensure that an app
+# has a postgres database when it is starting
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1";
+POSTGRES="$1"
+
+dokku postgres:create $POSTGRES
+dokku postgres:link $POSTGRES $APP
+```
+
+### `post-delete`
+
+- Description: Can be used to run commands after an application is deleted.
+- Invoked by: `dokku apps:destroy`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Runs a command to ensure that an app's
+# postgres installation is removed
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1";
+
+dokku postgres:destroy $APP
+```
+
+### `post-deploy`
+
+- Description: Allows running of commands after a deploy has completed. Dokku core currently uses this to switch traffic on nginx.
+- Invoked by: `dokku deploy`
+- Arguments: `$APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Notify an external service that a successful deploy has occurred.
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+curl "http://httpstat.us/200"
+```
+
+### `post-domains-update`
+
+- Description: Allows you to run commands once the domain for an application has been updated. It also sends in the command that has been used. This can be "add", "clear" or "remove". The third argument will be the optional list of domains
+- Invoked by: `dokku domains:add`, `dokku domains:clear`, `dokku domains:remove`
+- Arguments: `$APP` `action name` `domains`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Reloads haproxy for our imaginary haproxy plugin
+# that replaces the nginx-vhosts plugin
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+sudo service haproxy reload
+```
+
+### `post-release-buildpack`
+
+- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
+- Invoked by: `dokku release`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Installs a package specified by the `CONTAINER_PACKAGE` env var
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+dokku_log_info1" Installing $CONTAINER_PACKAGE..."
+
+CMD="cat > gm && \
+  dpkg -s CONTAINER_PACKAGE > /dev/null 2>&1 || \
+  (apt-get update && apt-get install -y CONTAINER_PACKAGE && apt-get clean)"
+
+ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
+test $(docker wait $ID) -eq 0
+docker commit $ID $IMAGE > /dev/null
+```
+
+### `post-release-dockerfile`
+
+- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
+- Invoked by: `dokku release`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
+### `post-stop`
+
+- Description: Can be used to run commands after an application is manually stopped
+- Invoked by: `dokku ps:stop`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Marks an application as manually stopped
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1";
+
+dokku config:set --no-restart $APP MANUALLY_STOPPED=1
+```
+
+### `pre-build-buildpack`
+
+- Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to applications using buildpacks.
+- Invoked by: `dokku build`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `pre-build-dockerfile`
+
+- Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to applications using a dockerfile.
+- Invoked by: `dokku build`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `pre-delete`
+
+- Description: Can be used to run commands before an app is deleted.
+- Invoked by: `dokku apps:destroy`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Clears out the gulp asset build cache for applications
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+APP="$1"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+if [[ -d $GULP_CACHE_DIR ]]; then
+  docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+fi
+```
+
+### `pre-deploy`
+
+- Description: Allows the running of code before the container's process is started.
+- Invoked by: `dokku deploy`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Runs gulp in our container
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+dokku_log_info1 "Running gulp"
+id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $IMAGE /bin/bash -c "cd /app && gulp default")
+test $(docker wait $id) -eq 0
+docker commit $id $IMAGE > /dev/null
+dokku_log_info1 "Building UI Complete"
+```
+
+### `pre-receive-app`
+
+- Description: Allows you to customize the contents of an application directory before they are processed for deployment. The `IMAGE_SOURCE_TYPE` can be any of `[herokuish, dockerfile]`
+- Invoked by: `dokku git-hook`, `dokku tar-build-locked`
+- Arguments: `$APP $IMAGE_SOURCE_TYPE $TMP_WORK_DIR $REV`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Adds a file called `dokku-is-awesome` to the repository
+# the contents will be the application name
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1"; IMAGE_SOURCE_TYPE="$2"; TMP_WORK_DIR="$3"; REV="$4"
+
+echo "$APP" > "$TMP_WORK_DIR/dokku-is-awesome"
+```
+
+### `pre-release-buildpack`
+
+- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
+- Invoked by: `dokku release`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Installs the graphicsmagick package into the container
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+dokku_log_info1" Installing GraphicsMagick..."
+
+CMD="cat > gm && \
+  dpkg -s graphicsmagick > /dev/null 2>&1 || \
+  (apt-get update && apt-get install -y graphicsmagick && apt-get clean)"
+
+ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
+test $(docker wait $ID) -eq 0
+docker commit $ID $IMAGE > /dev/null
+```
+
+### `pre-release-dockerfile`
+
+- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
+- Invoked by: `dokku release`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
 ### `receive-app`
 
 - Description: Allows you to customize what occurs when an app is received. Normally just triggers an application build.
@@ -629,6 +629,23 @@ fi
 plugn trigger receive-app $APP $newrev
 ```
 
+### `retire-container-failed`
+
+- Description: Allows you to run commands if/when retiring old containers has failed
+- Invoked by: `dokku deploy`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Send an email when a container failed to retire
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1"; HOSTNAME=$(hostname -s)
+
+mail -s "$APP containers on $HOSTNAME failed to retire" ops@example.com
+```
+
 ### `tags-create`
 
 - Description: Allows you to run commands once a tag for an application image has been added
@@ -665,18 +682,60 @@ APP="$1"; IMAGE_TAG="$2"
 some code to remove a docker hub tag because it's not implemented in the CLI....
 ```
 
-### `retire-container-failed`
+### `update`
 
-- Description: Allows you to run commands if/when retiring old containers has failed
-- Invoked by: `dokku deploy`
-- Arguments: `$APP`
+- Description: Can be used to run plugin updates on a regular interval. You can schedule the invoker in a cron-task to ensure your system gets regular updates.
+- Invoked by: `dokku plugin:update`.
+- Arguments: None
 - Example:
 
 ```shell
 #!/usr/bin/env bash
+# Update the herokuish image from git source
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-APP="$1"; HOSTNAME=$(hostname -s)
 
-mail -s "$APP containers on $HOSTNAME failed to retire" ops@co.com
+cd /root/dokku
+sudo BUILD_STACK=true make install
+```
+
+### `user-auth`
+
+This is a special plugin trigger that is executed on *every* command run. As dokku sometimes internally invokes the `dokku` command, special care should be taken to properly handle internal command redirects.
+
+Note that the trigger should exit as follows:
+
+- `0` to continue running as normal
+- `1` to halt execution of the command
+
+The `SSH_USER` is the original ssh user. If you are running remote commands, this user will typically be `dokku`, and as such should not be trusted when checking permissions. If you are connected via ssh as a different user who then invokes `dokku`, the value of this variable will be that user's name (`root`, `myuser`, etc.).
+
+The `SSH_NAME` is the `NAME` variable set via the `sshcommand acl-add` command. If you have set a user via the `dokku-installer`, this value will be set to `admin`. For installs via debian package, this value *may* be `default`. For reference, the following command can be run as the root user to specify a specific `NAME` for a given ssh key:
+
+```shell
+sshcommand acl-add dokku NAME < $PATH_TO_SSH_KEY
+```
+
+Note that the `NAME` value is set at the first ssh key match. If an ssh key is set in the `/home/dokku/.ssh/authorized_keys` multiple times, the first match will decide the value.
+
+- Description: Allows you to deny access to a dokku command by either ssh user or associated ssh-command NAME user.
+- Invoked by `dokku`
+- Arguments: `$SSH_USER $SSH_NAME $DOKKU_COMMAND`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Allow root/admin users to do everything
+# Deny plugin access to default users
+# Allow access to all other commands
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+SSH_USER=$1
+SSH_NAME=$2
+shift 2
+[[ "$SSH_USER" == "root" ]] && exit 0
+[[ "$SSH_NAME" == "admin" ]] && exit 0
+[[ "$SSH_NAME" == "default" && $1 == plugin:* ]] && exit 1
+exit 0
 ```

docs/development/release-process.md

@@ -4,16 +4,27 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas
 
 To propose a release, the following tasks need to be performed:
 
-- The installable version must be changed in the `docs/installation.md` file.
+- Update all blockquote references of `not yet released and only available in master` to point to release version.
+- 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.
-- The installable version must be changed in the `contrib/dokku-installer.rb` file.
+- The embedded css should be cleared in the `docs/template.html` file.
+- The versioned links should be updated in the `docs/assets/favicons/browserconfig.xml` file.
+- The versioned links should be updated in the `docs/assets/favicons/manifest.json` file.
+- The versioned links should be updated in the `docs/assets/style.css` file.
+- The versioned links should be updated in the `docs/home.html` file.
+- The versioned links should be updated in the `docs/template.html` file.
+- The versioned links should be updated or added to the `docs/assets/versions.json` file.
 - A list of changes must be made in the `HISTORY.md`.
 - A tag must be created locally with your release version
 - Debian packages *must* be created via `vagrant up build`
 - The packages should be uploaded to packagecloud.io
 - All changes are pushed to master and the tag should be turned into a release which will contain the changelog.
+- ArchLinux package description *must* be updated via `vagrant up build-arch` (needs to be done after the tag is pushed to GitHub, because it is based on that)
 
 ## Versioning
 
@@ -47,6 +58,24 @@ If new versions of other packages were created, these should also be pushed at t
 
 > If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.
 
+## ArchLinux Packages
+
+ArchLinux packages are not really build, because all that is needed for an Arch User Repo (AUR) package is the description of how to build the package. To make this process as easy as possible there is a vagrant box called `build-arch` that updates the version of this build description (a file called `PKGBUILD`), then runs some helper scripts to fill all additional information and does test if the package could be build. Then only those changes need to be pushed to the AUR repo and an updated version of the package is ready for usage for our ArchLinux users. For detailed information see the section below.
+
+The workflow looks like this:
+
+```shell
+# having dokku-arch in ../dokku-arch
+vagrant up build-arch
+# wait for "==> build-arch: ==> Finished making: dokku 0.5.6-2 (Mon Feb 22 23:20:37 CET 2016)"
+cd ../dokku-arch
+git add PKGBUILD .SRCINFO
+git commit -m 'Update to dokku 0.9.9'
+git push aur master
+```
+
+> If you are a maintainer and need access to the AUR repositories in order to make a release, please contact @morrisjobke or @josegonzalez to get this co-maintainership.
+
 ## Changelog format
 
 The `HISTORY.md` should be added to based on the changes made since the previous release. This can be done by reviewing all merged pull requests to the master branch on github. The format is as follows:
@@ -68,3 +97,28 @@ Some description concerning major changes in this release, or potential incompat
 
 - #SOME_ID: @pull-request-creator Description
 ```
+
+## Detailed information for ArchLinux packages
+
+All of the information to build the ArchLinux package is in the AUR git repository (see [dokku AUR page](https://aur.archlinux.org/packages/dokku/)). The release of a AUR package only consists of pushing the package information into the AUR git repo. Then users could use that information to build the package on their machines.
+
+To update the package clone the repository and adjust the files in the repository. Then a helper script - `updpkgsums` - to update the SHA sum could  be called (check against the original SHA sum). Another helper script - `mksrcinfo` - needs to be called to update the meta information of the package in a file called `.SRCINFO`. The next step builds the package locally for verification - `makepkg`. As last step commit your changes and push the commit.
+
+* dependencies are defined in the `depends` attribute in `PKGBUILD`
+* build steps during package build time are defined in the `package()` method in `PKGBUILD`
+* steps that should be executed during install/update/remove time are defined in the file `dokku.install`
+* detailed information about all attributes in `PKGBUILD` could be found in the [ArchLinux wiki](https://wiki.archlinux.org/index.php/PKGBUILD)
+* detailed information about the AUR workflow could be found in the [AUR article](https://wiki.archlinux.org/index.php/Arch_User_Repository) in the ArchLinux wiki
+
+That is the usual workflow:
+
+```shell
+updpkgsums # update sha sums - compare them with the original ones
+mksrcinfo # update package metadata for AUR
+makepkg # test package builds
+git add PKGBUILD .SRCINFO
+git commit -m 'Update to dokku 0.9.9'
+git push
+```
+
+> If there is something unclear simply ask @morrisjobke for help.

docs/development/testing.md

@@ -14,7 +14,7 @@ Example apps can be found here:
 
 ### Executing tests locally
 
-- Setup dokku in a [vagrant vm](http://progrium.viewdocs.io/dokku/getting-started/install/vagrant)
+- Setup dokku in a [vagrant vm](/dokku/getting-started/install/vagrant)
 - Test setup and execution
 
   ```shell
@@ -22,15 +22,15 @@ Example apps can be found here:
   $ sudo su -
   $ cd ~/dokku
   $ make ci-dependencies setup-deploy-tests
-  $ make test  # run the entire test suite (linter, bats tests, and app deployment tests)
+  $ make test  # execute the entire test suite (linter, bats tests, and app deployment tests)
   $
-  $ make lint  # linter
-  $ make unit-tests  # bats tests
-  $ make deploy-tests  # app deployment tests
+  $ make lint copyfiles # run linter & update vagrant dokku install from local git clone
+  $ make unit-tests  # execute all bats tests
+  $ make deploy-tests  # execute all app deployment tests
   ```
 - Additionally you may run a specific app deployment tests with a target similar to:
 
   ```shell
-  make deploy-test-nodejs-express
+  $ make deploy-test-nodejs-express
   ```
 - For a full list of test make targets check out `tests.mk` in the root of the dokku repository.

docs/dns.md

@@ -1,6 +1,6 @@
-# Overview
+# DNS Configuration
 
-This is a work in progress.
+> Note: This is a work in progress.
 
 ## DNS Versions
 
@@ -14,39 +14,36 @@ Because there are so many different DNS server packages out there as well as a t
 
 * We assume you have a passing familiarity with DNS.  If not, you can read an [in-depth article](http://www.diaryofaninja.com/blog/2012/03/03/devops-dns-for-developers-ndash-now-therersquos-no-excuse-not-to-know) on DNS.  But basically you need to know that DNS changes names (like example.tld) into addresses (like 127.0.0.1)
 * We assume you already have a domain name registered and pointed to your favorite Managed DNS Provider or have your own BIND DNS server running.
-* You have a server on the internet and are about to follow the instructions in the [README](https://github.com/progrium/dokku/blob/master/README.md) to get dokku installed.  Don't do the install just yet though.
+* You have a server on the internet and are about to follow the instructions in the [README](https://github.com/dokku/dokku/blob/master/README.md) to get dokku installed.  Don't do the install just yet though.
 
+## Caching
+
+Please remember that DNS relies heavily on _caching_.  Changes you make to DNS could take anywhere from a few seconds to a few *days* to propagate.  If you tried surfing to example.tld, then changed the IP address in DNS, it could be a while before your computer picks up on the changes.
 
 ## HELP!
 
-Don't be afraid to ask if you need help.  Create a [new issue](https://github.com/progrium/dokku/issues) and someone will be glad to assist you.
+Don't be afraid to ask if you need help.  Create a [new issue](https://github.com/dokku/dokku/issues) and someone will be glad to assist you.
 
 
-# Getting started
+## Getting started
 
-For the examples, we will use the domain name 'example.tld' and the IP address '127.0.0.1'.
+For the examples, we will use the domain name `example.tld` and the IP address `127.0.0.1`.
 
-Dokku uses a DNS to differentiate between apps on your dokku-powered server.  If you are using the domain 'example.tld', and you have two apps 'myapp1' and 'myapp2', dokku will make them available at 'myapp1.example.tld' and 'myapp2.example.tld'.
+Dokku uses DNS to differentiate between apps on your dokku-powered server.  If you are using the domain `example.tld`, and you have two apps `myapp1` and `myapp2`, dokku will make them available at `myapp1.example.tld` and `myapp2.example.tld`.
 
-To get started, you need to know the IP address of your dokku server.  Connect in to it and run 'ifconfig' or 'ip addr' to see the IP address.
+To get started, you need to know the IP address of your dokku server.  Connect to it and run `ifconfig` or `ip addr` to see the IP address.
 
-# Caching
+Now you have to make a decision about your domain.  Do you want everything and anything at `example.tld` to go to your dokku server, or would you rather use a 'sub domain' for your dokku server?
 
-Please remember that DNS relies heavily on _caching_.  Changes you make to DNS could take anywhere from a few seconds to a few *days* to 'propagate'.  If you tried surfing to example.tld, then changed the IP address in DNS, it could be a while before your computer picks up on the changes.
+In other words, do you want your applications on your dokku server accessible via `myapp.example.tld` or via `myapp.myserver.example.tld`?
 
-## The two methods
+#### Using a sub-domain (myapp.myserver.example.tld)
 
-Now you have to make a decision about your domain.  Do you want everything and anything at example.tld to go to your dokku server, or would you rather use a 'sub domain' for your dokku server?
+Using a sub-domain is easy.  When you set up your server, you probably gave it a name like `myserver.example.tld`.
 
-In other words, do you want your applications on your dokku server accessible via myapp.example.tld or via myapp.myserver.example.tld?
+Go in to your Managed DNS provider and create an `A` record named `myserver` and put in the IP address you got from your server a few moments ago.
 
-### Using a sub-domain (myapp.myserver.example.tld)
-
-Using a sub-domain is easy.  When you set up your server, you probably gave it a name like myserver.example.tld.
-
-Go in to your Managed DNS provider and create an 'A' record named 'myserver' and put in the IP address you got from your server a few moments ago.
-
-Hopefully your managed DNS provider also supports wildcards.  Create a second 'A' record named '*.myserver' along with the IP address you got from your server a few moments ago.
+Hopefully your managed DNS provider also supports wildcards.  Create a second `A` record named `*.myserver` along with the IP address you got from your server a few moments ago.
 
 If you are using BIND, your zone file will look similar to this:
 
@@ -55,34 +52,31 @@ $ORIGIN example.tld
 $TTL 5m
 
 myserver         IN      A       127.0.0.1
-*.myserver         IN      A       127.0.0.1
+*.myserver       IN      A       127.0.0.1
 ```
 
 You can verify your changes in Linux by trying one or more of the following commands:
 
-* host myserver.example.tld
-
-* dig -t A myserver.example.tld
-
-* nslookup myserver.example.tld
+* `host myserver.example.tld`
+* `dig -t A myserver.example.tld`
+* `nslookup myserver.example.tld`
 
 Now is a good time to remind you that the answers you get MAY BE CACHED.
 
-If everything is working correctly, you should also be able to query for any other name 'under' myserver.example.tld and get back the IP address of your server.  Try:
+If everything is working correctly, you should also be able to query for any other name under `myserver.example.tld` and get back the IP address of your server.  Try:
 
-* host test.myserver.example.tld
+* `host test.myserver.example.tld`
+* `host xyzzy.myserver.example.tld`
 
-* host xyzzy.myserver.example.tld
+If they all return your IP address, you have set DNS up properly for dokku.  You should also be able to `ssh root@myserver.example.tld` and access your server.
 
-If they all return your IP address, you have set DNS up properly for dokku.  You should also be able to 'ssh root@myserver.example.tld' and access your server.
+Proceed with the setup instructions in the [README](https://github.com/dokku/dokku/blob/master/README.md)
 
-Proceed with the setup instructions in the [README](https://github.com/progrium/dokku/blob/master/README.md)
-
-### Using the root of your domain (myapp.example.tld)
+#### Using the root of your domain (myapp.example.tld)
 
 This section is a work in progress.  It is incomplete.
 
 Using the 'root' of your domain is nearly identical to the previous example.
 
-* hostname is under example.tld, still needs A record
-* Need to modify /home/dokku/HOSTNAME and /home/dokku/VHOST
+* hostname is under `example.tld`, still needs `A` record
+* Need to modify `/home/dokku/HOSTNAME` and `/home/dokku/VHOST`

docs/docker-options.md

@@ -1,68 +1,77 @@
-docker-options
-========================
+# Docker Container Options
 
-Usage
------
+> New as of 0.3.17
 
-```bash
-$ dokku help
-...
-    docker-options <app>                               Display apps docker options for all phases
-    docker-options <app> <phase(s)>                    Display apps docker options for phase (comma-separated phase list)
-    docker-options:add <app> <phase(s)> OPTION         Add docker option to app for phase (comma-separated phase list)
-    docker-options:remove <app> <phase(s)> OPTION      Remove docker option from app for phase (comma-separated phase list)
-...
-````
+Pass [options](https://docs.docker.com/engine/reference/run/) to Docker during Dokku's `build`, `deploy` and `run` phases
 
-Add some options (first, for the deployed/running app and second when executing `dokku run`)
-
-```bash
-$ dokku docker-options:add myapp deploy "-v /host/path:/container/path"
-$ dokku docker-options:add myapp run "-v /another/container/path"
+```
+docker-options <app> [phase(s)]                  Display app's Docker options for all phases (or comma separated phase list)
+docker-options:add <app> <phase(s)> OPTION       Add Docker option to app for phase (comma-separated phase list)
+docker-options:remove <app> <phase(s)> OPTION    Remove Docker option from app for phase (comma-separated phase list)
 ```
 
-Check what we added
+> When specifying multiple phases, they **must** be comma-separated _without_ spaces in between each phase, like so:
+>
+> ```
+> dokku docker-options:add myapp deploy,run "-v /home/dokku/logs/myapp:/app/logs"
+> ```
 
-```bash
-$ dokku docker-options myapp
-Deploy options:
-    -v /host/path:/container/path
-Run options:
-    -v /another/container/path
-```
+## About Dokku phases
 
-Remove an option
-```bash
-$ dokku docker-options:remove myapp run "--link container_name:alias"
-```
+Dokku deploys your application in multiple "phases" and the `docker-options` plugin allows you to pass arguments to their underlying docker container:
 
-Note about `dokku` phases and `docker-options`
-------------
-`dokku` deploys your application in multiple "phases" and the `docker-options` plugin allows you to pass arguments to the underlying docker container in the following 3 phases/containers
 - `build`: the container that executes the appropriate buildpack
 - `deploy`: the container that executes your running/deployed application
 - `run`: the container that executes any arbitrary command via `dokku run myapp`
 
+## Examples
 
-Advanced Usage (avoid if possible)
-------------
+### Add Docker options
 
-In your applications folder (`/home/dokku/app_name`) create a file called `DOCKER_OPTIONS_RUN` (or `DOCKER_OPTIONS_BUILD` or `DOCKER_OPTIONS_DEPLOY`).
+Add some options for the deployed/running app and when executing [`dokku run`](deployment/one-off-processes/):
 
-Inside this file list one docker option per line. For example:
+```shell
+# Mount a host volume in a Docker container: "-v /host/path:/container/path"
+dokku docker-options:add myapp deploy "-v /home/dokku/logs/myapp:/app/logs"
+dokku docker-options:add myapp run "-v /home/dokku/logs/myapp:/app/logs"
+```
 
-```bash
+> Note: When [mounting a host directory](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) in a Dokku app you should first create that directory as user `dokku` and then mount the directory under `/app` in the container using `docker-options` as above. Otherwise the app will lack write permission in the directory.
+
+### Output Docker options
+
+```shell
+dokku docker-options myapp
+# Deploy options:
+#    -v /home/dokku/logs/myapp:/app/logs
+# Run options:
+#    -v /home/dokku/logs/myapp:/app/logs
+```
+
+### Remove a Docker option
+
+```shell
+dokku docker-options:remove myapp run "-v /home/dokku/logs/myapp:/app/logs"
+```
+
+## Advanced usage
+
+In your applications folder `/home/dokku/app_name` create a file called `DOCKER_OPTIONS_RUN` (or `DOCKER_OPTIONS_BUILD` or `DOCKER_OPTIONS_DEPLOY`).
+
+Inside this file list one Docker option per line. For example:
+
+```shell
 --link container_name:alias
 -v /host/path:/container/path
 -v /another/container/path
 ```
 
-The above example will result in the following options being passed to docker during `dokku run`:
+The above example will result in the following options being passed to Docker during `dokku run`:
 
-```bash
+```shell
 --link container_name:alias -v /host/path:/container/path -v /another/container/path
 ```
 
 You may also include comments (lines beginning with a #) and blank lines in the DOCKER_OPTIONS file.
 
-Move information on docker options can be found here: http://docs.docker.io/en/latest/reference/run/ .
+Move information on Docker options can be found here: http://docs.docker.io/en/latest/reference/run/ .

docs/dokku-events-logs.md

@@ -1,12 +1,14 @@
 # Dokku Event Logs
 
+> New as of 0.3.21
+
 Docker provides an _events_ command to show system's real time events. Likewise, Dokku can record events as syslog entries and also provides a plugin to display the last ones.
 
 ```
-events [-t]                                     Show the last events (-t follows)
-events:list                                     List logged events
-events:on                                       Enable events logger
-events:off                                      Disable events logger
+events [-t]                                      Show the last events (-t follows)
+events:list                                      List logged events
+events:on                                        Enable events logger
+events:off                                       Disable events logger
 ```
 
 ## Usage
@@ -42,7 +44,6 @@ Jul  3 16:30:02 dokku.me dokku[131384]: INVOKED: docker-args-run( rubyapp )
 You can list all events that are currently being recorded via `dokku events:list`:
 ```
 =====> Events currently logged
-backup-check
 docker-args-build
 pre-delete
 post-deploy
@@ -54,8 +55,6 @@ post-build-buildpack
 post-domains-update
 post-release-dockerfile
 check-deploy
-backup-import
-backup-export
 git-pre-pull
 git-post-pull
 nginx-hostname

docs/dokku-storage.md

@@ -0,0 +1,46 @@
+# Dokku Core Storage Plugin
+
+> New as of 0.5.0
+
+The preferred method to mount external containers to a dokku managed container, is to use the dokku storage plugin.
+
+
+```shell
+storage:list <app>, List bind mounts for app's container(s) (host:container)
+storage:mount <app> <host-dir:container-dir>, Create a new bind mount
+storage:unmount <app> <host-dir:container-dir>, Remove an existing bind mount
+```
+
+## Ideology and Background
+
+The storage plugin requires explicit paths on the host side. This is intentional to ensure that new users avoid running into unexpected results with implicit paths that may not exist (a feature deprecate in [Docker 1.9.0](https://github.com/docker/docker/releases/tag/v1.9.0])). The container directory is created for the mount point in the container. Any existing directory contents are not accessible after a mount is added to the container. Dokku creates a new directory `/var/lib/dokku/data/storage` during installation, it's the general consensus that new users should use this directory. Mounts are only available at run and deploy times, you must redeploy (restart) an app to mount or unmount to an existing app's container.
+
+## Usage
+
+This example demonstrates how to mount the recommended directory to `/storage` inside the container:
+```
+$ dokku storage:mount app-name /var/lib/dokku/data/storage:/storage
+```
+Dokku will then mount the shared contents of`/var/lib/dokku/data/storage` to `/storage` inside the container.
+
+## Use Cases
+
+### Persistent storage
+
+Dokku is powered by Docker containers, which recommends in their [best practices](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#containers-should-be-ephemeral) that containers be treated as ephemeral. In order to manage persistent storage for web applications, like user uploads or large binary assets like images, a directory outside the container should be mounted.
+
+### Shared storage between containers
+
+When scaling your app, you may require a common location to access shared assets between containers, a storage mount can be used in this situation.
+
+### Shared storage across environments
+
+Your app may be used in a cluster that requires containers or resources not running on the same host access your data. Mounting a shared file service (like S3FS or EFS) inside your container will give you great flexibility.
+
+### Backing up
+
+Your app may have services that are running in memory and need to be backed up locally (like a key store). Mount a non ephemeral storage mount will allow backups that are not lost when the app is shut down.
+
+## Docker-Options Note
+
+The storage plugins is compatible with storage mounts created with the docker-options. The storage plugin will only list mounts from the deploy phase.

docs/getting-started/install/azure.md

@@ -0,0 +1,11 @@
+# Microsoft Azure
+
+- If you don't already have one [generate an SSH key pair](https://help.github.com/articles/generating-ssh-keys/).
+
+- Go to the [dokku on azure deployment page](https://github.com/azure/azure-quickstart-templates/tree/master/dokku-vm) and click **Deploy to Azure**.
+
+- You'll be prompted to enter a few parameters, including a unique storage account name and a unique name for the sub-domain used for your public IP address. For the `sshKeyData` parameter, copy and paste the contents of the **public** key file you just created. After a few minutes the Dokku instance will be deployed.
+
+- In your browser of choice, navigate to `http://[[dnsNameForPublicIP]].[[location]].cloudapp.azure.com`. Where `[[dnsNameForPublicIP]]` and `[[location]]` are template parameters you used to deploy the template.
+
+- Finish your dokku setup like you normally would by creating a **new** public/private key pair for your deployments using `ssh-keygen` (don't use the same one as you created in the first step). You should select 'Use Virtual Host Naming' and set the `Hostname` to a **public dns name** that you own such as one you would purchase from [namecheap](http://namecheap.com). Alternatively thanks to [xip.io]( http://xip.io/) you can just use yourAzurePublicIP.xip.io for free. For example, if your public IP is `44.44.44.44` then you would set it to `44.44.44.44.xip.io`.

docs/getting-started/install/debian.md

@@ -5,16 +5,17 @@ As of 0.3.18, dokku defaults to being installed via debian package. While certai
 ```shell
 # install prerequisites
 sudo apt-get update -qq > /dev/null
-sudo apt-get install -qq -y apt-transport-https curl
+sudo apt-get install -qq -y apt-transport-https
 
 # install docker
-curl -sSL https://get.docker.com/ | sh
+wget -nv -O - https://get.docker.com/ | sh
 
 # install dokku
-curl -sSL https://packagecloud.io/gpg.key | apt-key add -
+wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
 echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list
 sudo apt-get update -qq > /dev/null
 sudo apt-get install dokku
+sudo dokku plugin:install-dependencies --core
 ```
 
 ## Unattended installation
@@ -24,7 +25,7 @@ In case you want to perform an unattended installation of dokku, this is made po
 You can set any of the below options through the `debconf-set-selections` command, for example to enable vhost-based deployments:
 
 ```bash
-sudo echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
+echo "dokku dokku/vhost_enable boolean true" | sudo debconf-set-selections
 ```
 
 After setting the desired options, proceed with the installation as described above.
@@ -36,4 +37,5 @@ After setting the desired options, proceed with the installation as described ab
 | dokku/web_config   | boolean | true                  | Use web-based config for below options                                   |
 | dokku/vhost_enable | boolean | false                 | Use vhost-based deployments (e.g. <app>.dokku.me)                        |
 | dokku/hostname     | string  | dokku.me              | Hostname, used as vhost domain and for showing app URL after deploy      |
+| dokku/skip_key_file| boolean | false                 | Don't check for the existence of the dokku/key_file. Warning: This setting this to true, will require you to manually add an SSH key later on. |
 | dokku/key_file     | string  | /root/.ssh/id_rsa.pub | SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |

docs/getting-started/install/linode.md

@@ -1,36 +1,39 @@
 # Installing on Linode
 
-Due to how Linode installs custom kernels, Linode instances *require* a reboot before they can fully work with Docker/Dokku. The Official Dokku StackScript should take care of this process for you, and will email notify you when the instance is running and you can proceed with installation.
+When installing Dokku on a Linode server, you'll likely see an error during Docker installation:
 
-## Using StackScript
+> Warning: current kernel is not supported by the linux-image-extra-virtual package.  We have no AUFS support.  Consider installing the packages linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.
 
-Deploy using the following (experimental) Official StackScript:
+After 10 seconds, the installation will continue as normal.
 
-- https://www.linode.com/stackscripts/view/11348
+This warning is the result of Linode using its own kernel, which does not support AUFS, instead of using the kernel supplied by Ubuntu. If you ignore the warning, Docker will fall back to using the DeviceMapper storage backend and Dokku will work normally. However, AUFS is better tested and will perform better.
 
-## Without StackScript
+If you would like to use AUFS, follow the steps below to install Ubuntu's kernel and configure your server to boot it instead of Linode's.
 
-* Build a Ubuntu 13.04 instance
+## Preparing your Linode for AUFS
 
-* Follow these instructions: https://www.linode.com/docs/tools-reference/custom-kernels-distros/run-a-distributionsupplied-kernel-with-pvgrub#ubuntu-1304-raring
+__Warning__: These steps will delete *everything* on your Linode.
 
-* If `apt-get update` no longer works:
+1. Open your server's dashboard in the [Linode Manager](https://manager.linode.com/).
 
-    * Verify if apt-get is trying to use ipv6 instead of ipv4 (e.g. you read something like "[Connecting to us.archive.ubuntu.com (2001:67c:1562::14)]" and apt-get would not proceed). In that case, follow these instructions: http://unix.stackexchange.com/questions/9940/convince-apt-get-not-to-use-ipv6-method (append "precedence ::ffff:0:0/96  100" to /etc/gai.conf)
+2. Make sure your Linode is [using KVM](https://www.linode.com/docs/platform/kvm#how-to-enable-kvm), not Xen, for virtualization.
 
-    * OR: change `/etc/apt/sources.list` to one mentioned in http://mirrors.ubuntu.com/mirrors.txt
+3. In the "Rebuild" tab, select "Ubuntu 14.04 LTS", set a root password, and rebuild.
 
-* Run the following commands:
+4. Once your Linode has been created, click "Boot" and wait for it to complete.
 
-    ```shell
-    apt-get update
+5. SSH into your Linode as root and run the following commands:
 
-    apt-get install lxc wget bsdtar linux-image-extra-$(uname -r)
+        apt-get update
+        apt-get -qq upgrade
+        apt-get -qq install linux-image-virtual linux-image-extra-virtual
 
-    modprobe aufs
-    ```
-* After this, you can install dokku the default way:
+6. When prompted, install Grub onto the first hard drive.
 
-    ```shell
-    wget -qO- https://raw.github.com/progrium/dokku/master/bootstrap.sh | sudo bash
-    ```
+7. Back in your server's dashboard, click "Edit" on its Configuration Profile
+
+8. Change the "Kernel" option to "GRUB 2" and save your changes.
+
+9. Lastly, reboot the Linode.
+
+Once your server comes back online, you'll be running Ubuntu's default kernel. You can now follow Dokku's [normal installation instructions](/dokku/installation) and `bootstrap.sh` will take care of everything else.

docs/getting-started/install/vagrant.md

@@ -5,13 +5,7 @@
 - Clone Dokku
 
     ```
-    git clone https://github.com/progrium/dokku.git
-    ```
-
-- Setup SSH hosts in your `/etc/hosts`
-
-    ```
-    10.0.0.2 dokku.me
+    git clone https://github.com/dokku/dokku.git
     ```
 
 - Create VM
@@ -35,6 +29,7 @@
 
 - Copy your SSH key via `cat ~/.ssh/id_rsa.pub | pbcopy` and paste it into the dokku-installer at http://dokku.me . Change the `Hostname` field on the Dokku Setup screen to your domain and then check the box that says `Use virtualhost naming`. Then click *Finish Setup* to install your key. You'll be directed to application deployment instructions from here.
 
+Please note, the `dokku.me` domain is setup to point to `10.0.0.2` along with all subdomains (ie yourapp.dokku.me). If you change the `DOKKU_IP` in your vagrant setup you'll need to update your `/etc/hosts` file to point your reconfigured ip address.
+
 You are now ready to deploy an app or install plugins.
 
-For a different, complete, example see https://github.com/RyanBalfanz/dokku-vagrant-example.

docs/getting-started/where-to-get-help.md

@@ -4,22 +4,19 @@ If you’re stuck, there are a number of places you can get help:
 
 ## The Official Dokku Website
 
-[http://progrium.viewdocs.io/dokku](http://progrium.viewdocs.io/dokku)
+[http://dokku.viewdocs.io/dokku](/dokku)
 
 The Official Dokku website is always a great place to visit. It features links to oft-used developer tools, community plugins, and guides on using dokku.
 
-## The IRC Channel
+## The IRC and Slack Channels
 
-IRC Channel on irc.freenode.net:
+- [irc.freenode.net/#dokku](https://webchat.freenode.net/?channels=dokku)
+- [Gliderlabs Slack](https://glider-slackin.herokuapp.com/)
 
-- #dokku – General Discussion
+If you’re stumped, give us a holler in the Dokku IRC or Slack channels. Someone from the development team is usually there, especially during the daylight hours for North and South America users. We’d love to hear from you, whether you need some help, want to find users in your area, or would like to donate your brand new sports car.
 
-If you’re stumped, give us a holler in the Dokku IRC channel. Someone from the development team is usually there, especially during the daylight hours for North and South America users. We’d love to hear from you, whether you need some help, want to find users in your area, or would like to donate your brand new sports car.
-
-If [here](http://webchat.freenode.net/?channels=dokku) for a web-based client IRC client.
-
-## Stackoverflow
+## Stack Overflow
 
 http://stackoverflow.com/
 
-Tag your questions with `dokku` to enable existing users of stackoverflow to find your questions.
+Tag your questions with `dokku` to enable existing users of Stack Overflow to find your questions.

docs/home.html

@@ -10,49 +10,72 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
-    <style type="text/css">
-      body{padding-bottom:40px;color:#5a5a5a}
-      h1{color:#5a5a5a;font-family:'montserrat',Optima,Segoe,"Segoe UI",Candara,Calibri,Arial,sans-serif;font-weight:700;line-height:1.1;margin-bottom:12px;margin-top:12px;text-rendering:optimizelegibility}
-      .header{background-color:#2a8fbd;padding:22px 0}
-      .header .heading{color:#fff;font-size:23px;margin:0;padding:0}
-      .blurb{color:#424242;background-color:#ededed;background-image:url(./assets/gplaypattern.png);padding:45px 0;text-align:center}
-      .blurb p{font-size:17px;font-weight:300;margin:18px 0;text-align:center}
-      .quickstart-code{display:block;font-size:12px;line-height:1.3em;margin:45px auto;max-width:650px;padding:0}
-      .quickstart-code .title{background-color:#dfdfdf;background-image:linear-gradient(top,#f7f7f7 0%,#dfdfdf 7%,#ccc 100%);border-bottom:1px solid #111;color:#444;display:block;font-weight:400;font-size:14px;margin:0 20px;padding:3px 0;text-align:center;text-shadow:0 1px 0 rgba(255,255,255,0.5);border-radius:5px 5px 0 0;box-shadow:0 3px 0 rgba(0,0,0,0.5)}
-      .quickstart-code .shell{background-color:#171717;font-family:Menlo,Consolas,"Courier New",Courier,"Liberation Mono",monospace;margin:0 20px;padding:20px;text-shadow:none;border-radius:0 0 5px 5px;box-shadow:0 5px 30px rgba(0,0,0,0.3)}
-      .quickstart-code .line{display:block;margin:0;padding:0}
-      .quickstart-code .line span{display:inline-block}
-      .quickstart-code .path{color:#2a8fbd;user-select:none}
-      .quickstart-code .prompt{color:#f90;user-select:none}
-      .quickstart-code .command{color:#ffc}
-      .marketing .col-lg-4{margin-bottom:20px;text-align:center}
-      .marketing .col-lg-4 p{margin-right:10px;margin-left:10px}
-      .featurette-divider{margin:20px 0}
-      .featurette-heading{font-weight:400;line-height:1;letter-spacing:-1px}
-      .featurette-heading .text-muted{font-weight:300}
-      @media (min-width: 768px) {
-        .quickstart-code{font-size:14px;line-height:22px}
-        .featurette-heading{font-size:50px}
-      }
-      @media (min-width: 992px) {
-        .featurette-heading{margin-top:120px}
-      }
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/favicon.ico">
+    <meta name="apple-mobile-web-app-title" content="Dokku">
+    <meta name="application-name" content="Dokku">
+    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/favicons/browserconfig.xml">
+    <meta name="theme-color" content="#ffffff">
+
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.5.6/docs/assets/style.css" rel="stylesheet">
+    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
+    <style>
     </style>
   </head>
   <body>
     <div class="header">
       <div class="container">
-        <h1 class="heading">Dokku</h1>
+        <div class="row">
+          <div>
+            <h1 class="heading navbar-brand">
+              <a href="http://dokku.viewdocs.io/dokku/">Dokku</a>
+            </h1>
+            <ul class="nav nav-pills pull-xs-right">
+              <li class="nav-item">
+                <a class="nav-link" href="https://dokku.github.io/">Blog</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://github.com/dokku/dokku/">Code</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="/{{NAME}}/installation/">Docs</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://webchat.freenode.net/?channels=dokku">IRC</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="https://glider-slackin.herokuapp.com/">Slack</a>
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
     </div>
 
     <div class="blurb">
       <div class="container">
-        <h2>The smallest PaaS implementation you've ever seen</h2>
-        <p>Docker powered mini-Heroku in around 200 lines of Bash</p>
-        <div class="blurb-buttons">
-          <a class="btn btn-lg btn-warning" href="http://progrium.viewdocs.io/dokku/installation">View Documentation</a>
+        <div class="row">
+          <h2>The smallest PaaS implementation you've ever seen</h2>
+          <p>Docker powered mini-Heroku in around 200 lines of Bash</p>
+          <div class="blurb-buttons">
+            <a class="btn btn-lg btn-warning" href="/dokku/installation/">View Documentation</a>
+          </div>
         </div>
       </div>
     </div>
@@ -60,25 +83,109 @@
     <div class="container marketing">
       <div class="quickstart-code">
         <p class="title">Quick-start Instructions</p>
-        <div class="shell">
+        <div class="tabs">
+          <div data-tab="curl" class="tab tab-curl tab-active">curl | bash</div>
+          <div data-tab="apt" class="tab tab-apt">apt</div>
+          <div data-tab="arch" class="tab tab-arch">arch</div>
+        </div>
+        <div class="shell shell-curl shell-active">
           <p class="line">
-            <span class="path">~</span>
-            <span class="prompt">$</span>
-            <span class="command">wget https://raw.github.com/progrium/dokku/v0.4.0/bootstrap.sh</span>
+            <span class="output">&nbsp;# only works on debian systems!</span>
           </p>
           <p class="line">
-            <span class="path">~</span>
+            <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.4.0 bash bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.5.6/bootstrap.sh</span>
           </p>
           <p class="line">
-            <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">sudo DOKKU_TAG=v0.5.6 bash bootstrap.sh</span>
+          </p>
+          <p class="line">
+            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
+          </p>
+        </div>
+
+        <div class="shell shell-apt">
+          <p class="line">
+            <span class="output">&nbsp;# install docker</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">wget -nv -O - https://get.docker.com/ | sh</span>
+          </p>
+          <p class="line">
+            <span class="output">&nbsp;# setup dokku apt repository</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">export SOURCE="https://packagecloud.io/dokku/dokku/ubuntu/"</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">echo "deb $SOURCE trusty main" | tee /etc/apt/sources.list.d/dokku.list</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">apt-get update</span>
+          </p>
+          <p class="line">
+            <span class="output">&nbsp;# install dokku</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">apt-get install dokku</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">dokku plugin:install-dependencies --core <span class="output"># run with root!</span></span>
+          </p>
+          <p class="line">
+            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
+          </p>
+        </div>
+
+        <div class="shell shell-arch">
+          <p class="line">
+            <span class="output">&nbsp;# install dokku via yaourt</span>
+          </p>
+          <p class="line">
+            <span class="path"></span>
+            <span class="prompt">$</span>
+            <span class="command">yaourt -S dokku</span>
           </p>
         </div>
       </div>
 
-      <hr class="featurette-divider">
+      <div class="alternate-instructions">
+        <p>Hate <code>curl | bash</code>? See our official <a href="https://github.com/Azure/azure-quickstart-templates/tree/master/dokku-vm" target="_blank">Azure</a>, <a href="https://www.digitalocean.com/features/one-click-apps/dokku/" target="_blank">DigitalOcean</a>, and <a href="/{{NAME}}~{{REF}}/getting-started/install/linode/" target="_blank">Linode</a> instructions.<p>
+        <p>Still no love? <a href="https://github.com/dokku/dokku/blob/master/CONTRIBUTING.md" target="_blank">Contributions welcome</a>!</a>
+      </div>
+    </div>
 
+    <div class="container-fluid slack-channel">
+      Have a question? Join us in our public slack channel!
+
+      <div class="inline-container">
+        <a class="button slack-button" href="https://glider-slackin.herokuapp.com/">
+          <img src="./assets/slack-logo.png" alt="Slack Logo">
+        </a>
+      </div>
+    </div>
+
+    <div class="container marketing">
       <!-- START THE FEATURETTES -->
 
       <div class="row featurette">
@@ -114,15 +221,121 @@
           <img class="featurette-image img-responsive center-block" alt="Extend Logo" src="./assets/extend.png">
         </div>
       </div>
+    </div>
 
-      <hr class="featurette-divider">
+    <div class="container-fluid slack-channel team-members">
+      <h3>Meet the core team</h3>
+
+      <div class="row">
+        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
+          <div class="team-member-image">
+            <img src="./assets/team/progrium-hidden.jpg" alt="Jeff Lindsay">
+            <img src="./assets/team/progrium.jpg" alt="Jeff Lindsay">
+          </div>
+          Jeff Lindsay
+          <a class="fund-link" href="https://www.patreon.com/progrium">Sponsor people they sponsor</a>
+        </div>
+        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
+          <div class="team-member-image">
+            <img src="./assets/team/josegonzalez-hidden.jpg" alt="Morris Jobke">
+            <img src="./assets/team/josegonzalez.jpg" alt="Morris Jobke">
+          </div>
+          Jose Diaz-Gonzalez
+          <a class="fund-link" href="http://www.amazon.com/registry/wishlist/36RYHSXCFYDTG/">Buy him something nice</a>
+        </div>
+        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
+          <div class="team-member-image">
+            <img src="./assets/team/u2mejc-hidden.jpg" alt="Justin Clark">
+            <img src="./assets/team/u2mejc.jpg" alt="Justin Clark">
+          </div>
+          Justin Clark
+          <a class="fund-link" href="http://smile.amazon.com/registry/wishlist/3SCPXMNI2EIYV">Feed his dog greenie treats!</a>
+        </div>
+        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
+          <div class="team-member-image">
+            <img src="./assets/team/flink-hidden.jpg" alt="Loïc Guitaut">
+            <img src="./assets/team/flink.jpg" alt="Loïc Guitaut">
+          </div>
+          Loïc Guitaut
+          <a class="fund-link" href="https://www.amazon.com/gp/registry/wishlist/23NWY5AVAGGGO/">Build out his star wars collection</a>
+        </div>
+        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
+          <div class="team-member-image">
+            <img src="./assets/team/michaelshobbs-hidden.jpg" alt="Michael Hobbs">
+            <img src="./assets/team/michaelshobbs.jpg" alt="Michael Hobbs">
+          </div>
+          Michael Hobbs
+          <a class="fund-link" href="https://gratipay.com/~michaelshobbs/">Fund on gratipay</a>
+        </div>
+        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
+          <div class="team-member-image">
+            <img src="./assets/team/morrisjobke-hidden.jpg" alt="Morris Jobke">
+            <img src="./assets/team/morrisjobke.jpg" alt="Morris Jobke">
+          </div>
+          Morris Jobke
+          <a class="fund-link" href="">Get him an ebook</a>
+        </div>
+      </div>
     </div>
 
     <div class="container">
       <footer>
-        <p class="pull-right"><a href="#">Back to top</a></p>
-        <p>&copy; 2013 Dokku</p>
+        <p>&copy; 2013-2016 Dokku</p>
       </footer>
     </div>
+    <script>
+    document.addEventListener('DOMContentLoaded', function (e) {
+      var addClass = function (el, className) {
+        if (el.classList) {
+          el.classList.add(className);
+        } else {
+          el.className += ' ' + className;
+        }
+      },
+      addListener = function (elem, type, fn) {
+        if (elem.addEventListener) {
+          elem.addEventListener(type, fn, false);
+        } else if (elem.attachEvent) {
+          elem.attachEvent("on" + type, function() {
+            return fn.call(elem, window.event);
+          });
+        } else {
+          elem["on" + type] = fn;
+        }
+      },
+      hasClass = function(el, className) {
+        if (el.classList) {
+          return el.classList.contains(className);
+        } else {
+          return new RegExp('(^| )' + className + '( |$)', 'gi').test(el.className);
+        }
+      },
+      removeClass = function(el, className) {
+        if (el.classList) {
+          el.classList.remove(className);
+        } else {
+          el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');;
+        }
+      },
+      activateTab = function(tab) {
+        removeClass(document.querySelectorAll('.shell-active')[0], 'shell-active');
+        removeClass(document.querySelectorAll('.tab-active')[0], 'tab-active');
+        addClass(document.querySelectorAll('.shell-' + tab)[0], 'shell-active');
+        addClass(document.querySelectorAll('.tab-' + tab)[0], 'tab-active');
+        window.location.hash = '#install-' + tab;
+      };
+
+      var hash = window.location.hash.replace('#install-', '');
+      if (['curl', 'apt', 'arch'].indexOf(hash) !== -1) {
+        activateTab(hash);
+      }
+
+      Array.prototype.forEach.call(document.querySelectorAll('.tab'), function (el, i) {
+        addListener(el, 'click', function(e) {
+          activateTab(this.getAttribute('data-tab'));
+        });
+      });
+    });
+    </script>
   </body>
 </html>

docs/index.md

@@ -3,7 +3,7 @@
     <h2>The smallest PaaS implementation you've ever seen</h2>
     <p>Docker powered mini-Heroku in around 200 lines of Bash</p>
     <div class="blurb-buttons">
-      <a class="btn btn-lg btn-warning" href="http://progrium.viewdocs.io/dokku/installation">View Documentation</a>
+      <a class="btn btn-lg btn-warning" href="/dokku/installation">View Documentation</a>
     </div>
   </div>
 </div>
@@ -15,12 +15,12 @@
       <p class="line">
         <span class="path">~</span>
         <span class="prompt">$</span>
-        <span class="command">wget https://raw.github.com/progrium/dokku/v0.4.0/bootstrap.sh</span>
+        <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.5.6/bootstrap.sh</span>
       </p>
       <p class="line">
         <span class="path">~</span>
         <span class="prompt">$</span>
-        <span class="command">sudo DOKKU_TAG=v0.4.0 bash bootstrap.sh</span>
+        <span class="command">sudo DOKKU_TAG=v0.5.6 bash bootstrap.sh</span>
       </p>
       <p class="line">
         <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>

docs/installation.md

@@ -1,33 +1,54 @@
-# Installation
+# Getting Started with Dokku
 
-## Requirements
+## What is Dokku?
 
-- A fresh VM running Ubuntu `14.04 x64`
-- At least `1GB` of system memory ([workaround for 512MB machines](http://progrium.viewdocs.io/dokku/advanced-installation))
-- The VM should have a FQDN set before installation (check by running `sudo hostname -f`).
+Dokku is an extensible, open source Platform as a Service that runs on a single server of your choice.
 
-Ubuntu 14.04 x64. Ideally have a domain ready to point to your host. It's designed for and is probably best to use a fresh VM. The bootstrapper will install everything it needs.
+To start using Dokku, you'll need a system that meets the following minimum requirements:
 
-## Installing the latest Stable version
+- A fresh installation of [Ubuntu 14.04 x64](http://www.ubuntu.com/download/) with the FQDN set <sup>[1]</sup>
+- At least `1GB` of system memory <sup>[2]</sup>
 
-To install the latest stable version of dokku, you can run the following bootstrapper command:
+You can *optionally* have a domain name pointed at the host's IP, though this is not necessary.
+
+Dokku is designed for usage on a fresh installation of Ubuntu, and should install all necessary dependencies if installing via the bootstrap method.
+
+### Installing the latest stable version
+
+#### 1. Install dokku
+
+To install the latest stable version of dokku, you can run the following shell commands:
 
 ```shell
 # installs dokku via apt-get
-wget https://raw.github.com/progrium/dokku/v0.4.0/bootstrap.sh
-sudo DOKKU_TAG=v0.4.0 bash bootstrap.sh
-
-# By default, this will do cli-based setup, though you may *also*
-# go to your server's IP and follow the web installer
+wget https://raw.githubusercontent.com/dokku/dokku/v0.5.6/bootstrap.sh
+sudo DOKKU_TAG=v0.5.6 bash bootstrap.sh
 ```
 
+The installation process takes about 5-10 minutes, depending upon internet connection speed.
+
+#### 2. Setup SSH key and Virtualhost Settings
+
+Once the installation is complete, you can open a browser to setup your SSH key and virtualhost settings. Open your browser of choice and navigate to the host's IP address - or the domain you assigned to that IP previously - and configure dokku via the web admin.
+
+#### 3. Deploy your first application
+Once you save your settings, the web admin will self-terminate and you should be able to run or deploy to the dokku installation.
+
+### Installing via other methods
+
 For various reasons, certain hosting providers may have other steps that should be preferred to the above. If hosted on any of the following popular hosts, please follow the linked to instructions:
 
-- [Digital Ocean Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/digitalocean)
-- [Linode Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/linode)
+- [Digital Ocean Installation Notes](/dokku/getting-started/install/digitalocean)
+- [Linode Installation Notes](/dokku/getting-started/install/linode/)
+- [Microsoft Azure Installation Notes](/dokku/getting-started/install/azure/)
 
 As well, you may wish to customize your installation in some other fashion. or experiment with vagrant. The guides below should get you started:
 
-- [Debian Package Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/debian)
-- [Vagrant Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/vagrant)
-- [Advanced Install Customization](http://progrium.viewdocs.io/dokku/advanced-installation)
+- [Debian Package Installation Notes](/dokku/getting-started/install/debian)
+- [Vagrant Installation Notes](/dokku/getting-started/install/vagrant)
+- [Advanced Install Customization](/dokku/advanced-installation)
+
+---
+
+- <sup>[1]: To check whether your system has an fqdn set, run `sudo hostname -f`</sup>
+- <sup>[2]: If your system has less than 1GB of memory, you can use [this workaround](/dokku/advanced-installation/#vms-with-less-than-1gb-of-memory).</sup>