Release 0.5.2

add sigil to debian control file

.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

@@ -2,12 +2,12 @@
 
 Dokku loves 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/)
 
 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 +41,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,52 +55,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
-
-- `uname -a`:
-- `docker version`:
-- `docker -D info`:
-- `dokku version`:
-- `dokku plugin`:
-- `docker inspect CONTAINER_ID` (if applicable):
-- `cat /home/dokku/<app>/nginx.conf` (if applicable):
-- Output of failing dokku commands with `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):
-
-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
 
@@ -108,7 +74,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.
@@ -132,7 +98,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
@@ -182,13 +148,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,5 +1,366 @@
 # History
 
+## 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:
@@ -158,9 +519,9 @@ One new feature is colorized logging output, which should make it easier to debu
 
 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!
@@ -269,7 +630,7 @@ This release is a bugfix release covering dokku packaging.
 
 ## 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
 

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:
+  - Application name
+  - The type of application being deployed (node, php, python, ruby, etc.)
+  - Whether or not you have a `Dockerfile` in the root of your repository
+  - If using buildpacks, which custom buildpacks are in use
+  - 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.githubusercontent.com/progrium/sshcommand/master/sshcommand
-PLUGN_URL ?= https://github.com/progrium/dokku/releases/download/v0.4.0/plugn_0.2.0_linux_x86_64.tgz
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/master/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
@@ -123,7 +129,7 @@ ifdef BUILD_STACK
 else
 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/) [![Gratipay](https://img.shields.io/gratipay/dokku.svg)](https://gratipay.com/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.githubusercontent.com/progrium/dokku/v0.4.4/bootstrap.sh
-    sudo DOKKU_TAG=v0.4.4 bash bootstrap.sh
+    wget https://raw.githubusercontent.com/dokku/dokku/v0.5.2/bootstrap.sh
+    sudo DOKKU_TAG=v0.5.2 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 License](https://github.com/progrium/dokku/blob/master/LICENSE) © Jeff Lindsay
+[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"
@@ -24,6 +25,7 @@ Vagrant::configure("2") do |config|
     # 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
 
@@ -38,8 +40,23 @@ Vagrant::configure("2") do |config|
     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.
@@ -68,6 +85,16 @@ Vagrant::configure("2") do |config|
     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,106 +1,129 @@
-#!/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() {
+  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 () {
-
-
-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
-
-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
+  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
+  }
 }
 
-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
+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
+}
 
-dokku_install_source() {
-  apt-get install -qq -y git make software-properties-common
+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
+}
+
+
+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"
   if uname -r | grep -q linode; then
     echo "--> NOTE: Using Linode? Docker might complain about missing AUFS support."
-    echo "    See http://progrium.viewdocs.io/dokku/getting-started/install/linode/"
+    echo "    See http://dokku.viewdocs.io/dokku/getting-started/install/linode/"
     echo "    Installation will continue in 10 seconds."
     sleep 10
   fi
-  curl -sSL https://get.docker.com/ | sh
+  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 -y dokku=$DOKKU_CHECKOUT
+    # shellcheck disable=SC2086
+    apt-get -qq -y $NO_INSTALL_RECOMMENDS install "dokku=$DOKKU_CHECKOUT"
   else
-    apt-get install -y 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" -eq "3" ]] && [[ "$patch" -ge "13" ]]; then
-    export DOKKU_CHECKOUT="$DOKKU_SEMVER"
-    dokku_install_package
-    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
-    export DOKKU_CHECKOUT="$DOKKU_SEMVER"
-    dokku_install_package
-    dokku plugin:install-dependencies --core
-  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,9 @@ dependencies:
     - "~/docker"
   override:
     - ./tests/ci/parallel_runner.sh setup: { timeout: 300 }
+    - echo "export DOKKU_SKIP_CLEANUP=true" > /home/dokku/.dokkurc/dokku_skip_cleanup
   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.2'
+
+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,136 +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 if File.directory?("/etc/init")
-  File.open("/etc/systemd/system/dokku-installer.service", "w") do |f|
-    f.puts "[Unit]"
-    f.puts "Description=Dokku web-installer"
-    f.puts ""
-    f.puts "[Service]"
-    f.puts "ExecStart=#{File.absolute_path(__FILE__)} selfdestruct"
-    f.puts ""
-    f.puts "[Install]"
-    f.puts "WantedBy=multi-user.target"
-    f.puts "WantedBy=graphical.target"
-  end if File.directory?("/etc/systemd/system")
-  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.4"
-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 -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && 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

@@ -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
-      # shellcheck disable=SC2029
-      ssh -o LogLevel=QUIET -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,SC2029
-    ssh -o LogLevel=QUIET -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

deb.mk

@@ -1,55 +1,71 @@
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.4
+HEROKUISH_VERSION ?= 0.3.9
 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
 
 SSHCOMMAND_DESCRIPTION = 'Turn SSH into a thin client specifically for your app'
-SSHCOMMAND_REPO_NAME ?= progrium/sshcommand
+SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
 SSHCOMMAND_VERSION ?= 0.1.0
 SSHCOMMAND_ARCHITECTURE = amd64
 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
 
-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
 
-GOROOT = /usr/lib/go
-GOBIN = /usr/bin/go
+GOROOT = /usr/local/go
+GOBIN = /usr/local/go/bin/go
 GOPATH = /home/vagrant/gocode
+GOTARBALL = go1.5.3.linux-amd64.tar.gz
 
-.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
+golang:
+ifeq (,$(wildcard /tmp/$(GOTARBALL)))
+	@echo "-> Installing golang"
+	mkdir -p /tmp/build/usr/local/bin $(GOPATH)
+	sudo apt-get clean
+	sudo apt-get update -qq > /dev/null
+	sudo apt-get install -qq -y git mercurial > /dev/null 2>&1
+	sudo wget -nv -O /tmp/$(GOTARBALL) https://storage.googleapis.com/golang/$(GOTARBALL)
+	sudo tar -C /usr/local -xzf /tmp/$(GOTARBALL)
+endif
+
+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"
+	@echo "-> Updating deb repository and installing build requirements"
 	sudo apt-get update -qq > /dev/null
-	sudo apt-get install -qq -y gcc git ruby-dev ruby1.9.1 > /dev/null 2>&1
+	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
 
@@ -57,27 +73,27 @@ 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"
+	@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 | docker-engine-cs' --deb-pre-depends sudo --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 +103,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,53 +123,56 @@ 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
+deb-plugn: deb-setup golang
 	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"
+	@echo "-> Cloning repository"
 	git clone -q "https://github.com/$(PLUGN_REPO_NAME).git" /tmp/tmp/plugn > /dev/null
 	rm -rf /tmp/tmp/plugn/.git /tmp/tmp/plugn/.gitignore
 
-	echo "-> Copying files into place"
-	mkdir -p /tmp/build/usr/local/bin $(GOPATH)
-	sudo apt-get clean
-	sudo apt-get update -qq > /dev/null
-	sudo apt-get install -qq -y git golang mercurial > /dev/null 2>&1
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && go get github.com/progrium/plugn
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && make deps
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && rm plugn && go build -o plugn
-	mv /home/vagrant/gocode/src/github.com/progrium/plugn/plugn /tmp/build/usr/local/bin/plugn
+	@echo "-> Copying files into place"
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && go get github.com/dokku/plugn
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/dokku/plugn && make deps
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/dokku/plugn && rm -f plugn && go build -o plugn
+	mv /home/vagrant/gocode/src/github.com/dokku/plugn/plugn /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
 	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"
+	@echo "-> Cloning repository"
 	git clone -q "https://github.com/$(SSHCOMMAND_REPO_NAME).git" /tmp/tmp/sshcommand > /dev/null
 	rm -rf /tmp/tmp/sshcommand/.git /tmp/tmp/sshcommand/.gitignore
 
-	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
 	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 golang
+	rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME)
+	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin
+
+	@echo "-> Cloning repository"
+	git clone -q -b v$(SIGIL_VERSION) "https://github.com/$(SIGIL_REPO_NAME).git" /tmp/tmp/sigil > /dev/null
+	rm -rf /tmp/tmp/sigil/.git /tmp/tmp/sigil/.gitignore
+
+	@echo "-> Copying files into place"
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/sigil && go get github.com/gliderlabs/sigil
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/sigil && cd /home/vagrant/gocode/src/github.com/gliderlabs/sigil && make deps
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/sigil && cd /home/vagrant/gocode/src/github.com/gliderlabs/sigil && make build
+	cp /home/vagrant/gocode/src/github.com/gliderlabs/sigil/build/Linux/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.4.4
+Version: 0.5.2
 Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, gcc, man-db, herokuish, sshcommand, docker-engine-cs | docker-engine | lxc-docker (>= 1.6.2) | docker.io (>= 1.6.2), software-properties-common, python-software-properties
-Pre-Depends: nginx (>= 1.4.6), dnsutils, apparmor, cgroupfs-mount | cgroup-lite, plugn, sudo, ruby, ruby-dev, rubygem-rack , rubygem-rack-protection, rubygem-sinatra, rubygem-tilt
+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,59 @@ case "$1" in
     egrep -i "^docker" /etc/group || groupadd docker
     usermod -aG docker dokku
 
-    # setup plugin directories
+    echo "Setting up 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
+    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
 
-    # migrate old plugins
-    find /var/lib/dokku/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    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 -r 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 +87,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"
+      fi
     fi
     ;;
 
@@ -80,4 +99,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.githubusercontent.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
@@ -27,7 +27,7 @@ sudo SSHCOMMAND_URL=https://raw.githubusercontent.com/yourusername/sshcommand/ma
 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.githubusercontent.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,22 @@
+# 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 multiple ports
+- Dockerfiles with multiple `EXPOSE` clauses will get all **tcp** ports proxied by default (nginx does not support proxying udp)
+  - UDP can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`

docs/application-deployment.md

@@ -5,6 +5,7 @@
 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.
 
 ```shell
+# from your local machine
 git clone git@github.com:heroku/ruby-rails-sample.git
 ```
 
@@ -13,6 +14,7 @@ git clone git@github.com:heroku/ruby-rails-sample.git
 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
 ```
 
@@ -21,6 +23,7 @@ dokku apps:create ruby-rails-sample
 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
@@ -36,6 +39,7 @@ dokku postgres:create rails-database
 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
 ```
@@ -47,6 +51,7 @@ dokku postgres:link rails-database ruby-rails-sample
 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
 ```
@@ -89,6 +94,7 @@ Dokku supports deploying applications via [Heroku buildpacks](https://devcenter.
 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
 ```
@@ -96,31 +102,45 @@ 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
 ```
 
-### Adding deploy users
+### Renaming a deployed app
 
-While it is possible to use password-based authorization to push to Dokku, it is preferable to use key-based authentication for security. You can add your public key to the dokku user's `authorized_keys` file with the following command:
+> New as of 0.4.7
+
+You can rename a deployed app using the `apps:rename` CLI tool:
 
 ```shell
-# replace dokku.me with your domain name or the host's IP
-# replace root with your server's root user
-cat ~/.ssh/id_rsa.pub | ssh root@dokku.com "sudo sshcommand acl-add dokku [description]"
+# 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```
 
 You can also support pushing multiple branches using the [receive-branch](/dokku/development/plugin-triggers/#receive-branch) plugin trigger in a custom plugin.
 
+### Skipping deployment
+
+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:
+
+``` shell
+# on your dokku host
+dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
+```
+
 ### 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 `/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
@@ -128,20 +148,6 @@ ssh -T git@github.com
 
 Note that if the buildpack or dockerfile build process require ssh key access for other reasons, the above may not always apply.
 
-### 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
-```
-
-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.
-
 ## Deploying to subdomains
 
 The name of remote repository is used as the name of application to be deployed, as for example above:
@@ -176,7 +182,13 @@ This is in particular useful, then you want to deploy to root domain, as
 
 ## Dokku/Docker Container Management Compatibility
 
-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/progrium/dokku/issues/1220), dokku executes a cleanup function prior to every deployment. This function removes all exited containers and all 'unattached' images.
+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. 
+
+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.
+
+### Adding deploy users
+
+See the [user management documentation](/dokku/deployment/user-management).
 
 ## Default vhost
 
@@ -186,10 +198,14 @@ See the [nginx documentation](/dokku/nginx/#default-site).
 
 See the [dockerfile documentation](/dokku/deployment/dockerfiles/).
 
-## Zero downtime deploy
+### Specifying a custom buildpack
 
-See the [zero-downtime deploy documentation](/dokku/checks-examples/).
+See the [buildpack documentation](/dokku/deployment/buildpacks/).
 
 ## Image tagging
 
 See the [image tagging documentation](/dokku/deployment/images).
+
+## Zero downtime deploy
+
+See the [zero-downtime deploy documentation](/dokku/checks-examples/).

docs/assets/favicons/browserconfig.xml

@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/mstile-310x150.png"/>
       <TileColor>#da532c</TileColor>
     </tile>
   </msapplication>

docs/assets/favicons/manifest.json

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

docs/assets/style.css

@@ -1,11 +1,11 @@
 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-weight: 400;
@@ -25,9 +25,7 @@ h1 {
   padding: 0 0 0 1em;
 }
 .header a {
-  background-image: url(https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/dokku.png);
   color: #fff;
-  text-indent: 40px;
   background-position: center left;
   display: block;
   width: 100%;
@@ -37,23 +35,25 @@ h1 {
   background-size: contain;
   background-repeat: no-repeat;
 }
+.header .navbar-brand a {
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/dokku.png);
+  text-indent: 40px;
+}
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.5.2/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: 750px;
@@ -62,7 +62,8 @@ h1 {
 .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;
@@ -70,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;
@@ -91,19 +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;
 }
-.quickstart-code .line .output {
-  color: #aaaaaa;
+.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;
@@ -113,7 +152,6 @@ h1 {
   margin-right: 10px;
   margin-left: 10px;
 }
-
 .featurette-divider {
   margin: 20px 0;
 }
@@ -125,9 +163,20 @@ h1 {
 .featurette-heading .text-muted {
   font-weight: 300;
 }
+.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
+}
 .list-group-item {
   border: none;
-  font-size: 13px;
   font-weight: normal;
   padding: .2rem .5rem;
   color: #157577;
@@ -143,13 +192,12 @@ a.list-group-item {
   color: #bbb;
   cursor: default;
   font-weight: normal;
-  font-size: 11px;
   margin-bottom: 1em;
   margin-top: 2em;
   text-transform: uppercase;
 }
 .anchorjs-link {
-    color: #24cbce;
+  color: #24cbce;
 }
 .markdown-body {
   -webkit-font-smoothing: antialiased;
@@ -173,7 +221,7 @@ a.list-group-item {
   font-size: 17px;
   font-weight: 700;
   color: #555;
-  margin-top: 3em;
+  margin-top: 2em;
   text-transform: uppercase;
 }
 .markdown-body h3 {
@@ -198,7 +246,7 @@ code {
   margin: 0;
   font-size: 85%;
   background-color: #fff;
-  background-color: rgba(0,0,0,0.06);
+  background-color: rgba(0, 0, 0, 0.06);
   color: #333;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -223,9 +271,8 @@ pre {
   word-wrap: normal;
   border: 1px solid #cccccc;
   border-radius: 4px;
-  font-size: 12px;
   box-shadow: 0 0 0 3px #eee;
-  overflow: auto !important;
+  overflow: auto;
   padding: 10px;
   background-color: #fff;
   color: #4d4d4c;
@@ -237,20 +284,207 @@ blockquote {
   padding: 15px 15px 1px;
   margin-bottom: 30px;
 }
-blockquote.new-as-of {
+.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-heading {
     margin-top: 120px;

docs/assets/versions.json

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

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,60 +1,57 @@
 # Zero Downtime Deploys
 
-> New as of 0.3.0
+> New as of 0.5.0
 
-Following a deploy, dokku will now wait `10` seconds before routing traffic to the new container. If the container is not running after this time, then the deploy is failed and your old container will continue serving traffic. You can modify this value using the following command:
+```
+checks <app>                                                                                 Show zero-downtime status
+checks:disable <app>                                                                         Disable zero-downtime checks
+checks:enable <app>                                                                          Enable zero-downtime checks
+```
+
+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:
 
 ```shell
 dokku config:set --global DOKKU_DEFAULT_CHECKS_WAIT=30
+dokku config:set <app> DOKKU_DEFAULT_CHECKS_WAIT=30
 ```
 
-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.
-
-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.
-
-A check is a relative URL and may be followed by expected content from the page, for example:
-
-```
-/about      Our Amazing Team
-```
-
-Dokku will wait `5` seconds before running the checks to give the server time to start. This value can be overridden on a per-app basis in the `CHECKS` file by setting `WAIT=nn`. You may also override this for the global dokku installation:
+You can also choose to skip checks completely on a per-application basis:
 
 ```shell
-dokku config:set --global DOKKU_CHECKS_WAIT=15
+dokku checks:disable <app>
 ```
 
-Dokku will wait `60` seconds before stopping the old container so that existing connections are given a chance to complete. This value is also configurable globally:
+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:
 
 ```shell
 dokku config:set --global DOKKU_WAIT_TO_RETIRE=120
+dokku config:set <app> DOKKU_WAIT_TO_RETIRE=120
 ```
 
 > 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.
 
-Dokku will retry the checks `5` times until the checks are successful. If all 5 checks fail, the deployment is considered failed. This can be overridden in the `CHECKS` file by setting `ATTEMPTS=nn`. This number is also configurable globally:
+## Checks
 
-```shell
-dokku config:set --global DOKKU_CHECKS_ATTEMPTS=2
+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.
+
+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
 ```
 
-You can also choose to skip checks completely either globally or on a per-application basis:
-
-```shell
-# globally
-dokku config:set --global DOKKU_SKIP_ALL_CHECKS=true
-
-# for APP
-dokku config:set APP DOKKU_SKIP_ALL_CHECKS=true
-```
-
-## Checks Examples
-
-The CHECKS file may contain empty lines, comments (lines starting with #),
-settings (NAME=VALUE) and check instructions.
-
-The format of a check instruction is a path, optionally followed by the
-expected content.  For example:
+The `CHECKS` file can contain multiple checks:
 
 ```
 /                       My Amazing App
@@ -63,50 +60,65 @@ expected content.  For example:
 /images/logo.png
 ```
 
-To check an application that supports multiple hostnames, use relative URLs
-that include the hostname, for example:
+To check an application that supports multiple hostnames, use relative URLs that include the hostname:
 
 ```
-//admin.example.com     Admin Dashboard
+//admin.example.com  Admin Dashboard
 //static.example.com/logo.png
 ```
 
-You can also specify the protocol to explicitly check HTTPS requests.
-
+You can also specify the protocol to explicitly check HTTPS requests:
 
 ```
-https://admin.example.com     Admin Dashboard
+https://admin.example.com  Admin Dashboard
 https://static.example.com/logo.png
 ```
 
-The default behavior is to wait for 5 seconds before running the first check, and timeout each check to 30 seconds.
+### Check Settings
 
-By default, checks will be attempted 5 times.  (Retried 4 times)
+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 these by setting `WAIT`, `TIMEOUT` and `ATTEMPTS` to different values, for
-example:
+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
+ATTEMPTS=10 # Attempt checks 10 times
 
-/                       My Amazing App
+/  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 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.
+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:
+
+````
+get '/check.txt', to: proc {[200, {}, ['simple_check']]}
+````
 
 ### Deploy Output
 
@@ -129,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!
@@ -165,14 +177,15 @@ curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
 ````
 
 ## 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.
+
+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
 
 ````
-WAIT=5
+WAIT=10
 ATTEMPTS=6
 /
 ````
@@ -200,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/ => ""
  !

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

@@ -11,7 +11,7 @@ config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...] Set one or more config
 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.
+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 `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.
 
@@ -30,7 +30,7 @@ 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 --no-restart config:set node-js-app ENV=prod
+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:

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=succuss"
+    }
+  },
+  "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

@@ -18,7 +18,7 @@ By default, Dokku will extract the first `EXPOSE` tcp port and use said port wit
 dokku config:set APP DOKKU_DOCKERFILE_PORT=8000
 ```
 
-Dokku will not expose other ports on your application without a [custom docker-option](/dokku/configuration/docker-options/).
+Dokku will not expose other ports on your application without a [custom docker-option](/dokku/docker-options/).
 
 If you do not have a port explicitly exposed, Dokku will automatically expose port `5000` for your application.
 
@@ -39,3 +39,35 @@ 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/images.md

@@ -33,7 +33,7 @@ root@dokku:~# dokku tags:deploy 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
+       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!

docs/deployment/one-off-processes.md

@@ -1,4 +1,4 @@
-# One-off Processes
+# 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.
 
@@ -97,6 +97,8 @@ For tasks that will properly resume, you **should** use the above method, as run
 
 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.

docs/deployment/ssl-configuration.md

@@ -26,7 +26,13 @@ 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 the name of your application
-dokku certs:add < cert-key.tar
+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
 ```
 
 ### Certificate generation
@@ -95,14 +101,40 @@ Beware that if you enable the header and a subsequent deploy of your application
 
 ## Running behind a load balancer
 
-> New as of 0.3.17
-
 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 setting the `DOKKU_SSL_TERMINATED` environment variable:
+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
-dokku config:set myapp DOKKU_SSL_TERMINATED=1
+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;
+
+  upstream {{ .APP }} {
+  {{ range .DOKKU_APP_LISTENERS | split " " }}
+    server {{ . }};
+  {{ end }}
+  }
+}
 ```
 
 Only use this option if:

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,7 +23,7 @@ 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.
 
@@ -92,10 +92,10 @@ cd /root/dokku
 sudo BUILD_STACK=true make install
 ```
 
-### `commands help`
+### `comands help` and `commands <PLUGIN_NAME>: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`
+- 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:
 
@@ -106,11 +106,30 @@ sudo BUILD_STACK=true make install
 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
+  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
     ;;
 
   *)
@@ -120,67 +139,6 @@ EOF
 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.
@@ -263,7 +221,7 @@ 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")
+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
 ```
@@ -290,7 +248,7 @@ 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")
+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
 ```
@@ -374,17 +332,38 @@ 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")
+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"
 ```
 
+### `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-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`
+- Arguments: `$APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS $IMAGE_TAG`
 - Example:
 
 ```shell
@@ -414,7 +393,7 @@ APP="$1"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"; IMAGE=$(get_app_image_name $AP
 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
+  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
 ```
 
@@ -459,7 +438,7 @@ dokku config:set --no-restart $APP MANUALLY_STOPPED=1
 
 - Description:
 - Invoked by: `dokku build`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_SOURCE_TYPE`
 - Example:
 
 ```shell
@@ -525,9 +504,9 @@ echo false
 
 ### `post-domains-update`
 
-- Description: Allows you to run commands once the domain for an application has been updated.
+- 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`
+- Arguments: `$APP` `action name` `domains`
 - Example:
 
 ```shell
@@ -712,9 +691,51 @@ some code to remove a docker hub tag because it's not implemented in the CLI....
 
 ```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@co.com
+mail -s "$APP containers on $HOSTNAME failed to retire" ops@example.com
+```
+
+### `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,7 +4,8 @@ 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 `contrib/dokku-installer.rb` 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
@@ -17,12 +18,13 @@ To propose a release, the following tasks need to be performed:
 - 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 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
 
@@ -56,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.2-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:
@@ -77,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

@@ -14,12 +14,12 @@ 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.
 
 
 ### 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
@@ -73,7 +73,7 @@ If everything is working correctly, you should also be able to query for any oth
 
 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/progrium/dokku/blob/master/README.md)
+Proceed with the setup instructions in the [README](https://github.com/dokku/dokku/blob/master/README.md)
 
 ### Using the root of your domain (myapp.example.tld)
 

docs/docker-options.md

@@ -2,49 +2,63 @@
 
 > New as of 0.3.17
 
-```
-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)
-```
-
-Add some options (first, for the deployed/running app and second when executing `dokku run`):
+Pass [options](https://docs.docker.com/engine/reference/run/) to Docker during Dokku's `build`, `deploy` and `run` phases
 
 ```
-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"
+> ```
 
-```shell
-dokku docker-options myapp
-# Deploy options:
-#    -v /host/path:/container/path
-# Run options:
-#    -v /another/container/path
-```
+## About Dokku phases
 
-Remove an option
-
-```shell
-dokku docker-options:remove myapp run "--link container_name:alias"
-```
-
-### 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:
+Dokku deploys your application in multiple "phases" and the `docker-options` plugin allows you to pass arguments to their underlying docker container:
 
 - `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`
 
-## Advanced Usage (avoid if possible)
+## Examples
 
-In your applications folder (`/home/dokku/app_name`) create a file called `DOCKER_OPTIONS_RUN` (or `DOCKER_OPTIONS_BUILD` or `DOCKER_OPTIONS_DEPLOY`).
+### Add Docker options
 
-Inside this file list one docker option per line. For example:
+Add some options for the deployed/running app and when executing [`dokku run`](deployment/one-off-processes/):
+
+```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"
+```
+
+> 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
@@ -52,7 +66,7 @@ Inside this file list one docker option per line. For example:
 -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`:
 
 ```shell
 --link container_name:alias -v /host/path:/container/path -v /another/container/path
@@ -60,4 +74,4 @@ The above example will result in the following options being passed to docker du
 
 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

@@ -44,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
@@ -56,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/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

@@ -2,7 +2,7 @@
 
 - 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://azure.microsoft.com/en-us/documentation/templates/dokku-vm/) and click **Deploy to Azure**.
+- 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.
 

docs/getting-started/install/debian.md

@@ -5,13 +5,13 @@ 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
@@ -25,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.
@@ -37,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

@@ -36,4 +36,4 @@ __Warning__: These steps will delete *everything* on your Linode.
 
 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](http://progrium.viewdocs.io/dokku/installation) and `bootstrap.sh` will take care of everything else.
+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,7 +5,7 @@
 - Clone Dokku
 
     ```
-    git clone https://github.com/progrium/dokku.git
+    git clone https://github.com/dokku/dokku.git
     ```
 
 - Setup SSH hosts in your `/etc/hosts`

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

@@ -4,19 +4,16 @@ 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 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.
+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.
 
 ## Stack Overflow
 

docs/home.html

@@ -10,72 +10,69 @@
     <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 rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/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/progrium/dokku/v0.4.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
-    <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: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;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 .line .output{color:#aaaaaa;}
-      .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 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.2/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://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="/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>
@@ -83,27 +80,101 @@
     <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.githubusercontent.com/progrium/dokku/v0.4.4/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.4 bash bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.5.2/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.2 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>
 
       <!-- START THE FEATURETTES -->
 
+      <hr class="featurette-divider">
+
       <div class="row featurette">
         <div class="col-md-7">
           <h2 class="featurette-heading">Own Your PaaS. <span class="text-muted">Infrastructure at a fraction of the cost.</span></h2>
@@ -141,11 +212,76 @@
       <hr class="featurette-divider">
     </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">
       <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

@@ -15,12 +15,12 @@
       <p class="line">
         <span class="path">~</span>
         <span class="prompt">$</span>
-        <span class="command">wget https://raw.githubusercontent.com/progrium/dokku/v0.4.4/bootstrap.sh</span>
+        <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.5.2/bootstrap.sh</span>
       </p>
       <p class="line">
         <span class="path">~</span>
         <span class="prompt">$</span>
-        <span class="command">sudo DOKKU_TAG=v0.4.4 bash bootstrap.sh</span>
+        <span class="command">sudo DOKKU_TAG=v0.5.2 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

@@ -4,7 +4,7 @@
 
 Dokku is an extensible, open source Platform as a Service that runs on a single server of your choice.
 
-To start using Dokku, you'll need a system with that meets the following minimum requirements:
+To start using Dokku, you'll need a system that meets the following minimum requirements:
 
 - 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>
@@ -19,8 +19,8 @@ To install the latest stable version of dokku, you can run the following shell c
 
 ```shell
 # installs dokku via apt-get
-wget https://raw.githubusercontent.com/progrium/dokku/v0.4.4/bootstrap.sh
-sudo DOKKU_TAG=v0.4.4 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.5.2/bootstrap.sh
+sudo DOKKU_TAG=v0.5.2 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
@@ -33,17 +33,17 @@ Once you save your settings, the web admin will self-terminate and you should be
 
 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/)
-- [Microsoft Azure Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/azure/)
+- [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](http://progrium.viewdocs.io/dokku/advanced-installation)).</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>

docs/nginx.md

@@ -3,71 +3,76 @@
 Dokku uses nginx as its server for routing requests to specific applications. By default, access and error logs are written for each app to `/var/log/nginx/${APP}-access.log` and `/var/log/nginx/${APP}-error.log` respectively
 
 ```
-nginx:access-logs <app> [-t]                     Show the nginx access logs for an application (-t follows)
-nginx:build-config <app>                         (Re)builds nginx config for given app
-nginx:disable <app>                              Disable nginx for an application (forces container binding to external interface)
-nginx:enable <app>                               Enable nginx for an application
-nginx:error-logs <app> [-t]                      Show the nginx error logs for an application (-t follows)
+nginx:access-logs <app> [-t]                                                                 Show the nginx access logs for an application (-t follows)
+nginx:build-config <app>                                                                     (Re)builds nginx config for given app
+nginx:error-logs <app> [-t]                                                                  Show the nginx error logs for an application (-t follows)
 ```
 
 ## Customizing the nginx configuration
 
-> New as of 0.3.10.
+> New as of 0.5.0
 
-Dokku currently templates out an nginx configuration that is included in the `nginx-vhosts` plugin. If you'd like to provide a custom template for your application, there are a few options:
+Dokku uses a templating library by the name of [sigil](https://github.com/gliderlabs/sigil) to generate nginx configuration for each app. If you'd like to provide a custom template for your application, there are a couple options:
 
-- Copy the existing template - ssl or non-ssl - into your application repository's root directory as the file `nginx.conf.template`.
-- Create a template file in `/home/dokku/APP` named one of the following:
-  - `nginx.conf.template` (since 0.3.10)
-  - `nginx.conf.ssl_terminated.template` (since 0.4.0)
-  - `nginx.ssl.conf.template` (since 0.4.2)
-
-> If placed on the dokku server, the template file **must** be owned by user and group `dokku:dokku`.
-
-For instance - assuming defaults - to customize the nginx template in use for the `myapp` application, create the file `nginx.conf.template` in your repo or on disk with the with the following contents:
+- Copy the following example template to a file named `nginx.conf.sigil` and either:
+  - check it into the root of your app repo
+  - `ADD` it to your dockerfile `WORKDIR`
 
+### Example Custom Template
 ```
 server {
-  listen      [::]:80;
-  listen      80;
-  server_name $NOSSL_SERVER_NAME;
-  access_log  /var/log/nginx/${APP}-access.log;
-  error_log   /var/log/nginx/${APP}-error.log;
+  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_pass  http://{{ .APP }};
     proxy_http_version 1.1;
-    proxy_set_header Upgrade \$http_upgrade;
+    proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
-    proxy_set_header Host \$http_host;
-    proxy_set_header X-Forwarded-Proto \$scheme;
-    proxy_set_header X-Forwarded-For \$remote_addr;
-    proxy_set_header X-Forwarded-Port \$server_port;
-    proxy_set_header X-Request-Start \$msec;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-For $remote_addr;
+    proxy_set_header X-Forwarded-Port $server_port;
+    proxy_set_header X-Request-Start $msec;
+  }
+  include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
+
+  upstream {{ .APP }} {
+  {{ range .DOKKU_APP_LISTENERS | split " " }}
+    server {{ . }};
+  {{ end }}
   }
-  include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
 }
 ```
 
 The above is a sample http configuration that adds an `X-Served-By` header to requests.
 
-A few tips for custom nginx templates:
-
-- Special characters - dollar signs, spaces inside of quotes, etc. - should be escaped with a single backslash or can cause deploy failures.
-- Templated files will be validated via `nginx -t`.
-- Application environment variables can be used within your nginx configuration.
-
-After your changes a `dokku deploy myapp` will regenerate the `/home/dokku/myapp/nginx.conf` file which is then used.
+### Available template variables
+```
+{{ .APP }}                          Application name
+{{ .APP_SSL_PATH }}                 Path to SSL certificate and key
+{{ .DOKKU_ROOT }}                   Global dokku root directory (ex: app dir would be `{{ .DOKKU_ROOT }}/{{ .APP }}`)
+{{ .DOKKU_APP_LISTENERS }}          List of IP:PORT pairs of app containers
+{{ .NGINX_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_NGINX_PORT` config var)
+{{ .NGINX_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_NGINX_SSL_PORT` config var)
+{{ .NOSSL_SERVER_NAME }}            List of non-SSL VHOSTS
+{{ .RAW_TCP_PORTS }}                List of exposed tcp ports as defined by Dockerfile `EXPOSE` directive (**Dockerfile apps only**)
+{{ .SSL_INUSE }}                    Boolean set when an app is SSL-enabled
+{{ .SSL_SERVER_NAME }}              List of SSL VHOSTS
+```
 
 ### Customizing via configuration files included by the default templates
 
-The default nginx.conf- templates will include everything from your apps `nginx.conf.d/` subdirectory in the main `server {}` block (see above):
+The default nginx.conf template will include everything from your apps `nginx.conf.d/` subdirectory in the main `server {}` block (see above):
 
 ```
-include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
+include {{ .DOKKU_ROOT }}/{{ .APP }}/nginx.conf.d/*.conf;
 ```
 
 That means you can put additional configuration in separate files, for example to limit the uploaded body size to 50 megabytes, do
@@ -87,7 +92,9 @@ 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` is set during initial configuration in the `$DOKKU_ROOT/VHOST` file.
+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:
 
@@ -105,30 +112,32 @@ If the `nginx-hostname` has no output, the normal hostname algorithm will be exe
 
 You can also use the built-in `domains` plugin to handle:
 
-### Disabling VHOSTS
-
-If desired, it is possible to disable vhosts by setting the environment variable `NO_VHOST=1`:
-
-```shell
-dokku config:set myapp NO_VHOST=1
-```
-
-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.)
-
 ### Domains plugin
 
 > New as of 0.3.10
 
 ```shell
-domains:add <app> DOMAIN                         Add a custom domain to app
-domains <app>                                    List custom domains for app
-domains:clear <app>                              Clear all custom domains for app
-domains:remove <app> DOMAIN                      Remove a custom domain from app
+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
 ```
 
-The domains plugin allows you to specify custom domains for applications. This plugin is aware of any ssl certificates that are imported via `nginx:import-ssl`. Be aware that setting `NO_VHOST` will override any custom domains.
+### Disabling VHOSTS
 
-Custom domains are also backed up via the built-in `backup` plugin
+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
@@ -146,26 +155,6 @@ dokku domains:clear myapp
 dokku domains:remove myapp example.com
 ```
 
-## Container network interface binding
-
-> New as of 0.3.13
-
-The deployed docker container running your app's web process will bind to either the internal docker network interface (i.e. `docker inspect --format '{{ .NetworkSettings.IPAddress }}' $CONTAINER_ID`) or an external interface (i.e. 0.0.0.0) depending on dokku's VHOST configuration. Dokku will attempt to bind to the internal docker network interface unless you specifically set NO_VHOST for the given app or your dokku installation is not setup to use VHOSTS (i.e. $DOKKU_ROOT/VHOST is missing or $DOKKU_ROOT/HOSTNAME is set to an IPv4 or IPv6 address)
-
-```shell
-# container bound to docker interface
-root@dokku:~/dokku# docker ps
-CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS               NAMES
-1b88d8aec3d1        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute                       goofy_albattani
-
-root@dokku:~/dokku# docker inspect --format '{{ .NetworkSettings.IPAddress }}' goofy_albattani
-172.17.0.6
-
-# container bound to all interfaces (previous default)
-root@dokku:/home/dokku# docker ps
-CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS                     NAMES
-d6499edb0edb        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute   0.0.0.0:49153->5000/tcp   nostalgic_tesla
-```
 
 ## Default site
 
@@ -208,3 +197,7 @@ See the [HSTS documentation](/dokku/deployment/ssl-configuration/#hsts-header).
 ## SSL Configuration
 
 See the [ssl documentation](/dokku/deployment/ssl-configuration/).
+
+## Disabling Nginx
+
+See the [proxy documentation](/dokku/deployment/proxy/).

docs/plugins.md

@@ -1,6 +1,6 @@
 # Plugins
 
-Dokku itself is built out of plugins and uses [plugn](https://github.com/progrium/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.
+Dokku itself is built out of plugins and uses [plugn](https://github.com/dokku/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.
 
 Let's take a quick look at the current dokku nginx plugin that's shipped with dokku by default.
 
@@ -16,7 +16,7 @@ Let's take a quick look at the current dokku nginx plugin that's shipped with do
 # This command requires `root` permissions as the `install` and `install-dependencies`
 # plugin triggers may utilize commands such as `apt-get`. For non-core plugins, please
 # inspect those plugins before running the following command as `root` user.
-sudo dokku plugin:install <git_url>
+sudo dokku plugin:install <git_url> [--committish tag/branch/commit|--name custom-plugin-name]
 
 # previous versions (0.3.x and below) of dokku require a manual process to install plugins
 cd /var/lib/dokku/plugins
@@ -26,7 +26,7 @@ dokku plugins-install
 
 ## Creating your own plugin
 
-[See the full documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation).
+[See the full documentation](/dokku/development/plugin-creation).
 
 ## Official Plugins (Beta)
 
@@ -40,12 +40,14 @@ The following plugins are available and provided by dokku maintainers. Where not
 | [Memcached (beta)](https://github.com/dokku/dokku-memcached-plugin)                               | [dokku][]             | 0.4.0+                |
 | [Mongo (beta)](https://github.com/dokku/dokku-mongo-plugin)                                       | [dokku][]             | 0.4.0+                |
 | [MySQL (beta)](https://github.com/dokku/dokku-mysql-plugin)                                       | [dokku][]             | 0.4.0+                |
+| [Nats (beta)](https://github.com/dokku/dokku-nats)                                                | [dokku][]             | 0.4.0+                |
 | [Postgres (beta)](https://github.com/dokku/dokku-postgres-plugin)                                 | [dokku][]             | 0.4.0+                |
 | [RabbitMQ (beta)](https://github.com/dokku/dokku-rabbitmq-plugin)                                 | [dokku][]             | 0.4.0+                |
 | [Redis (beta)](https://github.com/dokku/dokku-redis-plugin)                                       | [dokku][]             | 0.4.0+                |
 | [RethinkDB (beta)](https://github.com/dokku/dokku-rethinkdb-plugin)                               | [dokku][]             | 0.4.0+                |
 | [Copy Files to Image](https://github.com/dokku/dokku-copyfiles-to-image)                          | [dokku][]             | 0.4.0+                |
 | [HTTP Auth (beta)](https://github.com/dokku/dokku-http-auth)                                      | [dokku][]             | 0.4.0+                |
+| [Let's Encrypt (beta)](https://github.com/dokku/dokku-letsencrypt)                                | [dokku][]             | 0.4.0+                |
 | [Maintenance mode (beta)](https://github.com/dokku/dokku-maintenance)                             | [dokku][]             | 0.4.0+                |
 | [Redirect (beta)](https://github.com/dokku/dokku-redirect)                                        | [dokku][]             | 0.4.0+                |
 
@@ -53,37 +55,50 @@ The following plugins are available and provided by dokku maintainers. Where not
 
 Note: The following plugins have been supplied by our community and may not have been tested by dokku maintainers.
 
-[agco-adm]: https://github.com/agco-adm
+[256dpi]: https://github.com/256dpi
+[abossard]: https://github.com/dudagroup
 [ademuk]: https://github.com/ademuk
+[agco-adm]: https://github.com/agco-adm
 [alessio]: https://github.com/alessio
 [alex-sherwin]: https://github.com/alex-sherwin
 [alexanderbeletsky]: https://github.com/alexanderbeletsky
+[alexkruegger]: https://github.com/alexkruegger
 [Aomitayo]: https://github.com/Aomitayo
 [apmorton]: https://github.com/apmorton
+[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
+[basgys]: https://github.com/basgys
 [blag]: https://github.com/blag
 [cameron-martin]: https://github.com/cameron-martin
 [cedricziel]: https://github.com/cedricziel
 [cef]: https://github.com/cef
 [cjblomqvist]: https://github.com/cjblomqvist
 [darkpixel]: https://github.com/darkpixel
+[dokku]: https://github.com/dokku
 [dyson]: https://github.com/dyson
 [F4-Group]: https://github.com/F4-Group
 [fermuch]: https://github.com/fermuch
 [fgrehm]: https://github.com/fgrehm
+[Flink]: https://github.com/Flink
 [gdi2290]: https://github.com/gdi2290
 [heichblatt]: https://github.com/heichblatt
 [hughfletcher]: https://github.com/hughfletcher
+[iamale]: https://github.com/iamale
+[ignlg]: https://github.com/ignlg
 [iskandar]: https://github.com/iskandar
+[jagandecapri]: https://github.com/jagandecapri
 [jeffutter]: https://github.com/jeffutter
 [jlachowski]: https://github.com/jlachowski
-[krisrang]: https://github.com/krisrang
 [Kloadut]: https://github.com/Kloadut
+[krisrang]: https://github.com/krisrang
 [luxifer]: https://github.com/luxifer
-[mlebkowski]: https://github.com/mlebkowski
+[Maciej Łebkowski]: https://github.com/mlebkowski
 [matto1990]: https://github.com/matto1990
+[mbriskar]: https://github.com/mbriskar
 [michaelshobbs]: https://github.com/michaelshobbs
 [mikecsh]: https://github.com/mikecsh
 [mikexstudios]: https://github.com/mikexstudios
+[mixxorz]: https://github.com/mixxorz
+[mlebkowski]: https://github.com/mlebkowski
 [motin]: https://github.com/motin
 [musicglue]: https://github.com/musicglue
 [neam]: https://github.com/neam
@@ -93,25 +108,19 @@ Note: The following plugins have been supplied by our community and may not have
 [pauldub]: https://github.com/pauldub
 [pnegahdar]: https://github.com/pnegahdar
 [RaceHub]: https://github.com/racehub
+[ribot]: https://github.com/ribot
 [rlaneve]: https://github.com/rlaneve
 [robv]: https://github.com/robv
 [scottatron]: https://github.com/scottatron
 [sehrope]: https://github.com/sehrope
+[sekjun9878]: https://github.com/sekjun9878
+[sgulseth]: https://github.com/sgulseth
+[sseemayer]: https://github.com/sseemayer
 [statianzo]: https://github.com/statianzo
 [stuartpb]: https://github.com/stuartpb
 [thrashr888]: https://github.com/thrashr888
 [wmluke]: https://github.com/wmluke
 [Zenedith]: https://github.com/Zenedith
-[sekjun9878]: https://github.com/sekjun9878
-[Flink]: https://github.com/Flink
-[ribot]: https://github.com/ribot
-[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
-[jagandecapri]: https://github.com/jagandecapri
-[mixxorz]: https://github.com/mixxorz
-[Maciej Łebkowski]: https://github.com/mlebkowski
-[abossard]: https://github.com/dudagroup
-[alexkruegger]: https://github.com/alexkruegger
-[dokku]: https://github.com/dokku
 
 ### Datastores
 
@@ -138,13 +147,14 @@ Note: The following plugins have been supplied by our community and may not have
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [RabbitMQ](https://github.com/jlachowski/dokku-rabbitmq-plugin)                                   | [jlachowski][]        | 0.3.x                  |
-| [RabbitMQ (single container)](https://github.com/jlachowski/dokku-rabbitmq-single-plugin)         | [jlachowski][]        | 0.3.x                  |
+| [RabbitMQ](https://github.com/jlachowski/dokku-rabbitmq-plugin)                                   | [jlachowski][]        | 0.3.x                 |
+| [RabbitMQ (single container)](https://github.com/jlachowski/dokku-rabbitmq-single-plugin)         | [jlachowski][]        | 0.3.x                 |
 
 #### Other
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [etcd](https://github.com/basgys/dokku-etcd)                                                      | [basgys][]            | 0.4.x                  |
 | [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 0.3.x                  |
 
 [dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709
@@ -161,20 +171,22 @@ Note: The following plugins have been supplied by our community and may not have
 | [Shoreman ](https://github.com/statianzo/dokku-shoreman)                                          | [statianzo][]         | 0.3.x                 |
 | [Supervisord](https://github.com/statianzo/dokku-supervisord)                                     | [statianzo][]         | 0.3.x                 |
 
-[c77cbf1]: https://github.com/progrium/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
-[28de3ec]: https://github.com/progrium/dokku/commit/28de3ecaa3231a223f83fd8d03f373308673bc40
+[c77cbf1]: https://github.com/dokku/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
+[28de3ec]: https://github.com/dokku/dokku/commit/28de3ecaa3231a223f83fd8d03f373308673bc40
 
 ### Dokku Features
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [App name as env](https://github.com/cjblomqvist/dokku-app-name-env)                              | [cjblomqvist][]       | 0.3.x                 |
 | [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [heichblatt][]        |                       |
-| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]            | Compatible with 0.3.17+ |
+| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
 | [Dokku Copy App Config Files](https://github.com/heichblatt/dokku-supply-config)                  | [heichblatt][]        |                       |
 | [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | dokku >= [c77cbf1][]  |
 | [Dokku Registry](https://github.com/agco-adm/dokku-registry)<sup>1</sup>                          | [agco-adm][]          | 0.4.0+                |
 | [git rev-parse HEAD in env](https://github.com/cjblomqvist/dokku-git-rev)                         | [cjblomqvist][]       | 0.4.0+                |
-| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.3.14+                 |
+| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.3.14+               |
+| [Haproxy tcp load balancer](https://github.com/256dpi/dokku-haproxy)                              | [256dpi][]            | 0.4.0+                |
 | [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
 | [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           |                       |
@@ -185,7 +197,7 @@ Note: The following plugins have been supplied by our community and may not have
 | [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>3</sup>                   | [cedricziel][]        | 0.3.x                 |
 | [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | 0.3.x                 |
 
-[217d00a]: https://github.com/progrium/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
+[217d00a]: https://github.com/dokku/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
 
 <sup>1</sup> On Heroku similar functionality is offered by the [heroku-labs pipeline feature](https://devcenter.heroku.com/articles/labs-pipelines), which allows you to promote builds across multiple environments (staging -> production)
 
@@ -204,16 +216,20 @@ Note: The following plugins have been supplied by our community and may not have
 | [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        |                       |
 | [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin)                            | [gdi2290][]           |                       |
 | [Bower/Gulp](https://github.com/jagandecapri/dokku-bower-gulp-build-plugin)                       | [jagandecapri][]      |                       |
-| [Docker auto persist volumes](https://github.com/Flink/dokku-docker-auto-volumes)                         | [Flink][]             | 0.4.0+ |
+| [Builders: bower, compass, gulp, grunt](https://github.com/ignlg/dokku-builders-plugin)           | [ignlg][]             | 0.4.0+                |
+| [Docker auto persist volumes](https://github.com/Flink/dokku-docker-auto-volumes)                 | [Flink][]             | 0.4.0+                |
 | [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
-| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski][]        |                       |
-| [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.3.26+                |
+| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski]          | <0.4.0                |
+| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-grafana)                           | [jlachowski]          | 0.4.0+, graphite & statsd plugin with grafana dashboard frontend  |
+| [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.3.26+               |
+| [Monorepo](https://github.com/iamale/dokku-monorepo)                                              | [iamale][]            | 0.4.0+               |
 | [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         |                       |
 | [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            |                       |
 | [Reset mtime](https://github.com/mixxorz/dokku-docker-reset-mtime)                                | [mixxorz][]           | 0.3.15+, Dockerfile support |
 | [Slack Notifications](https://github.com/ribot/dokku-slack)                                       | [ribot][]             | 0.4.0+                |
 | [User ACL](https://github.com/mlebkowski/dokku-acl)                                               | [Maciej Łebkowski][]  | 0.4.0+                |
 | [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      |                       |
+| [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          |                       |
 | [Wordpress](https://github.com/dudagroup/dokku-wordpress-template)                                | [abossard][]          | Dokku dev, mariadb, volume, domains |
 
 <sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.
@@ -225,18 +241,18 @@ The following plugins have been removed as their functionality is now in Dokku C
 | Plugin                                                                                            | Author                | In Dokku Since                  |
 | ------------------------------------------------------------------------------------------------- | --------------------- | ------------------------------- |
 | [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | v0.3.10 (domains plugin)        |
-| [Debug](https://github.com/heichblatt/dokku-debug)                                                | [heichblatt][]         | v0.3.9 (trace command)          |
+| [Debug](https://github.com/heichblatt/dokku-debug)                                                | [heichblatt][]        | v0.3.9 (trace command)          |
 | [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | v0.3.17 (docker-options plugin) |
 | [Events Logger](https://github.com/alessio/dokku-events)                                          | [alessio][]           | v0.3.21 (events plugin)         |
 | [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | v0.3.17 (docker-options plugin) |
-| [List Containers](https://github.com/heichblatt/dokku-list)                                       | [heichblatt][]         | v0.3.14 (ps plugin              |
+| [List Containers](https://github.com/heichblatt/dokku-list)                                       | [heichblatt][]        | v0.3.14 (ps plugin              |
 | [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | v0.3.17 (docker-options plugin) |
 | [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains plugin)        |
 | [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin) |
 | [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)        |
 | [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin) |
 | [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         | v0.3.0 (zero downtime deploys)  |
-| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]         | v0.3.14 (ps plugin)             |
+| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | v0.3.14 (ps plugin)             |
 | [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)<sup>2</sup>    | [cameron-martin][]    | v0.3.9 (build-env plugin)       |
 | [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>2</sup>               | [musicglue][]         | v0.3.9 (build-env plugin)       |
 | [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>2</sup>                   | [motin][]             | v0.3.9 (build-env plugin)       |
@@ -255,11 +271,11 @@ The following plugins are no longer maintained by their developers.
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [app-url](https://github.com/mikecsh/dokku-app-url)                                               | [mikecsh][]           | Works with 0.2.0      |
-| [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [Flink][]             | 0.4.0+ |
+| [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [Flink][]             | 0.4.0+                |
 | [CouchDB](https://github.com/racehub/dokku-couchdb-plugin)                                        | [RaceHub][]           | Compatible with 0.2.0 |
 | [Elasticsearch](https://github.com/robv/dokku-elasticsearch)                                      | [robv][]              | Not compatible with >= 0.3.0 (still uses /home/git) |
 | [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup>                   | [blag][]              | Compatible with 0.2.0 |
-| [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [Flink][]             | 0.4.0+ |
+| [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [Flink][]             | 0.4.0+                |
 | [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin)                   | [jeffutter][]         |                       |
 | [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin)                                       | [hughfletcher][]      |                       |
 | [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin)                                           | [Aomitayo][]          |                       |

docs/proxy.md

@@ -0,0 +1,30 @@
+# Proxy plugin
+
+> New as of 0.5.0
+
+As of dokku 0.5.0, the proxy functionality has been decoupled from the nginx-vhosts plugin into the proxy plugin. In the future this will allow other proxy software (HAproxy for example) to be used instead of nginx.
+
+```
+proxy:disable <app>                                                                          Disable proxy for app
+proxy:enable <app>                                                                           Enable proxy for app
+proxy:set <app> <proxy_type>                                                                 NOT IMPLEMENTED YET!!
+```
+
+## Container network interface binding
+
+By default, the deployed docker container running your app's web process will bind to the internal docker network interface (i.e. `docker inspect --format '{{ .NetworkSettings.IPAddress }}' $CONTAINER_ID`). This behavior can be modified per app by disabling the proxy (i.e. `dokku proxy:disable <app>`). In this case, the container will bind to an external interface (i.e. 0.0.0.0) and your app container will be directly accessible by other hosts on your network.
+
+```shell
+# container bound to docker interface
+root@dokku:~/dokku# docker ps
+CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS               NAMES
+1b88d8aec3d1        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute                       node-js-app.web.1
+
+root@dokku:~/dokku# docker inspect --format '{{ .NetworkSettings.IPAddress }}' node-js-app.web.1
+172.17.0.6
+
+# container bound to all interfaces
+root@dokku:/home/dokku# docker ps
+CONTAINER ID        IMAGE                      COMMAND                CREATED              STATUS              PORTS                     NAMES
+d6499edb0edb        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute   0.0.0.0:49153->5000/tcp   node-js-app.web.1
+```

docs/template.html

@@ -10,41 +10,70 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:400:sans-serif|Open+Sans:400:sans-serif" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.5.2/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/progrium/dokku/v0.4.4/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.5.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.5.2/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/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/progrium/dokku/v0.4.4/docs/assets/style.css" rel="stylesheet">
+    <script>
+      if ('{{DOC}}' == 'index.md') {
+        var indexLink = '/{{NAME}}/';
+        if ('{{REF}}' !== 'master') {
+          indexLink = '/{{NAME}}~{{REF}}/';
+        }
+        window.location.replace(window.location.origin + indexLink);
+      }
+    </script>
+
+    <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.2/docs/assets/style.css" rel="stylesheet">
+    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
     </style>
   </head>
   <body>
+    <div class="dev-warning doc-floating-warning" style="display:none">
+      This document is for dokku's development version, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page.
+    </div>
     <div class="header">
       <div class="container-fluid">
         <div class="row">
           <div class="col-md-offset-2">
             <h1 class="heading navbar-brand">
-              <a href="http://progrium.viewdocs.io/dokku/">Dokku</a>
+              <a href="http://dokku.viewdocs.io/dokku/">Dokku</a>
             </h1>
+            <ul class="nav nav-pills pull-xs-right col-md-offset-right-2">
+              <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>
@@ -59,19 +88,21 @@
           <div class="list-group">
             <a href="#" class="list-group-item disabled">Getting Started</a>
             <a href="/dokku/installation/" class="list-group-item">Getting Started with Dokku</a>
-            <a href="/dokku/upgrading/" class="list-group-item">Upgrading</a>
+            <a href="/dokku/upgrading/" class="list-group-item">Upgrading Dokku</a>
             <a href="/dokku/troubleshooting/" class="list-group-item">Troubleshooting</a>
             <a href="/dokku/getting-started/where-to-get-help/" class="list-group-item">Getting Help</a>
 
             <a href="#" class="list-group-item disabled">Deployment</a>
 
             <a href="/dokku/application-deployment/" class="list-group-item">Deploying an Application</a>
+            <a href="/dokku/deployment/buildpacks/" class="list-group-item">Buildpack Deployment</a>
             <a href="/dokku/deployment/dockerfiles/" class="list-group-item">Dockerfile Deployment</a>
             <a href="/dokku/deployment/images/" class="list-group-item">Image Tagging</a>
             <a href="/dokku/remote-commands/" class="list-group-item">Remote Commands</a>
-            <a href="/dokku/deployment/one-off-processes/" class="list-group-item">One Off Processes</a>
+            <a href="/dokku/deployment/one-off-processes/" class="list-group-item">One Off Processes/Cron</a>
             <a href="/dokku/process-management/" class="list-group-item">Scaling Apps</a>
-            <a href="/dokku/checks-examples/" class="list-group-item">Zero Downtime Deploys</a>
+            <a href="/dokku/deployment/user-management/" class="list-group-item">User Management</a>
+            <a href="/dokku/checks-examples/" class="list-group-item">Zero Downtime Deploy Checks</a>
 
             <a href="#" class="list-group-item disabled">Configuration</a>
 
@@ -79,9 +110,16 @@
             <a href="/dokku/dns" class="list-group-item">DNS Configuration</a>
             <a href="/dokku/nginx/" class="list-group-item">Nginx Configuration</a>
             <a href="/dokku/deployment/ssl-configuration/" class="list-group-item">SSL Configuration</a>
-            <a href="/dokku/docker-options/" class="list-group-item">Docker Container Options</a>
             <a href="/dokku/dokku-events-logs/" class="list-group-item">Dokku Event Logs</a>
 
+            <a href="#" class="list-group-item disabled">Advanced Usage</a>
+
+            <a href="/dokku/backup-recovery/" class="list-group-item">Backup and Recovery</a>
+            <a href="/dokku/deployment/deployment-tasks/" class="list-group-item">Deployment Tasks</a>
+            <a href="/dokku/docker-options/" class="list-group-item">Docker Container Options</a>
+            <a href="/dokku/dokku-storage/" class="list-group-item">Persistent Storage</a>
+            <a href="/dokku/proxy/" class="list-group-item">Proxy Management</a>
+
             <a href="#" class="list-group-item disabled">Community Contributions</a>
 
             <a href="/dokku/community/clients/" class="list-group-item">Clients</a>
@@ -98,9 +136,39 @@
       </div>
     </div>
 
+    <div class="rst-versions rst-badge" data-toggle="rst-versions">
+      <span class="rst-current-version" data-toggle="rst-current-version" data-doc="{{DOC}}" data-ref="{{REF}}">
+        <span class="fa fa-book">&nbsp;</span>
+        v: {{REF}}
+        <span class="fa fa-caret-down"></span>
+      </span>
+      <div class="rst-other-versions">
+        <dl>
+          <dt>Versions</dt>
+        </dl>
+
+        <dl>
+          <dt>On GitHub</dt>
+          <dd>
+            <a href="https://github.com/{{USER}}/{{NAME}}/blob/master/docs/{{DOC}}" target="_blank">View</a>
+          </dd>
+          <dd>
+            <a href="https://github.com/{{USER}}/{{NAME}}/edit/master/docs/{{DOC}}" target="_blank">Edit</a>
+          </dd>
+        </dl>
+        <hr>
+
+        Free document hosting provided by <a href="http://progrium.viewdocs.io/viewdocs/">Viewdocs</a>.
+      </div>
+    </div>
+
+    <div class="dev-warning doc-floating-warning" style="display:none">
+      This document is for dokku's development version, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page.
+    </div>
+
     <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/1.3.0/anchor.js"></script>
     <script>
-    document.addEventListener("DOMContentLoaded", function (e) {
+    document.addEventListener('DOMContentLoaded', function (e) {
       var markdownBody = document.querySelectorAll('.markdown-body')[0],
           isRedirect = markdownBody.innerHTML.trim().indexOf('<p>See the <a href=') === 0;
       if (isRedirect) {
@@ -112,18 +180,65 @@
 
       var tables = document.querySelectorAll('table'),
           blockquotes = document.querySelectorAll('blockquote'),
+          versionList = document.querySelectorAll('.rst-other-versions dl')[0],
+          currentVersionEl = document.querySelectorAll('.rst-current-version')[0],
+          currentVersion = currentVersionEl.getAttribute('data-ref'),
+          versionContainer = document.querySelectorAll('.rst-versions.rst-badge')[0],
           classNames = ['table', 'table-striped', 'table-hover', 'table-condensed'],
+          localPath = location.pathname.split('/').splice(2).join("/"),
           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'), ' ');;
+            }
+          };
+
+      var ls2 = {
+        save : function(key, jsonData, expirationMS) {
+          if (typeof (Storage) == "undefined") { return false; }
+          var record = {value: JSON.stringify(jsonData), timestamp: new Date().getTime()/1000 + expirationMS}
+          localStorage.setItem(key, JSON.stringify(record));
+          return jsonData;
+        },
+        load : function(key) {
+          if (typeof (Storage) == "undefined") { return false; }
+          var record = JSON.parse(localStorage.getItem(key));
+          if (!record){return false;}
+          return (new Date().getTime()/1000 < record.timestamp && JSON.parse(record.value));
+        }
+      };
 
       Array.prototype.forEach.call(blockquotes, function (el, i) {
-        if (el.innerHTML.indexOf('New as of') !== -1) {
+        if (el.innerHTML.toLowerCase().indexOf('new as of') !== -1) {
           addClass(el, 'new-as-of');
+        } else if (el.innerHTML.toLowerCase().indexOf('not yet released') !== -1) {
+          addClass(el, 'not-yet-released');
         }
       });
       Array.prototype.forEach.call(classNames, function (className, i) {
@@ -131,6 +246,102 @@
           addClass(el, className);
         });
       });
+
+      addListener(currentVersionEl, 'click', function() {
+        if (hasClass(versionContainer, 'shift-up')) {
+          removeClass(versionContainer, 'shift-up');
+        } else {
+          addClass(versionContainer, 'shift-up');
+        }
+      });
+
+      var range = function(start, count) {
+        return Array.apply(0, Array(count))
+                    .map(function (element, index) {
+                             return index + start;
+                         });
+      }
+
+      var parseVersions = function(version, versions) {
+        var pieces = version.split('.'),
+            prefix = pieces.slice(0, 2).join('.') + '.',
+            maxPatchVersion = parseInt(pieces.slice(2, 3)[0], 10),
+            versionRange = range(0, maxPatchVersion + 1);
+
+        for (var i in versionRange) {
+          versions.push(prefix.concat(versionRange[i]));
+        }
+        return versions;
+      }
+
+      var addVersionLink = function(version) {
+        var a = document.createElement('a'),
+                dd = document.createElement('dd'),
+                ref = 'dokku~v' + version,
+                versionName = 'v' + version;
+        if (version == 'master') {
+          ref = 'dokku';
+          versionName = 'master';
+        }
+
+        a.setAttribute('href', "/" + ref + "/" + localPath);
+        a.appendChild(document.createTextNode(versionName));
+        if (versionName == currentVersion) {
+          var strong = document.createElement('strong');
+          strong.appendChild(a);
+          dd.appendChild(strong);
+        } else {
+          dd.appendChild(a);
+        }
+        versionList.appendChild(dd);
+      };
+
+      var processVersions = function(data) {
+        var versions = [];
+        for (var key in data['max-versions']) {
+          if (!data['max-versions'].hasOwnProperty(key)) {
+            continue;
+          }
+
+          versions = parseVersions(data['max-versions'][key], versions);
+        }
+
+        addVersionLink('master');
+        Array.prototype.forEach.call(versions, function (version, i) {
+          addVersionLink(version);
+        });
+      };
+
+      if (currentVersion === 'master') {
+        document.querySelectorAll('.dev-warning')[0].style.position = 'relative';
+        Array.prototype.forEach.call(document.querySelectorAll('.dev-warning'), function (el, i) {
+          el.style.display = '';
+        });
+      }
+
+      data = ls2.load('max-versions');
+      if (!data) {
+        var request = new XMLHttpRequest();
+        request.open('GET', '/dokku/assets/versions.json', true);
+        request.setRequestHeader("Cache-Control", "no-cache, no-store");
+
+        request.onload = function() {
+          if (request.status >= 200 && request.status < 400) {
+            var data = JSON.parse(request.responseText);
+            // store for 1 day
+            ls2.save('max-versions', data, 86400);
+            processVersions(data);
+          }
+        };
+
+        request.onerror = function() {
+          // There was a connection error of some sort
+        };
+
+        request.send();
+      } else {
+        processVersions(data);
+      }
     });
     </script>
   </body>

docs/troubleshooting.md

@@ -87,7 +87,7 @@ __Solution (Less solution, more helpful troubleshooting steps):__
   root@dokku:~# resolvconf -u
   ```
 
-Please see https://github.com/progrium/dokku/issues/841 and https://github.com/progrium/dokku/issues/649
+Please see https://github.com/dokku/dokku/issues/841 and https://github.com/dokku/dokku/issues/649
 
 ***
 
@@ -105,7 +105,7 @@ You have to point ssh to the correct secret key for your domain name. Add the fo
     Host DOKKU_HOSTNAME
       IdentityFile "~/.ssh/KEYNAME"
 
-Also see [issue #116](https://github.com/progrium/dokku/issues/116)
+Also see [issue #116](https://github.com/dokku/dokku/issues/116)
 
 ***
 
@@ -119,7 +119,7 @@ When specifying your port you may want to use something similar to:
 
     var port = process.env.PORT || 3000
 
-Please see https://github.com/progrium/dokku/issues/282
+Please see https://github.com/dokku/dokku/issues/282
 
 ***
 
@@ -138,14 +138,13 @@ If you see output similar this when deploying:
  !     tar: Error is not recoverable: exiting now
 ```
 
-it might that the curl command that is supposed to fetch the buildpack (anything in the low megabyte file size range) takes too long to finish, due to slowish connection.  To overwrite the default values (connection timeout: 3 seconds, total maximum time for operation: 30 seconds), edit `/home/dokku/ENV` like the following:
+it might that the curl command that is supposed to fetch the buildpack (anything in the low megabyte file size range) takes too long to finish, due to slowish connection.  To overwrite the default values (connection timeout: 3 seconds, total maximum time for operation: 30 seconds), set the following environment variables:
 
-```
-#/home/dokku/ENV
-export CURL_TIMEOUT=600
-export CURL_CONNECT_TIMEOUT=30
+```shell
+dokku config:set --global CURL_TIMEOUT=600
+dokku config:set --global CURL_CONNECT_TIMEOUT=30
 ```
 
 References
-* https://github.com/progrium/dokku/issues/509
+* https://github.com/dokku/dokku/issues/509
 * https://github.com/dokku-alt/dokku-alt/issues/169

docs/upgrading.md

@@ -1,10 +1,16 @@
 # Upgrading
 
-This document covers upgrades for the 0.3.0 series and up. If upgrading from older versions, we recommend [a fresh install](http://progrium.viewdocs.io/dokku/installation) on a new server.
+This document covers upgrades for the 0.3.0 series and up. If upgrading from older versions, we recommend [a fresh install](/dokku/installation) on a new server.
 
 > As of 0.3.18, dokku is installed by default via a debian package. Source-based installations are still available, though not recommended.
 
-## Dokku
+## Migration Guides
+
+Migration guides contain information regarding the new features introduced in each version and the migration path between versions.
+
+- [0.5 Migration Guide](/dokku/appendices/0.5.0-migration-guide/)
+
+## General Information
 
 If dokku was installed via a debian package, you can upgrade dokku via the following command:
 
@@ -37,7 +43,7 @@ All changes will take effect upon next application deployment. To trigger a rebu
 dokku ps:rebuildall
 ```
 
-## Herokuish image
+### Herokuish image
 
 If dokku was installed via a debian package, you can upgrade herokuish via the following command:
 

dokku

@@ -2,7 +2,15 @@
 set -eo pipefail
 shopt -s nullglob
 
+export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
+[[ -f $DOKKU_ROOT/dokkurc ]] && source "$DOKKU_ROOT/dokkurc"
+[[ -d $DOKKU_ROOT/.dokkurc ]] && for f in $DOKKU_ROOT/.dokkurc/*; do source "$f"; done
+[[ $DOKKU_TRACE ]] && set -x
+
 case "$(lsb_release -si)" in
+  Arch)
+    export DOKKU_DISTRO=${DOKKU_DISTRO:="arch"}
+    ;;
   Debian)
     export DOKKU_DISTRO=${DOKKU_DISTRO:="debian"}
     ;;
@@ -12,7 +20,6 @@ case "$(lsb_release -si)" in
 esac
 
 export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
-export DOKKU_ROOT=${DOKKU_ROOT:=~dokku}
 export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
 
 export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}
@@ -29,18 +36,18 @@ export DOKKU_VALID_EXIT=0
 export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
 export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
 
+export DOKKU_CONTAINER_LABEL=dokku
+export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL"
+
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-[[ -f $DOKKU_ROOT/dokkurc ]] && source $DOKKU_ROOT/dokkurc
-[[ -d $DOKKU_ROOT/.dokkurc ]] && for f in $DOKKU_ROOT/.dokkurc/*; do source $f; done
-
-[[ $DOKKU_TRACE ]] && set -x
-
 parse_args "$@"
 args=("$@")
 if [[ "${args[0]}" =~ ^--.* ]]; then
   for arg in "$@"; do
-    if [[ "$arg" =~ ^--.* ]]; then
+    if [[ "$arg" == "--app" ]]; then
+      shift 2
+    elif [[ "$arg" =~ ^--.* ]]; then
       shift 1
     else
       break
@@ -49,207 +56,159 @@ if [[ "${args[0]}" =~ ^--.* ]]; then
 fi
 ! has_tty && DOKKU_QUIET_OUTPUT=1
 
-if [[ $(id -un) != "dokku" && $1 != plugin:*install* && $1 != "plugin:update" ]]; then
-  sudo -u dokku -E -H $0 "$@"
-  exit
+if [[ $(id -un) != "dokku" ]] && [[ ! $1 =~ plugin:* ]]; then
+  export SSH_USER=$(id -un)
+  sudo -u dokku -E -H "$0" "$@"
+  exit $?
+fi
+
+if [[ $(id -un) != "root" && $1 =~ ^plugin:.* ]]; then
+  dokku_log_fail "plugin:* commands must be run as root"
 fi
 
 if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
   export -n SSH_ORIGINAL_COMMAND
   if [[ $1 =~ config-* ]] || [[ $1 =~ docker-options* ]]; then
+    # shellcheck disable=SC2086
     xargs $0 <<<$SSH_ORIGINAL_COMMAND
     exit $?
   else
+    set -f
+    # shellcheck disable=SC2086
     $0 $SSH_ORIGINAL_COMMAND
+    set +f
     exit $?
   fi
 fi
 
-case "$1" in
-  receive)
-    APP="$2"; IMAGE=$(get_app_image_name $APP); IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
-    dokku_log_info1 "Cleaning up..."
-    docker_cleanup
-    dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE..."
-    dokku build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR"
-    release_and_deploy "$APP"
-    ;;
+if ! dokku_auth "$@" ; then
+  dokku_log_fail "Access denied"
+  exit 1
+fi
 
-  deploy)
-    [[ -z $2 ]] && dokku_log_fail "Please specify an app to deploy"
-    APP="$2"; IMAGE_TAG="$3"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-    verify_app_name "$APP"
-    plugn trigger pre-deploy $APP $IMAGE_TAG
+execute_dokku_cmd() {
+  declare desc="executes dokku sub-commands"
+  local PLUGIN_NAME="$1"
+  local PLUGIN_CMD=$PLUGIN_NAME
+  local implemented=0; local script
+  local argv=("$@")
 
-    is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
-    DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
-    oldids=$(get_app_container_ids $APP)
+  case "$PLUGIN_NAME" in
+    events|events:*)
+      local PLUGIN_NAME=${PLUGIN_NAME/events/20_events}
+      ;;
+    nginx|nginx:*)
+      local PLUGIN_NAME=${PLUGIN_NAME/nginx/nginx-vhosts}
+      ;;
+    receive|deploy|build|release)
+      local PLUGIN_NAME="00_dokku-standard"
+      ;;
+    trace|delete|ls|run|cleanup)
+      local PLUGIN_NAME="00_dokku-standard"
+      ;;
+    url|urls|report|version)
+      local PLUGIN_NAME="00_dokku-standard"
+      ;;
+  esac
 
-    DOKKU_APP_SKIP_ALL_CHECKS=$(dokku config:get $APP DOKKU_SKIP_ALL_CHECKS || true)
-    DOKKU_APP_SKIP_DEFAULT_CHECKS=$(dokku config:get $APP DOKKU_SKIP_DEFAULT_CHECKS || true)
-    DOKKU_GLOBAL_SKIP_ALL_CHECKS=$(dokku config:get --global DOKKU_SKIP_ALL_CHECKS || true)
-    DOKKU_GLOBAL_SKIP_DEFAULT_CHECKS=$(dokku config:get --global DOKKU_SKIP_DEFAULT_CHECKS || true)
-
-    DOKKU_SKIP_ALL_CHECKS=${DOKKU_APP_SKIP_ALL_CHECKS:="$DOKKU_GLOBAL_SKIP_ALL_CHECKS"}
-    DOKKU_SKIP_DEFAULT_CHECKS=${DOKKU_APP_SKIP_DEFAULT_CHECKS:="$DOKKU_GLOBAL_SKIP_DEFAULT_CHECKS"}
-
-    DOKKU_DEFAULT_DOCKER_ARGS=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG)
-
-    while read -r line || [[ -n "$line" ]]; do
-      TRIM=${line%#*}
-      PROC_TYPE=${TRIM%%=*}
-      PROC_COUNT=${TRIM#*=}
-      CONTAINER_INDEX=1
-
-      while [[ $CONTAINER_INDEX -le $PROC_COUNT ]]; do
-        id=""; port=""; ipaddr=""
-        DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_TYPE.$CONTAINER_INDEX"
-        DOKKU_IP_FILE="$DOKKU_ROOT/$APP/IP.$PROC_TYPE.$CONTAINER_INDEX"
-        DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_TYPE.$CONTAINER_INDEX"
-
-        # start the app
-        DOCKER_ARGS="$DOKKU_DEFAULT_DOCKER_ARGS"
-        DOCKER_ARGS+=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
-        [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
-        BIND_EXTERNAL=$(plugn trigger bind-external-ip $APP)
-
-        [[ -n "$DOKKU_HEROKUISH" ]] && START_CMD="/start $PROC_TYPE"
-
-        if [[ -z "$DOKKU_HEROKUISH" ]]; then
-          DOKKU_DOCKERFILE_PORT=$(dokku config:get $APP DOKKU_DOCKERFILE_PORT || true)
-          START_CMD=$(dokku config:get $APP DOKKU_DOCKERFILE_START_CMD || $START_CMD)
-        fi
-
-        if [[ "$PROC_TYPE" == "web" ]]; then
-          port=${DOKKU_DOCKERFILE_PORT:=5000}
-          if [[ "$BIND_EXTERNAL" = "true" ]]; then
-            id=$(docker run -d -p $port -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
-            port=$(docker port $id $port | sed 's/[0-9.]*://')
-            ipaddr=127.0.0.1
-          else
-            id=$(docker run -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
-            ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $id)
-          fi
-        else
-          id=$(docker run -d $DOCKER_ARGS $IMAGE $START_CMD)
-        fi
-
-        # if we can't post-deploy successfully, kill new container
-        kill_new() {
-          docker inspect $id &> /dev/null && docker stop $id > /dev/null && docker kill $id > /dev/null
-          trap - INT TERM EXIT
-          kill -9 $$
-        }
-
-        # run checks first, then post-deploy hooks, which switches Nginx traffic
-        if [[ "$DOKKU_SKIP_ALL_CHECKS" = "true" ]]; then
-          dokku_log_info1 "Skipping pre-flight checks"
-        else
-          trap kill_new INT TERM EXIT
-          dokku_log_info1 "Running pre-flight checks"
-          plugn trigger check-deploy  $APP $id $PROC_TYPE $port $ipaddr
-          trap -        INT TERM EXIT
-        fi
-
-        # now using the new container
-        [[ -n "$id" ]] && echo $id > "$DOKKU_CONTAINER_ID_FILE"
-        [[ -n "$ipaddr" ]] && echo $ipaddr > "$DOKKU_IP_FILE"
-        [[ -n "$port" ]] && echo $port > "$DOKKU_PORT_FILE"
-        [[ -n "$port" ]] && echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$port" > "$DOKKU_ROOT/$APP/URL"
-
-        # cleanup pre-migration files
-        rm -f $DOKKU_ROOT/$APP/CONTAINER $DOKKU_ROOT/$APP/IP $DOKKU_ROOT/$APP/PORT
-
-        CONTAINER_INDEX=$(( CONTAINER_INDEX + 1 ))
-      done
-      # cleanup when we scale down
-      if [[ "$PROC_COUNT" == 0 ]]; then
-        CONTAINER_IDX_OFFSET=0
+  if [[ "$(readlink -f "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}")" == *core-plugins* ]] ; then
+    [[ ${argv[0]} == "$PLUGIN_CMD" ]] && shift 1
+    if [[ ! -z $DOKKU_APP_NAME ]]; then
+      if [[ "$PLUGIN_CMD" == config* ]] && [[ ${argv[1]} == "--no-restart" ]]; then
+        shift 1
+        set -- "--no-restart" "$DOKKU_APP_NAME" "$@"
       else
-        CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1))
+        set -- "$DOKKU_APP_NAME" "$@"
       fi
-      for container_state_filetype in CONTAINER IP PORT; do
-        cd $DOKKU_ROOT/$APP
-        find . -maxdepth 1 -name "$container_state_filetype.$PROC_TYPE.*" -printf "%f\n" | sort -t . -k 3 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
-      done
-    done < "$DOKKU_SCALE_FILE"
-
-    dokku_log_info1 "Running post-deploy"
-    plugn trigger post-deploy $APP $port $ipaddr
-
-    # kill the old container
-    if [[ -n "$oldids" ]]; then
-
-      if [[ -z "$DOKKU_WAIT_TO_RETIRE" ]]; then
-        DOKKU_APP_DOKKU_WAIT_TO_RETIRE=$(dokku config:get $APP DOKKU_WAIT_TO_RETIRE || true)
-        DOKKU_GLOBAL_DOKKU_WAIT_TO_RETIRE=$(dokku config:get --global DOKKU_WAIT_TO_RETIRE || true)
-        DOKKU_WAIT_TO_RETIRE=${DOKKU_APP_DOKKU_WAIT_TO_RETIRE:="$DOKKU_GLOBAL_DOKKU_WAIT_TO_RETIRE"}
-      fi
-
-      # Let the old container finish processing requests, before terminating it
-      WAIT="${DOKKU_WAIT_TO_RETIRE:-60}"
-      dokku_log_info1 "Shutting down old containers in $WAIT seconds"
-      for oldid in $oldids; do
-        dokku_log_info2 "$oldid"
-      done
-      (
-        exec >/dev/null 2>/dev/null </dev/null
-        trap '' INT HUP
-        sleep $WAIT
-        for oldid in $oldids; do
-          # Attempt to stop, if that fails, then force a kill as docker seems
-          # to not send SIGKILL as the docs would indicate. If that fails, move
-          # on to the next.
-          docker stop $oldid \
-          || docker kill $oldid \
-          || plugn trigger retire-container-failed $APP # plugin trigger for event logging
-        done
-      ) & disown -a
-      # Use trap since disown/nohup don't seem to keep child alive
-      # Give child process just enough time to set the traps
-      sleep 0.1
     fi
-    ;;
+    set -- "$PLUGIN_CMD" "$@"
+  fi
 
-  cleanup)
-    docker_cleanup
-    ;;
+  if [[ -x $PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/default ]]; then
+    "$PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/default" "$@"
+    implemented=1
+  elif [[ -x $PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD ]]; then
+    "$PLUGIN_ENABLED_PATH/$PLUGIN_NAME/subcommands/$PLUGIN_CMD" "$@"
+    implemented=1
+  elif [[ -x $PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:} ]]; then
+    "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}/subcommands/${1#*:}" "$@"
+    implemented=1
+  fi
 
-  # DEPRECATED as of v0.3.14
-  deploy:all)
-      echo "*DEPRECATED* in v0.3.14: deploy:all will be removed in future versions"
-      dokku ps:restartall
-    ;;
-
-  help|'')
-    echo "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND <app> [command-specific-options]"
-    echo ""
-    echo "Options:"
-
-    cat<<EOF | plugn trigger commands help | sort | column -c2 -t -s,
-    help, Print the list of commands
-EOF
-    ;;
-
-  *)
-    implemented=0
+  if [[ $implemented -eq 0 ]];then
     for script in $PLUGIN_ENABLED_PATH/*/commands; do
       set +e; $script "$@" ; exit_code=$? ; set -e
       if [[ "$exit_code" -eq "$DOKKU_NOT_IMPLEMENTED_EXIT" ]]; then
         continue
       fi
-
       implemented=1
       if [[ "$exit_code" -ne "$DOKKU_VALID_EXIT" ]]; then
         exit $exit_code
       fi
     done
+  fi
 
-    if [[ "$implemented" -eq 0 ]]; then
-      dokku_log_warn "\`$*\` is not a dokku command."
-      dokku_log_warn "See \`dokku help\` for a list of available commands."
-      exit 1
+  if [[ "$implemented" -eq 0 ]]; then
+    dokku_log_warn "\`$*\` is not a dokku command."
+    dokku_log_warn "See \`dokku help\` for a list of available commands."
+    exit 1
+  fi
+}
+
+case "$1" in
+  help|'')
+    export LC_ALL=C # so sort will respect non alpha characters
+    ALL_PLUGIN_COMMANDS=$(find -L "$PLUGIN_PATH/enabled" -name commands 2> /dev/null || true)
+
+    # build list of core plugin command files
+    for plugin_command in $ALL_PLUGIN_COMMANDS;do
+      if [[ "$(readlink -f "$plugin_command")" == *core-plugins* ]]; then
+        CORE_PLUGIN_COMMANDS+="$plugin_command "
+      fi
+    done
+    # build list of non-core plugin command files
+    for plugin_command in $ALL_PLUGIN_COMMANDS;do
+      if [[ "$(readlink -f "$plugin_command")" != *core-plugins* ]]; then
+        COMMUNITY_PLUGIN_COMMANDS+="$plugin_command "
+      fi
+    done
+
+    # New lines are blank echos for readability
+    echo "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND <app> [command-specific-options]"
+    echo ""
+    echo "Primary help options, type \"dokku COMMAND:help\" for more details, or dokku help --all to see all commands."
+    echo ""
+    echo "Commands:"
+    echo ""
+
+    if [[ "$2" == "--all" ]] ; then
+      for core_plugin_command in $CORE_PLUGIN_COMMANDS; do
+        $core_plugin_command help
+      done | sort | column -c2 -t -s,
+      echo ""
+      echo "Community plugin commands:"
+      echo ""
+      for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
+        $community_plugin_command help
+      done | sort | column -c2 -t -s,
+    else
+      for core_plugin_command in $CORE_PLUGIN_COMMANDS; do
+        $core_plugin_command help
+      # When done, sort, sed cuts arugments out of strings and colum make it pretty
+      done | sort | sed -e '/^.*:/d' -e 's/\s[\[\<\-\(].*,/,/' | column -c2 -t -s,
+      if [[ -n "$COMMUNITY_PLUGIN_COMMANDS" ]]; then
+        echo ""
+        echo "Community plugin commands:"
+        echo ""
+        for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do
+          $community_plugin_command help
+        done | sort | column -c2 -t -s,
+      fi
     fi
     ;;
 
+  *)
+    execute_dokku_cmd "$@"
+    ;;
+
 esac

plugins/00_dokku-standard/backup-check

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-VERSION="$1"
-IMPORT_DIR="$2"
-TARGET_DIR="$3"
-APPS="$(< $4 )"
-
-ret=0
-
-for app in $APPS; do
-  if [[ -d $TARGET_DIR/$app ]]; then
-    ret=1
-    echo "Trying to import application $app which already exists." 2>&1
-  fi
-done
-
-exit $ret

plugins/00_dokku-standard/backup-export

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-VERSION="$1"
-BASE_DIR="$2"
-
-cat;
-[[ -f $BASE_DIR/.sshcommand ]] && echo "$BASE_DIR/.sshcommand"
-[[ -f $BASE_DIR/.ssh/authorized_keys ]] && echo "$BASE_DIR/.ssh/authorized_keys"
-[[ -f $BASE_DIR/HOSTNAME ]] && echo "$BASE_DIR/HOSTNAME"
-[[ -f $BASE_DIR/VHOST ]] && echo "$BASE_DIR/VHOST"

plugins/00_dokku-standard/backup-import

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-VERSION="$1"
-IMPORT_DIR="$2"
-TARGET_DIR="$3"
-
-[[ -f $IMPORT_DIR/.sshcommand ]] && mv $IMPORT_DIR/.sshcommand $TARGET_DIR/.sshcommand
-if [[ -f $IMPORT_DIR/.ssh/authorized_keys ]]; then
-  mkdir -p $TARGET_DIR/.ssh
-  cat $IMPORT_DIR/.ssh/authorized_keys $TARGET_DIR/.ssh/authorized_keys | uniq > tmpfile && mv tmpfile $TARGET_DIR/.ssh/authorized_keys
-  chmod 0700 $TARGET_DIR/.ssh
-  chmod 0600 $TARGET_DIR/.ssh/*
-fi
-[[ -f $IMPORT_DIR/HOSTNAME ]] && mv $IMPORT_DIR/HOSTNAME $TARGET_DIR/HOSTNAME
-[[ -f $IMPORT_DIR/VHOST ]] && mv $IMPORT_DIR/VHOST $TARGET_DIR/VHOST

plugins/00_dokku-standard/commands

@@ -1,207 +1,32 @@
 #!/usr/bin/env bash
-[[ " build release trace delete ls run url urls version help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
+[[ " help help:help ls:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
-source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
 
 case "$1" in
-  build)
-    APP="$2"; IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"; IMAGE=$(get_app_image_name $APP)
-    verify_app_name "$APP"
-
-    CACHE_DIR="$DOKKU_ROOT/$APP/cache"
-
-    eval "$(config_export app $APP)"
-    pushd "$TMP_WORK_DIR" &> /dev/null
-
-    case "$IMAGE_SOURCE_TYPE" in
-      herokuish)
-        id=$(tar -c . | docker run -i -a stdin $DOKKU_IMAGE /bin/bash -c "mkdir -p /app && tar -xC /app")
-        test "$(docker wait $id)" -eq 0
-        docker commit $id $IMAGE > /dev/null
-        [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR
-        plugn trigger pre-build-buildpack "$APP"
-
-        DOCKER_ARGS=$(: | plugn trigger docker-args-build $APP)
-        [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
-        id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
-        docker attach $id
-        test "$(docker wait $id)" -eq 0
-        docker commit $id $IMAGE > /dev/null
-
-        plugn trigger post-build-buildpack "$APP"
-        ;;
-
-      dockerfile)
-        # extract first port from Dockerfile
-        DOCKERFILE_PORT=$(get_dockerfile_exposed_port Dockerfile)
-        [[ -n "$DOCKERFILE_PORT" ]] && config_set --no-restart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT
-        plugn trigger pre-build-dockerfile "$APP"
-
-        [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
-        DOCKER_ARGS=$(: | plugn trigger docker-args-build $APP)
-        docker build $DOCKER_ARGS $DOKKU_DOCKER_BUILD_OPTS -t "$IMAGE" .
-
-        plugn trigger post-build-dockerfile "$APP"
-        ;;
-
-      *)
-        dokku_log_fail "Building image source type $IMAGE_SOURCE_TYPE not supported!"
-        ;;
-    esac
-    ;;
-
-  release)
-    APP="$2"; IMAGE_SOURCE_TYPE="$3"; IMAGE_TAG="$4"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
-    verify_app_name "$APP"
-
-    case "$IMAGE_SOURCE_TYPE" in
-      herokuish)
-        plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
-        if [[ -n $(config_export global) ]]; then
-          id=$(config_export global | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
-          test "$(docker wait $id)" -eq 0
-          docker commit $id $IMAGE > /dev/null
-        fi
-        if [[ -n $(config_export app $APP) ]]; then
-          id=$(config_export app $APP | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
-          test "$(docker wait $id)" -eq 0
-          docker commit $id $IMAGE > /dev/null
-        fi
-        plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG"
-        ;;
-
-      dockerfile)
-        # buildstep plugins don't necessarily make sense for dockerfiles. call the new breed!!!
-        plugn trigger pre-release-dockerfile "$APP" "$IMAGE_TAG"
-        plugn trigger post-release-dockerfile "$APP" "$IMAGE_TAG"
-        ;;
-
-      *)
-        dokku_log_fail "Releasing image source type $IMAGE_SOURCE_TYPE not supported!"
-        ;;
-    esac
-    ;;
-
-  trace)
-    [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p $DOKKU_ROOT/.dokkurc
-    [[ "$2" == "on" ]] || [[ "$2" == "off" ]] || {
-      dokku_log_fail "Valid trace options are [on/off]"
-    }
-
-    if [[ "$2" == "on" ]]; then
-      echo "Enabling dokku trace"
-      echo "export DOKKU_TRACE=1" > $DOKKU_ROOT/.dokkurc/DOKKU_TRACE
-    fi
-
-    if [[ "$2" == "off" ]]; then
-      echo "Disabling dokku trace"
-      rm -f $DOKKU_ROOT/.dokkurc/DOKKU_TRACE
-    fi
-    ;;
-
-  delete)
-    dokku apps:destroy $2
-    ;;
-
-  ls)
-    dokku_apps=$(ls -d $DOKKU_ROOT/*/ 2>/dev/null) || (dokku_log_fail "You haven't deployed any applications yet")
-
-    dokku_col_log_info1_quiet "App Name" "Container Type" "Container Id" "Status"
-
-    for dokku_app in $dokku_apps; do
-      APP=$(basename $dokku_app)
-      DOKKU_APP_CIDS=$(get_app_container_ids $APP)
-      DOCKER_RUNNING_CONTAINERS=$(docker ps -q --no-trunc)
-      if [[ -n $DOKKU_APP_CIDS ]]; then
-        for DOKKU_APP_CID in $DOKKU_APP_CIDS; do
-          DOKKU_APP_CONTAINER_STATUS="stopped"
-          [[ $DOCKER_RUNNING_CONTAINERS =~ $DOKKU_APP_CID ]] && DOKKU_APP_CONTAINER_STATUS="running"
-          DOKKU_APP_CONTAINER_TYPE=$(grep -l $DOKKU_APP_CID $DOKKU_ROOT/$APP/CONTAINER.* | awk -F '/' '{ print $5 }' | awk -F '.' '{ print $2 }')
-          dokku_col_log_msg "$APP" "$DOKKU_APP_CONTAINER_TYPE" "${DOKKU_APP_CID:0:12}" "$DOKKU_APP_CONTAINER_STATUS"
-        done
-      else
-        dokku_col_log_msg "$APP" "NOT_DEPLOYED" "NOT_DEPLOYED" "NOT_DEPLOYED"
-      fi
-    done
-    ;;
-
-  run)
-    [[ -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"
-
-    shift 2
-
-    DOCKER_ARGS=$(: | plugn trigger docker-args-run $APP $IMAGE_TAG)
-    [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
-    [[ $DOKKU_RM_CONTAINER ]] && DOKKU_RUN_OPTS="--rm"
-    has_tty && DOKKU_RUN_OPTS+=" -i -t"
-    is_image_herokuish_based "$IMAGE" && EXEC_CMD="/exec"
-
-    docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
-    ;;
-
-  url | urls)
-    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-    APP="$2"; verify_app_name "$2"
-    eval "$(config_export app $APP)"
-
-    if [[ -s "$DOKKU_ROOT/$APP/URLS" ]]; then
-      case "$1" in
-        url)
-          grep "^http" "$DOKKU_ROOT/$APP/URLS" | head -1
-        ;;
-        urls)
-          grep "^http" "$DOKKU_ROOT/$APP/URLS"
-        ;;
-      esac
-
-      exit 0
-    fi
-
-    SCHEME="http"; SSL="$DOKKU_ROOT/$APP/tls"; WILDCARD_SSL="$DOKKU_ROOT/tls"
-    if [[ -e "$SSL/server.crt" && -e "$SSL/server.key" ]] || [[ -e "$WILDCARD_SSL/server.crt" && -e "$WILDCARD_SSL/server.key" ]]; then
-      SCHEME="https"
-    fi
-
-    if [[ "$(is_app_vhost_enabled $APP)" == "false" ]]; then
-      for PORT_FILE in $DOKKU_ROOT/$APP/PORT.*; do
-        echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$(< "$PORT_FILE") (container)"
-      done
-
-      DOKKU_NGINX_PORT=$(config_get $APP DOKKU_NGINX_PORT || true)
-      DOKKU_NGINX_SSL_PORT=$(config_get $APP DOKKU_NGINX_SSL_PORT || true)
-
-      if [[ -n "$DOKKU_NGINX_PORT" ]]; then
-        echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$DOKKU_NGINX_PORT (nginx)"
-      fi
-      if [[ -n "$DOKKU_NGINX_SSL_PORT" ]]; then
-        echo "https://$(< "$DOKKU_ROOT/HOSTNAME"):$DOKKU_NGINX_SSL_PORT (nginx-ssl)"
-      fi
-    else
-      echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")"
-    fi
-  ;;
-
-  version)
-    cat "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
-    ;;
-
-  help)
-    cat<<EOF
-    ls, Pretty listing of deployed applications and containers
+  help|ls:help|run:help|trace:help|url:help|urls:help|version:help)
+    [[ $(echo "$1" | sed '/.*:help/!d') ]] && help_topic="${1%\:help}"
+    help_content_func () {
+      declare desc="return standard plugin help content"
+      cat<<help_content
+    ls , Pretty listing of deployed applications and containers
     run <app> <cmd>, Run a command in the environment of an application
     trace [on/off], Enable dokku tracing
     url <app>, Show the first URL for an application (compatibility)
     urls <app>, Show all URLs for an application
-    version, Print dokku's version
-EOF
+    version , Print dokku's version
+    help , Print the list of commands
+help_content
+    }
+
+    if [[ $help_topic ]] ; then
+        help_content_func | sed "/^\s*$help_topic\s/!d" | sort | sed '/^.*:/d' | column -c2 -t -s,
+    else
+        help_content_func
+    fi
     ;;
 
   *)
-    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
     ;;
 
 esac

plugins/00_dokku-standard/exec-app-json-scripts

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+get_phase_script() {
+  declare desc="extracts app.json from app image and returns the appropriate json key/value"
+  local IMAGE="$1"; local PHASE_SCRIPT_KEY="$2"
+  local TMP_WORK_DIR=$(mktemp -d -t "dokku_get_phase_script.XXXX")
+  local APP_JSON_FILE="$TMP_WORK_DIR/app.json"
+  trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM
+
+  copy_from_image "$IMAGE" "/app/app.json" "$TMP_WORK_DIR" 2>/dev/null || true
+
+  if [[ -f "$APP_JSON_FILE" ]];then
+    local VALUE=$(get_json_value "scripts.dokku.${PHASE_SCRIPT_KEY}" < "$APP_JSON_FILE")
+  else
+    return 0
+  fi
+
+  echo "$VALUE"
+}
+
+execute_script() {
+  declare desc="executes appropriate phase script key from app.json"
+  local APP="$1"; local IMAGE="$2"; local PHASE_SCRIPT_KEY="$3"
+  local SCRIPT_CMD=$(get_phase_script "$IMAGE" "$PHASE_SCRIPT_KEY" 2>/dev/null)
+  if [[ -n "$SCRIPT_CMD" ]];then
+    dokku_log_info1 "Running '$SCRIPT_CMD' in app container"
+    local COMMAND="export HOME=/app ; "
+    local COMMAND+=" cd \$HOME ; "
+    local COMMAND+=" for file in /app/.profile.d/*; do source \$file; done ; "
+    local COMMAND+=" echo restoring installation cache... ; "
+    local COMMAND+=" rm -rf /tmp/cache || true ; "
+    local COMMAND+=" ln -sf /cache /tmp/cache || true ; "
+    local COMMAND+=" $SCRIPT_CMD ; RC=\$? ;"
+    local COMMAND+=" echo removing installation cache... ; "
+    local COMMAND+=" rm -f /tmp/cache || true ; "
+    local COMMAND+=" exit \$RC "
+    local DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP")
+    local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+    # shellcheck disable=SC2086
+    local id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_DIR:/cache" $DOCKER_ARGS "$IMAGE" /bin/bash -c "$COMMAND")
+    test "$(docker wait "$id")" -eq 0 || (dokku_container_log_verbose_quiet "$id"; exit 1)
+    dokku_container_log_verbose_quiet "$id"
+    if [[ "$PHASE_SCRIPT_KEY" != "postdeploy" ]];then
+      docker commit "$id" "$IMAGE" > /dev/null
+    fi
+  fi
+}
+
+exec_app_json_scripts() {
+  declare desc="core app.json scripts execution"
+  local trigger="$0 app_json_scripts"
+  local APP="$1"
+
+  case "$0" in
+    *pre-deploy)
+      local IMAGE_TAG="$2"
+      local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
+      local PHASE_SCRIPT_KEY="predeploy"
+      ;;
+    *post-deploy)
+      local IMAGE_TAG="$4"
+      local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
+      local PHASE_SCRIPT_KEY="postdeploy"
+      ;;
+  esac
+
+  dokku_log_info1 "Attempting to run scripts.dokku.$PHASE_SCRIPT_KEY from app.json (if defined)"
+  execute_script "$APP" "$IMAGE" "$PHASE_SCRIPT_KEY"
+}
+
+exec_app_json_scripts "$@"

plugins/00_dokku-standard/install

@@ -2,31 +2,32 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 if [[ ! -f  "$DOKKU_ROOT/HOSTNAME" ]]; then
-  hostname -f > $DOKKU_ROOT/HOSTNAME
+  hostname -f > "$DOKKU_ROOT/HOSTNAME"
 fi
 
 if [[ ! -f  "$DOKKU_ROOT/VHOST" ]]; then
   [[ $(dig +short "$(< "$DOKKU_ROOT/HOSTNAME")") ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST"
 fi
 
-# temporary hack for https://github.com/progrium/dokku/issues/82
+dokku_path=$(which dokku)
+
+# temporary hack for https://github.com/dokku/dokku/issues/82
 # redeploys all apps after a reboot
-case "$DOKKU_DISTRO" in
-  ubuntu)
-    cat<<EOF > /etc/init/dokku-redeploy.conf
+if [[ $(/sbin/init --version 2> /dev/null) =~ upstart ]]; then
+  cat<<EOF > /etc/init/dokku-redeploy.conf
 description "Dokku app redeploy service"
 
 start on filesystem and started docker
 
 script
   sleep 2 # give docker some time
-  sudo -i -u dokku /usr/local/bin/dokku ps:restartall
+  sudo -i -u dokku $dokku_path ps:restore
 end script
 EOF
-    ;;
+fi
 
-  debian|opensuse)
-    cat<<EOF > /etc/systemd/system/dokku-redeploy.service
+if [[ $(systemctl 2> /dev/null) =~ -\.mount ]]; then
+  cat<<EOF > /etc/systemd/system/dokku-redeploy.service
 [Unit]
 Description=Dokku app redeploy service
 After=docker.target
@@ -34,13 +35,15 @@ After=docker.target
 [Service]
 Type=simple
 User=dokku
-ExecStart=/usr/local/bin/dokku ps:restartall
+ExecStart=$dokku_path ps:restore
 
 [Install]
 WantedBy=multi-user.target
 EOF
-    ;;
-esac
+  if command -v systemctl &>/dev/null; then
+    systemctl enable dokku-redeploy
+  fi
+fi
 
 mkdir -p /etc/update-motd.d
 cat<<EOF > /etc/update-motd.d/99-dokku
@@ -56,3 +59,9 @@ if [ ! -f "/home/dokku/HOSTNAME" ]; then
 fi
 EOF
 chmod +x /etc/update-motd.d/99-dokku
+
+chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
+
+if [[ -f  "$DOKKU_ROOT/VHOST" ]]; then
+  chown dokku:dokku "$DOKKU_ROOT/VHOST"
+fi

plugins/00_dokku-standard/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.4.0"
+version = "0.5.2"
 [plugin.config]

plugins/00_dokku-standard/post-deploy

@@ -0,0 +1 @@
+exec-app-json-scripts

plugins/00_dokku-standard/pre-deploy

@@ -0,0 +1 @@
+exec-app-json-scripts

plugins/00_dokku-standard/subcommands/build

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+
+dokku_build_cmd() {
+  declare desc="build phase"
+  local cmd="build"
+  local APP="$2"; local IMAGE_SOURCE_TYPE="$3"; local TMP_WORK_DIR="$4"; local IMAGE=$(get_app_image_name "$APP")
+  verify_app_name "$APP"
+
+  local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+
+  eval "$(config_export app "$APP")"
+  pushd "$TMP_WORK_DIR" &> /dev/null
+
+  case "$IMAGE_SOURCE_TYPE" in
+    herokuish)
+      local id=$(tar -c . | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$DOKKU_IMAGE" /bin/bash -c "mkdir -p /app && tar -xC /app")
+      test "$(docker wait "$id")" -eq 0
+      docker commit "$id" "$IMAGE" > /dev/null
+      [[ -d $CACHE_DIR ]] || mkdir "$CACHE_DIR"
+      plugn trigger pre-build-buildpack "$APP"
+
+      local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
+      [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
+      # shellcheck disable=SC2086
+      local id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
+      docker attach "$id"
+      test "$(docker wait "$id")" -eq 0
+      docker commit "$id" "$IMAGE" > /dev/null
+
+      plugn trigger post-build-buildpack "$APP"
+      ;;
+
+    dockerfile)
+      # extract first port from Dockerfile
+      local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
+      [[ -n "$DOCKERFILE_PORTS" ]] && config_set --no-restart "$APP" DOKKU_DOCKERFILE_PORTS="$DOCKERFILE_PORTS"
+      plugn trigger pre-build-dockerfile "$APP"
+
+      [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
+      local DOCKER_ARGS=$(: | plugn trigger docker-args-build "$APP" "$IMAGE_SOURCE_TYPE")
+      # shellcheck disable=SC2086
+      docker build $DOCKER_ARGS $DOKKU_DOCKER_BUILD_OPTS -t $IMAGE .
+
+      plugn trigger post-build-dockerfile "$APP"
+      ;;
+
+    *)
+      dokku_log_fail "Building image source type $IMAGE_SOURCE_TYPE not supported!"
+      ;;
+  esac
+}
+
+dokku_build_cmd "$@"

plugins/00_dokku-standard/subcommands/cleanup

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+dokku_cleanup_cmd(){
+  declare desc="cleans up old deployment cruft"
+  local cmd="cleanup"
+
+  docker_cleanup
+}
+
+
+dokku_cleanup_cmd "$@"

plugins/00_dokku-standard/subcommands/deploy

@@ -0,0 +1,166 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/checks/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/proxy/functions"
+
+dokku_deploy_cmd() {
+  declare desc="deploy phase"
+  local cmd="deploy"
+  [[ -z $2 ]] && dokku_log_fail "Please specify an app to deploy"
+  local APP="$2"; local IMAGE_TAG="$3"; local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
+  verify_app_name "$APP"
+  plugn trigger pre-deploy "$APP" "$IMAGE_TAG"
+
+  is_image_herokuish_based "$IMAGE" && local DOKKU_HEROKUISH=true
+  local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
+  local oldids=$(get_app_container_ids "$APP")
+
+  local DOKKU_DEFAULT_DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
+  local DOKKU_IS_APP_PROXY_ENABLED="$(is_app_proxy_enabled "$APP")"
+
+  local line
+  while read -r line || [[ -n "$line" ]]; do
+    [[ "$line" =~ ^#.* ]] && continue
+    local TRIM=${line%#*}
+    local PROC_TYPE=${TRIM%%=*}
+    local PROC_COUNT=${TRIM#*=}
+    local CONTAINER_INDEX=1
+
+    while [[ $CONTAINER_INDEX -le $PROC_COUNT ]]; do
+      local id=""; local port=""; local ipaddr=""
+      local DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_TYPE.$CONTAINER_INDEX"
+      local DOKKU_IP_FILE="$DOKKU_ROOT/$APP/IP.$PROC_TYPE.$CONTAINER_INDEX"
+      local DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_TYPE.$CONTAINER_INDEX"
+
+      # start the app
+      local DOCKER_ARGS="$DOKKU_DEFAULT_DOCKER_ARGS"
+      local DOCKER_ARGS+=" -e DYNO='$PROC_TYPE.$CONTAINER_INDEX' "
+      [[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
+
+      [[ -n "$DOKKU_HEROKUISH" ]] && local START_CMD="/start $PROC_TYPE"
+
+      if [[ -z "$DOKKU_HEROKUISH" ]]; then
+        local DOKKU_DOCKERFILE_PORTS=($(config_get "$APP" DOKKU_DOCKERFILE_PORTS || true))
+        local DOKKU_DOCKERFILE_PORT=$(config_get "$APP" DOKKU_DOCKERFILE_PORT || true)
+        local DOKKU_DOCKERFILE_START_CMD=$(config_get "$APP" DOKKU_DOCKERFILE_START_CMD || true)
+        local DOKKU_PROCFILE_START_CMD=$(get_cmd_from_procfile "$APP" "$PROC_TYPE")
+        local START_CMD=${DOKKU_DOCKERFILE_START_CMD:-$DOKKU_PROCFILE_START_CMD}
+      fi
+
+      if [[ "$PROC_TYPE" == "web" ]]; then
+        if [[ -z "${DOKKU_DOCKERFILE_PORTS[*]}" ]]; then
+          local port=5000
+          local DOKKU_DOCKER_PORT_ARGS+="-p $port"
+        else
+          local p
+          for p in ${DOKKU_DOCKERFILE_PORTS[*]};do
+            if [[ ! "$p" =~ .*udp.* ]]; then
+              # set port to first non-udp port
+              local p=${p//\/tcp}
+              local port=${port:="$p"}
+            fi
+            local DOKKU_DOCKER_PORT_ARGS+=" -p $p "
+          done
+        fi
+        if [[ "$DOKKU_IS_APP_PROXY_ENABLED" == "true" ]]; then
+          # shellcheck disable=SC2086
+          local id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
+          local ipaddr=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$id")
+          # Docker < 1.9 compatibility
+          if [[ -z $ipaddr ]]; then
+            local ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' "$id")
+          fi
+        else
+          # shellcheck disable=SC2086
+          local id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOKKU_DOCKER_PORT_ARGS -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
+          local port=$(docker port "$id" "$port" | sed 's/[0-9.]*://')
+          local ipaddr=127.0.0.1
+        fi
+      else
+        # shellcheck disable=SC2086
+        local id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOCKER_ARGS $IMAGE $START_CMD)
+      fi
+
+      # if we can't post-deploy successfully, kill new container
+      kill_new() {
+        declare desc="wrapper function to kill newly started app container"
+        local id="$1"
+        docker inspect "$id" &> /dev/null && docker stop "$id" > /dev/null && docker kill "$id" &> /dev/null
+        trap - INT TERM EXIT
+        kill -9 $$
+      }
+
+      # run checks first, then post-deploy hooks, which switches Nginx traffic
+      if [[ "$(is_app_checks_enabled "$APP")" == "false" ]]; then
+        dokku_log_info1 "zero downtime is disabled for app ($APP). skipping pre-flight checks"
+      else
+        trap 'kill_new $id' INT TERM EXIT
+        dokku_log_info1 "Running pre-flight checks"
+        plugn trigger check-deploy  "$APP" "$id" "$PROC_TYPE" "$port" "$ipaddr"
+        trap -        INT TERM EXIT
+      fi
+
+      # now using the new container
+      [[ -n "$id" ]] && echo "$id" > "$DOKKU_CONTAINER_ID_FILE"
+      [[ -n "$ipaddr" ]] && echo "$ipaddr" > "$DOKKU_IP_FILE"
+      [[ -n "$port" ]] && echo "$port" > "$DOKKU_PORT_FILE"
+
+      # cleanup pre-migration files
+      rm -f "$DOKKU_ROOT/$APP/CONTAINER" "$DOKKU_ROOT/$APP/IP" "$DOKKU_ROOT/$APP/PORT"
+
+      local CONTAINER_INDEX=$(( CONTAINER_INDEX + 1 ))
+    done
+    # cleanup when we scale down
+    if [[ "$PROC_COUNT" == 0 ]]; then
+      local CONTAINER_IDX_OFFSET=0
+    else
+      local CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1))
+    fi
+    local container_state_filetype
+    for container_state_filetype in CONTAINER IP PORT; do
+      cd "$DOKKU_ROOT/$APP"
+      find . -maxdepth 1 -name "$container_state_filetype.$PROC_TYPE.*" -printf "%f\n" | sort -t . -k 3 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
+    done
+  done < "$DOKKU_SCALE_FILE"
+
+  dokku_log_info1 "Running post-deploy"
+  plugn trigger post-deploy "$APP" "$port" "$ipaddr" "$IMAGE_TAG"
+
+  # kill the old container
+  if [[ -n "$oldids" ]]; then
+
+    if [[ -z "$DOKKU_WAIT_TO_RETIRE" ]]; then
+      local DOKKU_APP_DOKKU_WAIT_TO_RETIRE=$(config_get "$APP" DOKKU_WAIT_TO_RETIRE || true)
+      local DOKKU_GLOBAL_DOKKU_WAIT_TO_RETIRE=$(config_get --global DOKKU_WAIT_TO_RETIRE || true)
+      local DOKKU_WAIT_TO_RETIRE=${DOKKU_APP_DOKKU_WAIT_TO_RETIRE:="$DOKKU_GLOBAL_DOKKU_WAIT_TO_RETIRE"}
+    fi
+
+    # Let the old container finish processing requests, before terminating it
+    local WAIT="${DOKKU_WAIT_TO_RETIRE:-60}"
+    dokku_log_info1 "Shutting down old containers in $WAIT seconds"
+    local oldid
+    for oldid in $oldids; do
+      dokku_log_info2 "$oldid"
+    done
+    (
+      exec >/dev/null 2>/dev/null </dev/null
+      trap '' INT HUP
+      sleep "$WAIT"
+      for oldid in $oldids; do
+        # Attempt to stop, if that fails, then force a kill as docker seems
+        # to not send SIGKILL as the docs would indicate. If that fails, move
+        # on to the next.
+        docker stop "$oldid" \
+        || docker kill "$oldid" \
+        || plugn trigger retire-container-failed "$APP" # plugin trigger for event logging
+      done
+    ) & disown -a
+    # Use trap since disown/nohup don't seem to keep child alive
+    # Give child process just enough time to set the traps
+    sleep 0.1
+  fi
+}
+
+dokku_deploy_cmd "$@"

plugins/00_dokku-standard/subcommands/ls

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+dokku_ls_cmd() {
+  declare desc="lists installed apps with status"
+  local cmd="ls"
+  local installed_apps=$(dokku_apps)
+  local dokku_app
+
+  dokku_col_log_info1_quiet "App Name" "Container Type" "Container Id" "Status"
+
+  for dokku_app in $installed_apps; do
+    local APP=$(basename "$dokku_app")
+    local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
+    local DOCKER_RUNNING_CONTAINERS=$(docker ps -q --no-trunc)
+    if [[ -n $DOKKU_APP_CIDS ]]; then
+      local DOKKU_APP_CID
+      for DOKKU_APP_CID in $DOKKU_APP_CIDS; do
+        local DOKKU_APP_CONTAINER_STATUS="stopped"
+        [[ $DOCKER_RUNNING_CONTAINERS =~ $DOKKU_APP_CID ]] && local DOKKU_APP_CONTAINER_STATUS="running"
+        local DOKKU_APP_CONTAINER_TYPE=$(grep -l "$DOKKU_APP_CID" "$DOKKU_ROOT/$APP"/CONTAINER.* | awk -F '/' '{ print $5 }' | awk -F '.' '{ print $2 }')
+        dokku_col_log_msg "$APP" "$DOKKU_APP_CONTAINER_TYPE" "${DOKKU_APP_CID:0:12}" "$DOKKU_APP_CONTAINER_STATUS"
+      done
+    else
+      dokku_col_log_msg "$APP" "NOT_DEPLOYED" "NOT_DEPLOYED" "NOT_DEPLOYED"
+    fi
+  done
+}
+
+dokku_ls_cmd "$@"

plugins/00_dokku-standard/subcommands/receive

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+
+dokku_receive_cmd() {
+  declare desc="receives an app kicks off deploy process"
+  local cmd="receive"
+  local APP="$2"; local IMAGE=$(get_app_image_name "$APP"); local IMAGE_SOURCE_TYPE="$3"; local TMP_WORK_DIR="$4"
+  if [[ -z "$DOKKU_SKIP_CLEANUP" ]]; then
+    dokku_log_info1 "Cleaning up..."
+    docker_cleanup
+  else
+    dokku_log_info1 "DOKKU_SKIP_CLEANUP set. Skipping dokku cleanup"
+  fi
+  dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE..."
+  config_set --no-restart "$APP" DOKKU_APP_TYPE="$IMAGE_SOURCE_TYPE" &> /dev/null
+  dokku build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR"
+  release_and_deploy "$APP"
+}
+
+dokku_receive_cmd "$@"

plugins/00_dokku-standard/subcommands/release

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+
+dokku_release_cmd() {
+  declare desc="release phase"
+  local cmd="release"
+  local APP="$2"; local IMAGE_SOURCE_TYPE="$3"; local IMAGE_TAG="$4"; local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
+  verify_app_name "$APP"
+
+  case "$IMAGE_SOURCE_TYPE" in
+    herokuish)
+      plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
+      if [[ -n $(config_export global) ]]; then
+        local id=$(config_export global | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
+        test "$(docker wait "$id")" -eq 0
+        docker commit "$id" "$IMAGE" > /dev/null
+      fi
+      if [[ -n $(config_export app "$APP") ]]; then
+        local id=$(config_export app "$APP" | docker run "$DOKKU_GLOBAL_RUN_ARGS" -i -a stdin "$IMAGE" /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
+        test "$(docker wait "$id")" -eq 0
+        docker commit "$id" "$IMAGE" > /dev/null
+      fi
+      plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG"
+      ;;
+
+    dockerfile)
+      # buildstep plugins don't necessarily make sense for dockerfiles. call the new breed!!!
+      plugn trigger pre-release-dockerfile "$APP" "$IMAGE_TAG"
+      plugn trigger post-release-dockerfile "$APP" "$IMAGE_TAG"
+      ;;
+
+    *)
+      dokku_log_fail "Releasing image source type $IMAGE_SOURCE_TYPE not supported!"
+      ;;
+  esac
+}
+
+dokku_release_cmd "$@"

plugins/00_dokku-standard/subcommands/report

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+dokku_report_cmd() {
+  declare desc="reports dokku vitals for troubleshooting"
+  local cmd="report"
+
+  dokku_log_info1 "uname: $(uname -a)"
+  dokku_log_info1 "memory: "
+  free -m
+  dokku_log_info1 "docker version: "
+  docker version
+  dokku_log_info1 "docker daemon info: "
+  docker -D info
+  dokku_log_info1 "sigil version: $(sigil -v)"
+  dokku_log_info1 "herokuish version: "
+  docker run --rm -ti gliderlabs/herokuish:latest herokuish version
+  dokku_log_info1 "dokku version: $(dokku version)"
+  dokku_log_info1 "dokku plugins: "
+  dokku plugin
+}
+
+dokku_report_cmd "$@"

plugins/00_dokku-standard/subcommands/run

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+
+dokku_run_cmd() {
+  declare desc="runs command in container based on app image"
+  local cmd="run"
+  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+  local APP="$2"; local IMAGE_TAG=$(get_running_image_tag "$APP"); local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
+  verify_app_name "$APP"
+
+  shift 2
+
+  if [[ -z "$DOKKU_RM_CONTAINER" ]]; then
+    local DOKKU_APP_RM_CONTAINER=$(config_get "$APP" DOKKU_RM_CONTAINER || true)
+    local DOKKU_GLOBAL_RM_CONTAINER=$(config_get --global DOKKU_RM_CONTAINER || true)
+    local DOKKU_RM_CONTAINER=${DOKKU_APP_RM_CONTAINER:="$DOKKU_GLOBAL_RM_CONTAINER"}
+  fi
+
+  local DOCKER_ARGS=$(: | plugn trigger docker-args-run "$APP" "$IMAGE_TAG")
+  [[ "$DOKKU_TRACE" ]] && local DOCKER_ARGS+=" -e TRACE=true "
+  [[ "$DOKKU_RM_CONTAINER" ]] && local DOKKU_RUN_OPTS="--rm"
+  has_tty && local DOKKU_RUN_OPTS+=" -i -t"
+  is_image_herokuish_based "$IMAGE" && local EXEC_CMD="/exec"
+  # shellcheck disable=SC2086
+  docker run $DOKKU_GLOBAL_RUN_ARGS $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
+}
+
+dokku_run_cmd "$@"

plugins/00_dokku-standard/subcommands/trace

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+dokku_trace_cmd() {
+  declare desc="enables/disables DOKKU_TRACE"
+  local cmd="trace"
+  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
+  [[ "$2" == "on" ]] || [[ "$2" == "off" ]] || {
+    dokku_log_fail "Valid trace options are [on/off]"
+  }
+
+  if [[ "$2" == "on" ]]; then
+    echo "Enabling dokku trace"
+    echo "export DOKKU_TRACE=1" > "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  fi
+
+  if [[ "$2" == "off" ]]; then
+    echo "Disabling dokku trace"
+    rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+  fi
+}
+
+dokku_trace_cmd "$@"

plugins/00_dokku-standard/subcommands/url

@@ -0,0 +1 @@
+urls

plugins/00_dokku-standard/subcommands/urls

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+dokku_urls_cmd() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+  local APP="$2"
+
+  get_app_urls "$@"
+}
+
+dokku_urls_cmd "$@"

plugins/00_dokku-standard/subcommands/version

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/checks/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/proxy/functions"
+
+dokku_version_cmd() {
+  declare desc="prints dokku version"
+  local cmd="version"
+  cat "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
+}
+
+dokku_version_cmd "$@"

plugins/20_events/backup-check

@@ -1 +0,0 @@
-hook

plugins/20_events/backup-export

@@ -1 +0,0 @@
-hook

plugins/20_events/backup-import

@@ -1 +0,0 @@
-hook

plugins/20_events/commands

@@ -1,54 +1,33 @@
 #!/usr/bin/env bash
-[[ " events events:on events:off events:list help events:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
+[[ " help events:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 case "$1" in
-  events)
-    if [[ -f $DOKKU_EVENTS_LOGFILE ]]; then
-      if [[ $2 == "-t" ]]; then
-        tail -F $DOKKU_EVENTS_LOGFILE
-      else
-        tail -n 100 $DOKKU_EVENTS_LOGFILE
-      fi
-    fi
-    ;;
-
-  events:on)
-    echo "Enabling dokku events logger"
-    [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p $DOKKU_ROOT/.dokkurc
-    echo "export DOKKU_EVENTS=1" > $DOKKU_ROOT/.dokkurc/DOKKU_EVENTS
-    ;;
-
-  events:off)
-    echo "Disabling dokku events logger"
-    rm -f $DOKKU_ROOT/.dokkurc/DOKKU_EVENTS
-    ;;
-
-  events:list)
-    PLUGIN_DIR="$(dirname $0)"
-    if [[ "$DOKKU_EVENTS" ]]; then
-      logged="$(find $PLUGIN_DIR -type l -printf '%f ' | sort)"
-      dokku_col_log_info2_quiet "Events currently logged"
-      for hook in $logged; do
-        dokku_col_log_msg "$hook"
-      done
-    else
-      dokku_log_warn "Events logger disabled"
-    fi
-    ;;
-
   help | events:help)
-    cat && cat<<EOF
+    help_content_func () {
+      declare desc="return events plugin help content"
+      cat<<help_content
     events [-t], Show the last events (-t follows)
     events:list, List logged events
     events:on, Enable events logger
     events:off, Disable events logger
-EOF
+help_content
+    }
+
+    if [[ $1 = "events:help" ]] ; then
+        echo 'Usage: dokku events:COMMAND [-t]'
+        echo ''
+        echo 'Interact with Dokku event logger.'
+        echo ''
+        echo 'Additional commands:'
+        help_content_func | sort | column -c2 -t -s,
+    else
+        help_content_func
+    fi
     ;;
 
   *)
-    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
     ;;
 
 esac

plugins/20_events/hook

@@ -2,4 +2,4 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename $0)" "$@"
+[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename "$0")" "$@"

plugins/20_events/install

@@ -2,7 +2,8 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-DOKKU_RSYSLOG_FILTER=/etc/rsyslog.d/99-dokku.conf
+DOKKU_RSYSLOG_FILTER_DIR=/etc/rsyslog.d
+DOKKU_RSYSLOG_FILTER=$DOKKU_RSYSLOG_FILTER_DIR/99-dokku.conf
 DOKKU_LOGROTATE_FILE=/etc/logrotate.d/dokku
 
 flag_rsyslog_needs_restart=n
@@ -11,7 +12,7 @@ flag_rsyslog_needs_restart=n
 # exits gracefully if the path already exists
 mkdir -m 775 -p "$DOKKU_LOGS_DIR"
 case "$DOKKU_DISTRO" in
-  debian)
+  arch|debian)
     chgrp dokku "$DOKKU_LOGS_DIR"
     ;;
   *)
@@ -22,7 +23,7 @@ esac
 if [[ ! -f  "$DOKKU_EVENTS_LOGFILE" ]]; then
   touch "$DOKKU_EVENTS_LOGFILE"
   case "$DOKKU_DISTRO" in
-    debian)
+    arch|debian)
       chgrp dokku "$DOKKU_EVENTS_LOGFILE"
       ;;
     *)
@@ -33,7 +34,7 @@ if [[ ! -f  "$DOKKU_EVENTS_LOGFILE" ]]; then
   chmod 664 "$DOKKU_EVENTS_LOGFILE"
 fi
 
-if [[ ! -f  "$DOKKU_RSYSLOG_FILTER" ]]; then
+if [[ -d "$DOKKU_RSYSLOG_FILTER_DIR" && ! -f  "$DOKKU_RSYSLOG_FILTER" ]]; then
   cat >"$DOKKU_RSYSLOG_FILTER" <<EOF
 :syslogtag, contains, "dokku" $DOKKU_EVENTS_LOGFILE
 EOF
@@ -56,13 +57,18 @@ $DOKKU_LOGS_DIR/*.log {
         create 664 syslog dokku
 }
 EOF
+
+  if [[ "$DOKKU_DISTRO" = "debian" ]]; then
+    sed -i '/\s*su syslog dokku/d; s/\(create [0-7][0-7][0-7]\) syslog dokku/\1 root dokku/g' $DOKKU_LOGROTATE_FILE
+  fi
+
   flag_rsyslog_needs_restart=y
 fi
 
-if [[ "$flag_rsyslog_needs_restart" == "y" ]]; then
+if [[ -f "$DOKKU_RSYSLOG_FILTER" && "$flag_rsyslog_needs_restart" == "y" ]]; then
   service rsyslog restart
 fi
 
-[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename $0)" "$@"
+[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename "$0")" "$@"
 
 exit 0

plugins/20_events/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.4.0"
+version = "0.5.2"
 [plugin.config]

plugins/20_events/subcommands/default

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+events_main_cmd() {
+  declare desc="shows contents of dokku events log"
+  local cmd="events"
+  if [[ -f $DOKKU_EVENTS_LOGFILE ]]; then
+    if [[ $2 == "-t" ]]; then
+      tail -F "$DOKKU_EVENTS_LOGFILE"
+    else
+      tail -n 100 "$DOKKU_EVENTS_LOGFILE"
+    fi
+  fi
+}
+
+events_main_cmd "$@"

plugins/20_events/subcommands/list

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+events_list_cmd() {
+  declare desc="lists enabled events"
+  local cmd="events:list"
+  local PLUGIN_DIR="$(dirname "$0")/.."
+
+  if [[ "$DOKKU_EVENTS" ]]; then
+    local logged="$(find "$PLUGIN_DIR" -type l -printf '%f ' | sort)"
+    dokku_col_log_info2_quiet "Events currently logged"
+
+    local hook
+    for hook in $logged; do
+      dokku_col_log_msg "$hook"
+    done
+  else
+    dokku_log_warn "Events logger disabled"
+  fi
+}
+
+events_list_cmd "$@"

plugins/20_events/subcommands/off

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+events_off_cmd() {
+  declare desc="disables dokku events logger"
+  local cmd="events:off"
+  echo "Disabling dokku events logger"
+  rm -f "$DOKKU_ROOT/.dokkurc/DOKKU_EVENTS"
+}
+
+events_off_cmd "$@"

plugins/20_events/subcommands/on

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+events_on_cmd() {
+  declare desc="enables dokku events logger"
+  local cmd="events:on"
+  echo "Enabling dokku events logger"
+  [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
+  echo "export DOKKU_EVENTS=1" > "$DOKKU_ROOT/.dokkurc/DOKKU_EVENTS"
+}
+
+events_on_cmd "$@"

plugins/apps/commands

@@ -1,66 +1,40 @@
 #!/usr/bin/env bash
-[[ " apps apps:create apps:destroy help apps:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
+[[ " help apps:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 case "$1" in
-  apps)
-    dokku_log_info2_quiet "My Apps"
-    find $DOKKU_ROOT -follow -maxdepth 1 -type d  \( ! -iname ".*" \)  -not -path $DOKKU_ROOT/tls | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2 | sort
-    ;;
-
-  apps:create)
-    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-    [[ -d "$DOKKU_ROOT/$2" ]] && dokku_log_fail "Name is already taken"
-    APP="$2"
-
-    mkdir -p "$DOKKU_ROOT/$APP"
-    echo "Creating $APP... done"
-    ;;
-
-  apps:destroy)
-    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-    [[ "$2" == "tls" ]] && dokku_log_fail "Unable to destroy tls directory"
-    [[ "$3" == "force" ]] && DOKKU_APPS_FORCE_DELETE=1
-    APP="$2"; IMAGE_TAG=$(get_running_image_tag $APP)
-    verify_app_name "$APP"
-
-    if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
-      dokku_log_warn "WARNING: Potentially Destructive Action"
-      dokku_log_warn "This command will destroy $APP (including all add-ons)."
-      dokku_log_warn "To proceed, type \"$APP\""
-      echo ""
-
-      read -rp "> " app_name
-      if [[ "$app_name" != "$APP" ]]; then
-        dokku_log_fail "Confirmation did not match $APP. Aborted."
-      fi
-    fi
-
-    echo "Destroying $APP (including all add-ons)"
-
-    plugn trigger pre-delete $APP $IMAGE_TAG
-    DOKKU_APP_CIDS=$(get_app_container_ids $APP)
-    if [[ -n $DOKKU_APP_CIDS ]]; then
-      for ID in $DOKKU_APP_CIDS; do
-        docker stop $ID > /dev/null || true
-        docker rm $ID  > /dev/null || true
-      done
-    fi
-
-    plugn trigger post-delete $APP $IMAGE_TAG
-    ;;
-
   help | apps:help)
-    cat<<EOF
+    help_content_func () {
+      declare desc="return apps plugin help content"
+      cat<<help_content
     apps, List your apps
     apps:create <app>, Create a new app
     apps:destroy <app>, Permanently destroy an app
-EOF
+    apps:rename <old-app> <new-app>, Rename an app
+help_content
+    }
+
+    if [[ $1 = "apps:help" ]] ; then
+        echo -e 'Usage: dokku apps[:COMMAND]'
+        echo ''
+        echo 'List your apps.'
+        echo ''
+        echo 'Example:'
+        echo ''
+        echo '$ dokku apps'
+        echo '=====> My Apps'
+        echo 'example'
+        echo 'example2'
+        echo ''
+        echo 'Additional commands:'
+        help_content_func | sort | column -c2 -t -s,
+    else
+        help_content_func
+    fi
     ;;
 
   *)
-    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
     ;;
 
 esac

plugins/apps/functions

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+apps_create() {
+  declare desc="verifies app name and creates an app"
+  [[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ ! "$1" =~ ^[a-z].* && ! "$1" =~ ^[0-9].* ]] && dokku_log_fail "App name must begin with lowercase alphanumeric character"
+  [[ -d "$DOKKU_ROOT/$1" ]] && dokku_log_fail "Name is already taken"
+  local APP="$1"
+
+  mkdir -p "$DOKKU_ROOT/$APP"
+  echo "Creating $APP... done"
+  plugn trigger post-create "$APP"
+}
+
+apps_destroy() {
+  local APP="$1"; local IMAGE_TAG=$(get_running_image_tag "$APP")
+  verify_app_name "$APP"
+
+  if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
+    dokku_log_warn "WARNING: Potentially Destructive Action"
+    dokku_log_warn "This command will destroy $APP (including all add-ons)."
+    dokku_log_warn "To proceed, type \"$APP\""
+    echo ""
+
+    read -rp "> " app_name
+    if [[ "$app_name" != "$APP" ]]; then
+      dokku_log_fail "Confirmation did not match $APP. Aborted."
+    fi
+  fi
+
+  echo "Destroying $APP (including all add-ons)"
+
+  plugn trigger pre-delete "$APP" "$IMAGE_TAG"
+  local DOKKU_APP_CIDS=$(get_app_container_ids "$APP")
+  local cid
+
+  if [[ -n $DOKKU_APP_CIDS ]]; then
+    for cid in $DOKKU_APP_CIDS; do
+      docker stop "$cid" > /dev/null || true
+      docker rm "$cid"  > /dev/null || true
+    done
+  fi
+
+  plugn trigger post-delete "$APP" "$IMAGE_TAG"
+}

plugins/apps/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.4.0"
+version = "0.5.2"
 [plugin.config]