Release 0.4.2

Docs tweaks

.gitignore

@@ -4,3 +4,4 @@ stack.tgz
 build
 tmp
 *.deb
+.ruby-version

AUTHORS

@@ -1,21 +0,0 @@
-# If you're submitting a patch, please add your name here in alphabetical order as part of the patch.
-# This file lists all individuals having contributed content to the repository.
-#
-Alexander <iam.asm89@gmail.com>
-Alexander Beletsky <alexander.beletsky@gmail.com>
-Alexis Gavoty <kload@kload.fr>
-Christian Joudrey <cmallette@gmail.com>
-Felipe Coury <felipe.coury@gmail.com>
-Jeff Lindsay <progrium@gmail.com>
-Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
-Leo Unbekandt <leo@unbekandt.eu>
-Ludovic Perrine <jazzzz@gmail.com>
-Luigi Maselli <grigio.org@gmail.com>
-Martin Weiss <kornnflake@gmail.com>
-Michael Hobbs <github@psudo.net>
-Paul Lietar <paul@lietar.net>
-Rajiv Makhijani <rajiv@blue-tech.org>
-rhy-jot <rhy-jot@myeml.net>
-Richard North <rich.north@gmail.com>
-Sebastian Götte <github@jaseg.net>
-Silas Baronda <silas.baronda@gmail.com>

CONTRIBUTING.md

@@ -0,0 +1,191 @@
+# How to contribute
+
+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
+  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/)
+
+There are a few guidelines that we need contributors to follow so that we have
+a chance of keeping on top of things.
+
+## Topics
+
+* [Reporting Security Issues](#reporting-security-issues)
+* [Reporting Issues](#reporting-other-issues)
+* [Contributing](#contributing)
+  * [Making Changes](#making-changes)
+  * [Which branch to base the work](#which-branch-to-base-the-work)
+  * [Submitting Changes](#submitting-changes)
+  * [When will my change be merged?](#when-will-my-change-be-merged)
+  * [Test cases and codesniffs](#test-cases-and-codesniffs)
+* [Additional Resources](#additional-resources)
+
+## Reporting security issues
+
+The Dokku maintainers take security seriously. If you discover a security
+issue, please bring it to their attention right away!
+
+Please **DO NOT** file a public issue, instead send your report privately to
+[dokku@josediazgonzalez.com](mailto:dokku@josediazgonzalez.com),
+
+Security reports are greatly appreciated and we will publicly thank you for it.
+
+## Reporting other issues
+
+A great way to contribute to the project is to send a detailed report when you
+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/),
+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)
+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.
+
+When reporting issues, please include your host OS (Ubuntu 14.04, Fedora 19,
+etc). Please include:
+
+* The output of `uname -a`.
+* The output of `docker version`.
+* The output of `docker -D info`.
+* The output of `dokku version`.
+
+Please also include the steps required to reproduce the problem if possible and
+applicable. This information will help us review and fix your issue faster.
+
+**Issue Report Template**:
+
+```
+Description of problem:
+
+
+Output of the following commands
+
+- `dokku version`:
+- `dokku plugin`:
+- `docker version`:
+- `docker info`:
+- `uname -a`:
+- `cat /home/dokku/<app>/nginx.conf` (if applicable):
+- Output of failing dokku commands with `dokku trace on`:
+
+Environment details (AWS, VirtualBox, physical, etc.):
+
+How was dokku installed?:
+
+How reproducible:
+
+
+Steps to Reproduce:
+1.
+2.
+3.
+
+Actual Results:
+
+
+Expected Results:
+
+
+Additional info:
+```
+
+## Contributing
+
+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
+  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.
+* Fork the repository on GitHub.
+
+### Making Changes
+
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * Only target an existing branch if you are certain your fix must be on that
+    branch.
+  * To quickly create a topic branch based on master; `git checkout -b my_contribution origin/master`.
+    It is best to avoid working directly on the `master` branch. Doing so will
+    help avoid conflicts if you pull in updates from origin.
+* Make commits of logical units. Implementing a new function and calling it in
+  another file constitute a single logical unit of work.
+  * Before you make a pull request, squash your commits into logical units of work
+    using `git rebase -i` and `git push -f`.
+  * A majority of submissions should have a single commit, so if in doubt,
+    squash your commits down to one commit.
+* 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
+  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
+  mixed into the PR.
+  * **Git tip**: If your PR no longer merges cleanly, use `rebase master` in your
+    feature branch to update your pull request rather than `merge master`.
+
+### Which branch to base the work
+
+All changes should be be based on the latest master commit.
+
+### Submitting Changes
+
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request to the repository on github, with the correct target
+  branch.
+
+### When will my change be merged?
+
+Be patient! The dokku maintainers will review all pull requests and comment as
+quickly as possible. There may be some back and forth while the details of your
+pull request are discussed.
+
+In the unlikely event that your pull request does not get merged, the dokku
+maintainers will either provide an alternative patch or guide you towards a
+better solution to the problem at hand.
+
+During our pre-1.0 cycle, we will follow these general rules when merging pull
+requests:
+
+- bugfix (patch)
+- security (patch/minor)
+- minor feature (patch)
+- backwards incompatible change (minor)
+- major feature (minor)
+
+### Test cases and codesniffs
+
+Dokku tests require [bats](https://github.com/sstephenson/bats).
+To run the test cases locally use the following command:
+
+    make ci-dependencies
+    make unit-tests deploy-tests
+
+To run the shellcheck sniffs for Dokku coding standards:
+
+    make ci-dependencies
+    make lint
+
+The [testing docs](http://progrium.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)
+* [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,10 +1,371 @@
 # History
 
+## 0.4.2
+
+This release was mainly a documentation release, with a few notable features:
+
+- You can now use the commercial version of docker-engine with dokku.
+- You can now name your containers using the official `named-containers` plugin
+
+Huge thanks to @Flink for working on our official plugins and adding official [basic auth](https://github.com/dokku/dokku-http-auth), [couchdb](https://github.com/dokku/dokku-couchdb), and [site maintenance](https://github.com/dokku/dokku-maintenance) plugins!
+
+### Bug Fixes
+
+- #1530: @Flink Fix nginx configuration for SSL
+
+### New Features
+
+- #1515: @leonardodino Allow local prebuilt stack sourcing
+- #1536 #1537: @josegonzalez Add docker-engine-cs as docker-engine alternative
+- #1511: @Flink Add `named-containers` as a core plugin
+
+### Documentation
+
+- #1520: @kimausloos Add `dokku` command-prefix to `plugin:install` command
+- #1519: @3onyc Fix typos in documentation
+- #1521: @edm00se Use correct url to bootstrap.sh in README.md
+- #1522: @josegonzalez Avoid redirects and use raw.githubusercontent.com for github links
+- #1523 #1548: @callahad Make room for the longer bootstrap.sh URL
+- #1524: @callahad Document idiosyncracies with Linode
+- #1529: @pzula Adds helpful information regarding whitespacing when setting config
+- #1525 #1550: @josegonzalez Add gratipay shield to readme
+- #1544 #1545 #1547 #1551: @josegonzalez @Flink Update compatibility for community plugins
+- #1546: @josegonzalez Add missing description to history output in HISTORY.md
+- #1552 #1553 #1555: @josegonzalez Various documentation styling tweaks
+
+## 0.4.1
+
+This release is primarily a bugfix and documentation update. In 0.4.0, we incorrectly handled setting environment variables in certain cases, resulting in misconfigured applications. We recommend that all users upgrade from 0.4.1 as soon as possible.
+
+One new feature is colorized logging output, which should make it easier to debug application logging output when deploying multiple processes.
+
+### Bug Fixes
+
+- #1494: @callahad Correctly install packages for DOKKU_TAG=v0.4.0
+- #1496: @callahad Don't prompt users when installing dokku package
+- #1514: @michaelshobbs Do not use exit 0 in config functions and fix CURL environment variable setting
+
+### New Features
+
+- #1482: @Flink Strip the `dokku-` part from plugins on install
+- #1500: @jazzzz Log user name and fingerprint in events
+- #1512: @Flink Colorize output from logs
+
+### Documentation
+
+- #1485: @matto1990 Update Slack plugin compatability
+- #1488: @josegonzalez Update plugins list with compatibility changes
+- #1491: @josegonzalez Promote [maintenance](https://github.com/dokku/dokku-maintenance) and [http basic auth](https://github.com/dokku/dokku-http-auth) plugins to official status
+- #1492: @josegonzalez Upgrade hostname plugin to 0.4.0+ compatibility
+- #1501: @josegonzalez Clarify bootstrap installation documentation
+- #1502: @josegonzalez Update dokku-apt compatibility
+- #1504: @michaelshobbs Change plugin install doc to show one-step method
+
+## 0.4.0
+
+This is our first minor release in almost a year. Many new features and removals have occurred, so here is a neat summary:
+
+- Plugins are now triggered via `plugn`. Notably, you'll need add a `plugin.toml` to describe the plugin as well as use `plugn trigger` instead of `pluginhook` to trigger plugin callbacks. Please see the [plugin creation documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation/) for more details.
+- A few new official plugins have been added to the core, including [image tagging](http://progrium.viewdocs.io/dokku/application-deployment/), [certificate management](http://progrium.viewdocs.io/dokku/deployment/ssl-configuration/), a tar-based deploy solution, and much more. Check out the *New Features* section for more details.
+- We've removed a few deprecated plugin callbacks. Please see the [plugin triggers documentation](http://progrium.viewdocs.io/dokku/development/plugin-triggers/) to see what is available.
+- [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!
+
+### Deprecations and Removals
+
+- #1372: @SonicHedgehog Do no longer force-install a default nginx.conf
+- #1415: @tilgovi Remove uses of (un)set-norestart
+- #1432: @josegonzalez Delete unmaintained AUTHORS file
+- #1450: @michaelshobbs Rename event plugin buildstep hooks to buildpack
+
+### Bug Fixes
+
+- #1344: @AdamVig Add better error checking on nginx:import-ssl
+- #1417: @josegonzalez Expose host and port in vagrant build vm
+- #1418: @josegonzalez Use cgroupfs-mount as alternative package to cgroup-lite dependency
+- #1419: @u2mejc Fix dokku ps <app> over ssh
+- #1422: @josegonzalez Guard against missing VHOST files when listing domains
+- #1428: @jimeh Use `$PLUGIN_PATH` instead of `$(dirname $0)/..`
+- #1430: @lubert Update vagrant box name to `bento/ubuntu-14.04`
+- #1439: @michaelshobbs Fix tar tests by sleeping for 5 seconds
+- #1447: @alanjds Properly detect app name in the official cli client
+- #1449: @josegonzalez Match herokuish deb with released version number
+- #1457: @lukechilds Bashstyle fixes
+- #1463: @josegonzalez Update `Xenify Distro` option for linode stackscript
+- #1464: @josegonzalez Limit number of log lines when calling `dokku logs -t`
+- #1466: @josegonzalez Follow bashstyle conventions where possible
+- #1471: @michaelshobbs Make the default scaling logic clearer
+- #1475: @josegonzalez Fix issue where restart on failure option overrode existing DOCKER_ARGS
+
+### New features
+
+- #1225: @michaelshobbs Add tags plugin to handle image tagging and deployment of tagged app images
+- #1228: @michaelshobbs Use plugn instead of pluginhook to trigger plugin hooks
+- #1402: @josegonzalez Consolidate configuration management into config plugin
+- #1414: @michaelshobbs Add certs plugin for certificate management
+- #1420: @josegonzalez Add `dokku enter` for connecting to an app container
+- #1421: @basicer Add tar plugin to manage tar-based deployments
+- #1423: @josegonzalez Set `DYNO_TYPE_NUMBER` environment variable for each container
+- #1431: @josegonzalez Add helper function for inspecting the state of a container
+- #1444: @josegonzalez Extract cleanup command into common function
+- #1445: @josegonzalez Create CONTRIBUTING.md
+- #1455: @michaelshobbs Continue and log an event if/when container retirement fails
+- #1458: @michaelshobbs Set Herokuish `TRACE=true` when `DOKKU_TRACE` is set
+- #1460: @michaelshobbs Bump herokuish version to 0.3.3
+- #1465: @josegonzalez Set DYNO environment variable to heroku-compatible value
+- #1467: @josegonzalez Upgrade dokku installation to use docker-engine
+- #1468: @michaelshobbs Clean up semver logic and run install-dependencies after package installation
+- #1469: @isundaylee Add nginx:access-logs and nginx:error-logs commands
+- #1470: @assaf Add nginx configuration for running behind load balancer
+- #1472: @michaelshobbs Use processes defined in `Procfile` when generating `DOKKU_SCALE` file
+- #1473: @josegonzalez Handle crashing containers by using restart=on-failure policy
+- #1476: @michaelshobbs Support static nginx port when deploying without an application VHOST
+- #1476: nginx proxy without VHOST
+- #1477: @arthurschreiber Support removing config variables that contain `\n`.
+
+### Documentation
+
+- #1407: @ertrzyiks Correct DOKKU_DOCKERFILE_PORT variable name in docs
+- #1408: @josegonzalez Add links to official dokku datastorage plugins
+- #1426: @henrik Update memcached link to maintained fork
+- #1437: @Flink Update compatibility version for several plugins
+- #1446: @johnfraney Correct nginx documentation
+- #1478: @eljojo Fix naming of herokuish package in installation docs
+
+## 0.3.26
+
+This release has a few new features, the largest of which is switching from buildstep to herokuish for building containers. Going forward, this should help ensure that built containers are as close to heroku containers as possible, and also allow us to be on the cutting edge of heroku buildpack support. Props to @michaelshobbs for his work on herokuish.
+
+### Bug Fixes
+
+- #1401: @josegonzalez Install apt-transport-https before adding https-backed apt sources
+
+### New Features
+
+- #1128: @michaelshobbs Switch from buildstep to herokuish
+- #1399: @basicer Make dokku play nice when there are multiple receive-app hooks
+- #1413: @michaelshobbs support comments in DOKKU_SCALE and print contents on deploy
+
+### Documentation
+
+- #1400: @josegonzalez Fix HISTORY.md formatting
+- #1410: @josegonzalez Clarify DOKKU_SCALE usage
+- #1411: @josegonzalez Clarify `ps:scale` example
+
+## 0.3.25
+
+This release is a bugfix release fixing a broken 0.3.25 apt-get installation.
+
+### Bug Fixes
+
+- #1398 @josegonzalez Revert "Remove `dokku plugins-install` from postinst hook
+
+## 0.3.24
+
+This release is a bugfix release covering dokku packaging.
+
+### Bug Fixes
+
+- #1397: @josegonzalez Use https docker apt repo
+- #1394: @josegonzalez Remove `dokku plugins-install` from postinst hook
+
+### Docs Changes
+
+- #1395: @adrianmoya Adding fqdn requirement
+
+## 0.3.23
+
+This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://progrium.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!
+
+### Bug Fixes
+
+- #1334: @josegonzalez Fix pluginhook building and update package version
+- #1335: @josegonzalez Fix name for michaelshobbs
+- #1341: @michaelshobbs Honor $DOKKU_DOCKERFILE_PORT when binding the docker container to an external IP.
+- #1357: @michaelshobbs only run domains and nginx config if we have a port and ip
+- #1366: @omeid Make bootstrap.sh safe from bad connection
+- #1370: @SamuelMarks Switch from /dev/null to -qq, from --silent to -sL, and sudo
+- #1380: @emdantrim Removed uses of `sudo` from `bootstrap.sh`
+- #1383: @michaelshobbs fix downscaling from 10+
+
+### New Features
+
+- #1292: @michaelshobbs use column to format help output
+- #1337: @josegonzalez Update PREBUILT_STACK_URL to latest buildstep release
+- #1354: @alessio Log receive-branch pluginhook
+- #1359: @michaelshobbs allow DOKKU_WAIT_TO_RETIRE to be defined per app
+- #1365: @michaelshobbs support dockerfile images that don't include bash
+
+### Docs Changes
+
+- #1305: @josegonzalez Updated documentation site
+- #1321: @fwolfst Mention alternative to nginx.conf templates: include-dir.
+- #1346: @michaelshobbs document dokku cleanup and the potential of compat issues
+- #1349: @alexkruegger add plugin dokku-app-configfiles
+- #1358: @bkniffler Add suggestion for low memory VMs
+- #1377: @vkurup Fix link to docs from README
+- #1379: @jezdez Deleted old, unmaintained plugins
+- #1381: @lunohodov Instructions for using the bash client in shells other than bash
+
+## 0.3.22
+
+This release is a general bugfix release, with improvements to handling of nginx templates and application configuration.
+
+### Bug Fixes
+
+- #825: @andrewsomething Add support for multiple keys in the installer.
+- #1274: @michaelshobbs Parse correct section of path for `dokku ls` container type
+- #1289: @michaelshobbs Do not background container cleanup
+- #1298: @SonicHedgehog Fix check-deploy skipping the root path
+- #1300: @michaelshobbs Fix urls command when NO_VHOST=1
+- #1310: @michaelshobbs Use config:get for checks skipping variables
+- #1311: @michaelshobbs Ignore protocol of Dockerfile EXPOSE (refs: #1280)
+- #1312: @michaelshobbs Use docker inspect fordefault container check. Closes #1270
+- #1313: @michaelshobbs Verify we have an app when deploy is called. Closes #1309
+- #1319: @MWers Spelling fix: 'comma seperated'=>'comma-separated'
+- #1331: @alexkruegger Fix retrieval of nginx.conf.template app
+
+### New Features
+
+- #1149: @mlebkowski Add pluginhook to receive branches different than master
+- #1254: @kilianc Add DOKKU_DOCKERFILE_START_CMD support
+- #1261: @Flink Add the ability to skip checks (all or default)
+- #1277: @krokhale Add gzip to nginx templates by default
+- #1278: @assaf Add the ability to retrieve nginx template from app
+- #1291: @michaelshobbs Refactored interface for managing global/local app configuration
+- #1299: @SonicHedgehog Set X-Forwarded-Proto header if TLS is enabled when running checks
+
+### Docs Changes
+
+- #1273: @alessio Add docs for the events plugin
+- #1276: @josegonzalez Reorder and deprecate a few plugins
+- #1279: @josegonzalez Add docs for `receive-branch` hook. Refs #1149
+- #1282: @josegonzalez Move primecache to deprecated plugins
+- #1285: @josegonzalez Rename dokku-events-logs.md according to index.md
+- #1296: @Flink Add docker-auto-volumes to plugins
+- #1301: @mixxorz Add reset mtime plugin list
+- #1302: @fwolfst Mention where original nginx templates are found by default.
+- #1306: @josegonzalez Clarify web/cli installation docs. Closes #1177. Closes #1170
+- #1307: @josegonzalez Add release documentation. Closes #1287
+- #1324: @michaelshobbs Update docs to reflect default checks
+
+## 0.3.21
+
+This release fixes an issue with installing buildstep and dokku.
+
+### New Features
+
+- #1256: @alessio Log all dokku events to /var/log/dokku/events.log
+
+### Bug Fixes
+
+- #1269: @josegonzalez Peg lxc-docker in buildstep to 1.6.2
+
+## 0.3.20
+
+This release pegs Dokku to Docker 1.6.2. Docker 1.7.0 introduced changes in `docker ps` which cause incompatibilities with many popular dokku plugins.
+
+### New Features
+
+- #1245: @arthurschreiber Support config variables containing `\n`
+- #1257: @josegonzalez Split nginx ssl logs by $APP
+
+### Bug Fixes
+
+- #1207: @rockymadden Fixed bug with client commands taking verb, appname, and also arguments.
+- #1251: @josegonzalez Fallback to using /etc/init.d/nginx reload directly to restart nginx
+- #1264: @josegonzalez Require lxc-docker-1.6.2
+
+### Docs Changes
+
+- #1252: @josegonzalez Fix ssh port for vagrant installation. Closes #1139. [ci skip]
+- #1250: @josegonzalez SSL documentation is misleading
+
+## 0.3.19
+
+### New Features
+
+- #1118: @michaelshobbs Heroku-style Container-Level scaling
+- #1210: @cddr Split nginx logs out by $APP
+- #1232: @michaelshobbs Allow passing of docker build options and document dockerfile deployment. Closes #1231
+
+### Bug Fixes
+
+- #1179: @follmann Prevent dismissal of URLs in CHECKS file that contain query params
+- #1193: @michaelshobbs Handle docker opts over ssh without escaping quotes. closes #1187
+- #1198: @3onyc Check web_config before key_file (Fixes #1196)
+- #1200: @josegonzalez Fix lintball from #1198
+- #1202: @michaelshobbs Filter out literal wildcard when deploying an unrelated domain. Closes #1185
+- #1204: @3onyc Fix bootstrap.sh, install curl when it's missing, make curl follow redirects, don't suppress stderr
+- #1206: @rockymadden Handle for installs in /usr/local/bin and the like.
+- #1212: @michaelshobbs Let circleci dictate docker install (fixes master)
+- #1217: @kirushanth-sakthivetpillai Fix broken ssl wildcard redirect
+- #1227: @Flink Use --no-cache when building Dockerfile
+- #1246: @josegonzalez Ensure we call apt-get before installing packages
+
+### Docs Changes
+
+- #1168: @cjblomqvist [docs] Update git-rev plugin to point to maintained version
+- #1180: @sherbondy [docs] Clarify usage around official dokku `docker-options` plugin
+- #1192: @alessio [docs] Add reference to dokku-events plugin
+- #1218: @michaelshobbs [docs] add dokku-logspout plugin
+- #1224: @lmars [docs] Add link from plugin-creation to pluginhooks
+- #1237: @zyegfryed [docs] Typo (at at -> at)
+
+## 0.3.18
+
+- #1111: @michaelshobbs Call pre-build-dockerfile before docker build
+- #1119: @joshco Logging info suggesting tuned CHECKS
+- #1120: @josegonzalez [docs] Add freenode shield to readme
+- #1121: @josegonzalez Prompt users to run the web installer via MOTD. Closes #943
+- #1129: @josegonzalez Validate nginx configuration before restarting nginx
+- #1137: @YellowApple [docs] Safer installation method
+- #1138: @chrisbutcher [docs] Include tip about using sshcommand acl-add
+- #1140: @NigelThorne [docs] Replaced reference to gitreceive with sshcommand as per #746
+- #1144: @protonet Allow git-remote with different port
+- #1145: @michaelshobbs allow docker-options over ssh. plus test. closes #1135
+- #1146: @michaelshobbs Don't re-deploy on domains:add. allow multple domains on command line. Closes #1142
+- #1147: @michaelshobbs Utilize all 4 free CircleCI containers
+- #1148: @TheEmpty [docs] Add information about 444 for nginx in default_sever.
+- #1150: @cjblomqvist [docs] Add monit plugin
+- #1151: @LTe Do not kill docker container with SIGKILL
+- #1153: @econya [docs] Add README-section: how to contribute
+- #1058: @josegonzalez Move bootstrap script to use debian package where possible
+- #1171: @josegonzalez Use debconf for package configuration
+- #1172: @michaelshobbs unify default and custom nginx template processing
+- #1173: @josegonzalez [docs] standardize readme badges
+- #1178: @jagandecapri [docs] Update plugins.md
+- #1189: @vincentfretin wait 30 seconds and not 30 minutes
+- #1190: @josegonzalez Fix docker gpg key installation
+
+## 0.3.17
+
+- #1056: @joshco New check retries feature
+- #1060: @josegonzalez Add .template suffix to nginx configuration templates. Refs #1054
+- #1064: @michaelshobbs [docs] Document test suite
+- #1065: @michaelshobbs Minor dev env cleanup
+- #1067: @martinAntsy Fix nginx docs wording around config template eg
+- #1068: @matiaskorhonen Fix escaping in the rc.local script in the Linode StackScript
+- #1074: @Flink Better detection of dokku remote in dokku_client.sh
+- #1075: @Flink Use TTY option for SSH
+- #1077: @Flink [docs] Add dokku-psql-single-container to plugins
+- #1079: @rorykoehler Corrected configuration link in bootstrap.sh
+- #1080: @michaelshobbs Include official docker-options plugin. closes #1062
+- #1081: @michaelshobbs Force testing .env with no newline. Closes #1025, #1026, #1063
+- #1082: @michaelshobbs Test cleanup with slight performance boost
+- #1084: @awendt Make port forwarding configurable
+- #1087: @michaelshobbs Make docker-options adhere to DOKKU_NOT_IMPLEMENTED_EXIT pattern
+- #1088: @michaelshobbs Support dockerfiles without expose command. closes #1083
+- #1097: @michaelshobbs Use config:set-norestart in domains plugin. config:get for dockerfile port. closes #1041
+- #1102: @kblcuk Source app-specific ENV during check-deploy
+- #1107: @Benjamin-Dobell [docs] Added Dokku Graduate to the list of known plugins
+
 ## 0.3.16
 
-- #974: @michaelhobbs Don't use set to guard against pipefail
-- #975: @michaelhobbs Simplify SSL hostname handling and avoid overwriting variables. refs #971
-- #978: @michaelhobbs Add apparmor and cgroup-lite as pre-dependencies for dokku debian package
+- #974: @michaelshobbs Don't use set to guard against pipefail
+- #975: @michaelshobbs Simplify SSL hostname handling and avoid overwriting variables. refs #971
+- #978: @michaelshobbs Add apparmor and cgroup-lite as pre-dependencies for dokku debian package
 - #980: @josegonzalez [docs] Add documentation for pluginhooks
 - #981: @josegonzalez Remove old files
 - #982: @josegonzalez [docs] Add documentation for existing clients. Closes #977
@@ -18,18 +379,18 @@
 - #992: @josegonzalez [docs] Fix digital ocean docs. Closes #991
 - #994: @alessio Fix quoting in container termination. Closes #249
 - #996: @pmvieira [docs] Minor typo fix in the pluginhooks documentation
-- #1003: @michaelhobbs Remove quoting around cleanup and disable lint for those lines
+- #1003: @michaelshobbs Remove quoting around cleanup and disable lint for those lines
 - #1001: @sekjun9878 [docs] Add sekjun9878/dokku-redis-plugin to plugins.md
-- #1004: @michaelhobbs Remove quoting from dockerfile env. closes #1002
-- #1018: @michaelhobbs Confine arg shifting to between dokku and command. closes #1017
+- #1004: @michaelshobbs Remove quoting from dockerfile env. closes #1002
+- #1018: @michaelshobbs Confine arg shifting to between dokku and command. closes #1017
 - #1022: @Flink [docs] Add dokku-maintenance to plugins
 - #1008: @lmars Support multiple domains using a wildcard TLS certificate
 - #1013: @lmars Fix URL schemes in `dokku urls` output
 - #1027: @nickstenning [docs] Add webhooks plugin to documentation
-- #1026: @michaelhobbs Ensure we have newlines around our config. closes #1025
-- #1010: @michaelhobbs Don't run create/destroy twice in tests
+- #1026: @michaelshobbs Ensure we have newlines around our config. closes #1025
+- #1010: @michaelshobbs Don't run create/destroy twice in tests
 - #1028: @Flink [docs] Add rails-logs to plugins
-- #1031: @michaelhobbs Upgrade docker in CI to 1.5.0
+- #1031: @michaelshobbs Upgrade docker in CI to 1.5.0
 - #1029: @assaf Added several enhancements for CHECKS file:
   - Specify how long to wait before running first check
   - Specify timeout for each check
@@ -38,27 +399,27 @@
 - #1032: @cameron-martin Updated dokku-installer to use relative path
 - #1035: @Flink [docs] Add dokku-http-auth to plugins
 - #1040: @ebeigarts [docs] Add dokku-slack plugin information
-- #1038: @michaelhobbs Default container check. closes #1020
-- #1036: @michaelhobbs Create config set/unset without restart. closes #908
-- #1009: @michaelhobbs Extract first port from Dockerfile and set config variable for use in deploy phase. closes #993
-- #1042: @michaelhobbs Update to Support xip.io wildcard DNS as a VHOST
-- #1043: @michaelhobbs Use upstart config from docker docs. closes #1015
-- #1047: @michaelhobbs Show logs on deploy success and failure
+- #1038: @michaelshobbs Default container check. closes #1020
+- #1036: @michaelshobbs Create config set/unset without restart. closes #908
+- #1009: @michaelshobbs Extract first port from Dockerfile and set config variable for use in deploy phase. closes #993
+- #1042: @michaelshobbs Update to Support xip.io wildcard DNS as a VHOST
+- #1043: @michaelshobbs Use upstart config from docker docs. closes #1015
+- #1047: @michaelshobbs Show logs on deploy success and failure
 - #1049: @ebeigarts [docs] Change Slack Notifications link
 - #1051: @Flink [docs] Add dokku-airbrake-deploy to plugins
 - #1057: @josegonzalez Updated deb packaging
 
 ## 0.3.15
 
-- #950: @michaelhobbs Do not count blank lines in `make count`
-- #952: @michaelhobbs Document cli args over ssh. closes #951
-- #954: @michaelhobbs Dockerfile support
-- #955: @michaelhobbs Quick style refactor
-- #956: @michaelhobbs Comment out skipped tests as we pay the cost for setup() and teardown() anyway
-- #957: @michaelhobbs Implement dokku shell and ls (by @plietar). refs #312
-- #960: @michaelhobbs Use consistent bash shebang. closes #959
+- #950: @michaelshobbs Do not count blank lines in `make count`
+- #952: @michaelshobbs Document cli args over ssh. closes #951
+- #954: @michaelshobbs Dockerfile support
+- #955: @michaelshobbs Quick style refactor
+- #956: @michaelshobbs Comment out skipped tests as we pay the cost for setup() and teardown() anyway
+- #957: @michaelshobbs Implement dokku shell and ls (by @plietar). refs #312
+- #960: @michaelshobbs Use consistent bash shebang. closes #959
 - #962: @josegonzalez Update debian package building due to man page generation changes
-- #964: @michaelhobbs Only look for long args in global space. allows for short args in plugins. closes #963
+- #964: @michaelshobbs Only look for long args in global space. allows for short args in plugins. closes #963
 - #966: @djelic handle upgrade in debian/preinst script
 
 ## 0.3.14
@@ -66,31 +427,31 @@
 - #891: @josegonzalez Keep existing configuration files when installing nginx. Refs #886
 - #892: @josegonzalez Change documentation on where the ssh config PORT is setup
 - #894: @josegonzalez Dokku client improvements
-- #895: @michaelhobbs Document deploying private git submodules. Closes #644
-- #896: @michaelhobbs Add docker-args pluginhook call to build phase. Closes #515
-- #897: @michaelhobbs Official PS plugin
+- #895: @michaelshobbs Document deploying private git submodules. Closes #644
+- #896: @michaelshobbs Add docker-args pluginhook call to build phase. Closes #515
+- #897: @michaelshobbs Official PS plugin
 - #898: @joliv Update man page for 0.3.13
 - #899: @joliv Use help2man to automatically generate man pages
-- #900: @michaelhobbs Support extracting SANs from SSL certificates and adding them to nginx config
+- #900: @michaelshobbs Support extracting SANs from SSL certificates and adding them to nginx config
 - #901: @misto Pull new tags when upgrading to update VERSION
-- #904: @michaelhobbs Prevent error on restartall when no apps deployed
+- #904: @michaelshobbs Prevent error on restartall when no apps deployed
 - #905: @vincentfretin robv/dokku-elasticsearch not compatible with latest version
 - #907: @vincentfretin Don't use -o pipefail for plugin
-- #914: @michaelhobbs Conditionally set interactive and tty on dokku run. Closes #552. Closes #913
-- #915: @michaelhobbs Document default sites in nginx. Closes #650
-- #916: @michaelhobbs Document build phase troubleshooting suggestions. Closes #841. Closes #911.
-- #917: @michaelhobbs Document resolvconf troubleshooting step. Closes #649
-- #922: @michaelhobbs Use tty cmd to detect if we have one. Closes #921
-- #925: @michaelhobbs Implement rebuild command that reuses git_archive_all
+- #914: @michaelshobbs Conditionally set interactive and tty on dokku run. Closes #552. Closes #913
+- #915: @michaelshobbs Document default sites in nginx. Closes #650
+- #916: @michaelshobbs Document build phase troubleshooting suggestions. Closes #841. Closes #911.
+- #917: @michaelshobbs Document resolvconf troubleshooting step. Closes #649
+- #922: @michaelshobbs Use tty cmd to detect if we have one. Closes #921
+- #925: @michaelshobbs Implement rebuild command that reuses git_archive_all
 - #926: @dyson Update Troubleshooting link in README.md.
-- #927: @michaelhobbs Support both docker-args PHASE and docker-args-PHASE. Closes #906
-- #933: @michaelhobbs Remove references to .pem. Closes #930
-- #936: @michaelhobbs Only execute build stack if we have access to /var/run/docker.sock. Closes #929
+- #927: @michaelshobbs Support both docker-args PHASE and docker-args-PHASE. Closes #906
+- #933: @michaelshobbs Remove references to .pem. Closes #930
+- #936: @michaelshobbs Only execute build stack if we have access to /var/run/docker.sock. Closes #929
 - #938: @vincentfretin Enable ssl_prefer_server_ciphers
-- #940: @michaelhobbs Use valid composer json with specified php runtime
-- #941: @michaelhobbs Source global env prior to app env. Closes #931
-- #942: @michaelhobbs Test clojure app
-- #949: @michaelhobbs Common functions library with simple argument parsing. Closes #932. Closes #945
+- #940: @michaelshobbs Use valid composer json with specified php runtime
+- #941: @michaelshobbs Source global env prior to app env. Closes #931
+- #942: @michaelshobbs Test clojure app
+- #949: @michaelshobbs Common functions library with simple argument parsing. Closes #932. Closes #945
 
 ## 0.3.13
 
@@ -99,45 +460,45 @@
 - #859: @josegonzalez Pass command being executed when retrieving DOCKER_ARGS via pluginhook.
 - #861: @josegonzalez Default DOKKU_ROOT to ~dokku if unspecified. Closes #587
 - #863: @josegonzalez Add missing properties to the php composer.json
-- #864: @michaelhobbs bind docker container to internal port if using vhosts
-- #867: @michaelhobbs silent grep stderr. closes #862
-- #868: @michaelhobbs use circleci for automated testing
-- #872: @michaelhobbs fix/enable multi buildpack test
-- #873: @michaelhobbs support pre deployment usage of domains plugin. fixes interface binding issue
+- #864: @michaelshobbs bind docker container to internal port if using vhosts
+- #867: @michaelshobbs silent grep stderr. closes #862
+- #868: @michaelshobbs use circleci for automated testing
+- #872: @michaelshobbs fix/enable multi buildpack test
+- #873: @michaelshobbs support pre deployment usage of domains plugin. fixes interface binding issue
 - #874: @josegonzalez Add advanced installation docs that were removed in #706. Closes #869
 - #876: @vincentfretin give CACHE_PATH env variable for forward compatibility with herokuish
-- #877: @michaelhobbs add MH to AUTHORS
-- #880: @michaelhobbs disable VHOST deployment if global VHOST file is missing and an app domain has not been added
+- #877: @michaelshobbs add MH to AUTHORS
+- #880: @michaelshobbs disable VHOST deployment if global VHOST file is missing and an app domain has not been added
 - #881: @jomo troubleshooting typo: 64 != 46
-- #884: @michaelhobbs IP and PORT are likely to get clobbered. rename them
-- #885: @michaelhobbs test deploy node app without procfile
+- #884: @michaelshobbs IP and PORT are likely to get clobbered. rename them
+- #885: @michaelshobbs test deploy node app without procfile
 
 ## 0.3.12
 
-- #846: @michaelhobbs add certificate CN to app VHOST if it's not already
+- #846: @michaelshobbs add certificate CN to app VHOST if it's not already
 - #847: @leonardodino Update bootstrap.sh: new docs url
 - #849: @cjoudrey Add docs for CHECKS
-- #850: @michaelhobbs test scala deployment
+- #850: @michaelshobbs test scala deployment
 
 ## 0.3.11
 
-- #821: @michaelhobbs use wercker for automated testing
-- #833: @michaelhobbs auto remove the cache dir cleanup container
-- #835: @michaelhobbs make sure we match the specific string in VHOST
-- #838: @michaelhobbs quote build_env vars to allow for spaces in config
-- #839: @michaelhobbs notify irc on builds
-- #844: @michaelhobbs build app urls based on wildcard ssl or app ssl
+- #821: @michaelshobbs use wercker for automated testing
+- #833: @michaelshobbs auto remove the cache dir cleanup container
+- #835: @michaelshobbs make sure we match the specific string in VHOST
+- #838: @michaelshobbs quote build_env vars to allow for spaces in config
+- #839: @michaelshobbs notify irc on builds
+- #844: @michaelshobbs build app urls based on wildcard ssl or app ssl
 
 ## 0.3.10
 
 - #783: @josegonzalez New domains plugin and nginx extension
-- #818: @michaelhobbs rebuild nginx config on domain change
-- #827: @michaelhobbs Handle IP only access
-- #828: @michaelhobbs Display the port for an app when falling back to the ip address
+- #818: @michaelshobbs rebuild nginx config on domain change
+- #827: @michaelshobbs Handle IP only access
+- #828: @michaelshobbs Display the port for an app when falling back to the ip address
 
 ## 0.3.9
 
-- #787: @josegonzalez/@michaelhobbs Official user-env-compile plugin
+- #787: @josegonzalez/@michaelshobbs Official user-env-compile plugin
   - Uses ENV and APP/ENV files
   - Supports old `BUILD_ENV` files (which are likely in wide-use)
   - Allows user's to override globals with app-specific configuration
@@ -174,7 +535,7 @@
 ## 0.3.4
 
 - #780: @josegonzalez Output error message when a command is not found. Closes #778
-- #781: @michaelhobbs use DOKKU_IMAGE (i.e. progrium/buildstep)
+- #781: @michaelshobbs use DOKKU_IMAGE (i.e. progrium/buildstep)
 
 ## 0.3.3
 
@@ -188,7 +549,7 @@
 
 ## 0.3.2
 
-- #675: @michaelhobbs port wait-to-retire from broadly/dokku
+- #675: @michaelshobbs port wait-to-retire from broadly/dokku
 - #765: @josegonzalez Ignore tls directory when listing apps
 - #766: @josegonzalez Sort output of apps command
 - #771: @josegonzalez Doc updates
@@ -220,9 +581,10 @@
 - 969aed87: @jfrazelle  Fix double brackets issue in nginx-vhosts install
 - 42fee25f: @rhy-jot Mention 14.04 & 12.10 sunset
 - 4f5fc586: @rhy-jot Update cipher list
-- #276: @joliv  Add dependencies hook - wingrunr21- #476: Added man page entry
+- #276: @wingrunr21 Add dependencies hook
+- #476: @joliv Added man page entry
 - #522: @wingrunr21 Improve SSL support and implement SPDY
-- #544: @jfrazelle  if dokku.conf has not been created, create it
+- #544: @jfrazelle if dokku.conf has not been created, create it
 - #555: @jakubholynet Readme fix, Env vars only set at run time
 - #562: @assaf Zero down-time deploy and server checks
 - #571: @joliv Added man page plugin command

Makefile

@@ -1,10 +1,12 @@
 DOKKU_VERSION = master
 
-SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand
-PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb
-STACK_URL ?= https://github.com/progrium/buildstep.git
-PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-12-16/2014-12-16_42bd9f4aab.tar.gz
-PLUGINS_PATH ?= /var/lib/dokku/plugins
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/progrium/sshcommand/master/sshcommand
+PLUGN_URL ?= https://github.com/progrium/plugn/releases/download/v0.1.0/plugn_0.1.0_linux_x86_64.tgz
+STACK_URL ?= https://github.com/gliderlabs/herokuish.git
+PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
+DOKKU_LIB_ROOT ?= /var/lib/dokku
+PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/plugins
+CORE_PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/core-plugins
 
 # If the first argument is "vagrant-dokku"...
 ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
@@ -14,7 +16,13 @@ ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
   $(eval $(RUN_ARGS):;@:)
 endif
 
-.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku
+ifeq ($(CIRCLECI),true)
+	BUILD_STACK_TARGETS = circleci deps build
+else
+	BUILD_STACK_TARGETS = build-in-docker
+endif
+
+.PHONY: all apt-update install version copyfiles man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku
 
 include tests.mk
 include deb.mk
@@ -22,14 +30,14 @@ include deb.mk
 all:
 	# Type "make install" to install.
 
-install: dependencies stack copyfiles plugin-dependencies plugins version
+install: dependencies version copyfiles plugin-dependencies plugins
 
 release: deb-all package_cloud packer
 
 package_cloud:
-	package_cloud push dokku/dokku/ubuntu/trusty buildstep*.deb
+	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 pluginhook*.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
 
@@ -38,13 +46,21 @@ packer:
 
 copyfiles:
 	cp dokku /usr/local/bin/dokku
-	mkdir -p ${PLUGINS_PATH}
-	find ${PLUGINS_PATH} -mindepth 2 -maxdepth 2 -name '.core' -printf '%h\0' | xargs -0 rm -Rf
+	mkdir -p ${CORE_PLUGINS_PATH} ${PLUGINS_PATH}
+	rm -rf ${CORE_PLUGINS_PATH}/*
+	test -d ${CORE_PLUGINS_PATH}/enabled || PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn init
+	test -d ${PLUGINS_PATH}/enabled || PLUGIN_PATH=${PLUGINS_PATH} plugn init
 	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do \
-		rm -Rf ${PLUGINS_PATH}/$$plugin && \
-		cp -R plugins/$$plugin ${PLUGINS_PATH} && \
-		touch ${PLUGINS_PATH}/$$plugin/.core; \
+		rm -Rf ${CORE_PLUGINS_PATH}/available/$$plugin && \
+		rm -Rf ${PLUGINS_PATH}/available/$$plugin && \
+		rm -rf ${CORE_PLUGINS_PATH}/$$plugin && \
+		rm -rf ${PLUGINS_PATH}/$$plugin && \
+		cp -R plugins/$$plugin ${CORE_PLUGINS_PATH}/available && \
+		ln -s ${CORE_PLUGINS_PATH}/available/$$plugin ${PLUGINS_PATH}/available; \
+		PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn enable $$plugin ;\
+		PLUGIN_PATH=${PLUGINS_PATH} plugn enable $$plugin ;\
 		done
+	chown dokku:dokku -R ${PLUGINS_PATH} ${CORE_PLUGINS_PATH}
 	$(MAKE) addman
 
 addman:
@@ -55,39 +71,44 @@ addman:
 version:
 	git describe --tags > ~dokku/VERSION  2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
 
-plugin-dependencies: pluginhook
-	dokku plugins-install-dependencies
+plugin-dependencies: plugn
+	dokku plugin:install-dependencies --core
 
-plugins: pluginhook docker
-	dokku plugins-install
+plugins: plugn docker
+	dokku plugin:install --core
 
-dependencies: sshcommand pluginhook docker stack help2man
+dependencies: apt-update sshcommand plugn docker help2man man-db
+	$(MAKE) -e stack
+
+apt-update:
+	apt-get update
 
 help2man:
 	apt-get install -qq -y help2man
 
+man-db:
+	apt-get install -qq -y man-db
+
 sshcommand:
 	wget -qO /usr/local/bin/sshcommand ${SSHCOMMAND_URL}
 	chmod +x /usr/local/bin/sshcommand
 	sshcommand create dokku /usr/local/bin/dokku
 
-pluginhook:
-	wget -qO /tmp/pluginhook_0.1.0_amd64.deb ${PLUGINHOOK_URL}
-	dpkg -i /tmp/pluginhook_0.1.0_amd64.deb
+plugn:
+	wget -qO /tmp/plugn_latest.tgz ${PLUGN_URL}
+	tar xzf /tmp/plugn_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
-	curl --silent https://get.docker.com/gpg | apt-key add -
-	echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
-	apt-get update
+ifndef CI
+	curl -sSL https://get.docker.com/ | sh
 ifdef DOCKER_VERSION
-	apt-get install -qq -y lxc-docker-${DOCKER_VERSION}
-else
-	apt-get install -qq -y lxc-docker
+	apt-get install -qq -y docker-engine=${DOCKER_VERSION} || (apt-cache madison docker-engine ; exit 1)
 endif
 	sleep 2 # give docker a moment i guess
+endif
 
 aufs:
 ifndef CI
@@ -95,22 +116,28 @@ ifndef CI
 endif
 
 stack:
-ifeq ($(shell test -e /var/run/docker.sock && touch -a -c /var/run/docker.sock && echo $$?),0)
-	@echo "Start building buildstep"
+ifeq ($(shell test -e /var/run/docker.sock && touch -c /var/run/docker.sock && echo $$?),0)
 ifdef BUILD_STACK
-	@docker images | grep progrium/buildstep || (git clone ${STACK_URL} /tmp/buildstep && docker build -t progrium/buildstep /tmp/buildstep && rm -rf /tmp/buildstep)
+	@echo "Start building herokuish from source"
+	docker images | grep gliderlabs/herokuish || (git clone ${STACK_URL} /tmp/herokuish && cd /tmp/herokuish && IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest VERSION=master make -e ${BUILD_STACK_TARGETS} && rm -rf /tmp/herokuish)
 else
-	@docker images | grep progrium/buildstep || curl --silent -L ${PREBUILT_STACK_URL} | gunzip -cd | docker import - progrium/buildstep
+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
+else
+	@echo "Start pulling herokuish from ${PREBUILT_STACK_URL}"
+	docker images | grep gliderlabs/herokuish || docker pull ${PREBUILT_STACK_URL}
+endif
 endif
 endif
 
 count:
 	@echo "Core lines:"
-	@cat dokku bootstrap.sh | egrep -v "^$$" | wc -l
+	@cat dokku bootstrap.sh | sed 's/^$$//g' | wc -l
 	@echo "Plugin lines:"
-	@find plugins -type f | xargs cat | egrep -v "^$$" | wc -l
+	@find plugins -type f -not -name .DS_Store | xargs cat | sed 's/^$$//g' | wc -l
 	@echo "Test lines:"
-	@find tests -type f | xargs cat | egrep -v "^$$" |wc -l
+	@find tests -type f -not -name .DS_Store | xargs cat | sed 's/^$$//g' | wc -l
 
 dokku-installer:
 	apt-get install -qq -y ruby

README.md

@@ -1,4 +1,4 @@
-# Dokku [![Build Status](https://circleci.com/gh/progrium/dokku/tree/master.svg?style=svg&circle-token=eec5b442dda53a4d229911dd97d4214853acc262 "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)
+# 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/)
 
 Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. Sponsored by our friends at [Deis](http://deis.io/).
 
@@ -8,9 +8,10 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S
 
 ## Installing
 
-To install the latest stable release, you can run the following command as a user that has access to `sudo`:
+To install the latest stable release, you can run the following commands as a user that has access to `sudo`:
 
-    wget -qO- https://raw.github.com/progrium/dokku/v0.3.16/bootstrap.sh | sudo DOKKU_TAG=v0.3.16 bash
+    wget https://raw.githubusercontent.com/progrium/dokku/v0.4.2/bootstrap.sh
+    sudo DOKKU_TAG=v0.4.2 bash bootstrap.sh
 
 ### Upgrading
 
@@ -18,12 +19,18 @@ To install the latest stable release, you can run the following command as a use
 
 ## Documentation
 
-Full documentation - including advanced installation docs - are available online at [docs](http://progrium.viewdocs.io/dokku/index)
+Full documentation - including advanced installation docs - are available online at [docs](http://progrium.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)
 
+## 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.
+
+While we may not merge your PR as is, they serve to start conversations and improve the general dokku experience for all users.
+
 ## Sponsors
 
 Dokku is currently sponsored by the enterprise grade, multi-host PaaS project [Deis](http://deis.io/).

Vagrantfile

@@ -1,15 +1,15 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-BOX_NAME = ENV["BOX_NAME"] || "trusty"
-BOX_URI = ENV["BOX_URI"] || "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-14.04"
 BOX_MEMORY = ENV["BOX_MEMORY"] || "1024"
 DOKKU_DOMAIN = ENV["DOKKU_DOMAIN"] || "dokku.me"
 DOKKU_IP = ENV["DOKKU_IP"] || "10.0.0.2"
+FORWARDED_PORT = (ENV["FORWARDED_PORT"] || '8080').to_i
 PREBUILT_STACK_URL = File.exist?("#{File.dirname(__FILE__)}/stack.tgz") ? 'file:///root/dokku/stack.tgz' : nil
 PUBLIC_KEY_PATH = "#{Dir.home}/.ssh/id_rsa.pub"
 
-make_cmd = "make install"
+make_cmd = "DEBIAN_FRONTEND=noninteractive make -e install"
 if PREBUILT_STACK_URL
   make_cmd = "PREBUILT_STACK_URL='#{PREBUILT_STACK_URL}' #{make_cmd}"
 end
@@ -18,7 +18,6 @@ Vagrant::configure("2") do |config|
   config.ssh.forward_agent = true
 
   config.vm.box = BOX_NAME
-  config.vm.box_url = BOX_URI
   config.vm.synced_folder File.dirname(__FILE__), "/root/dokku"
 
   config.vm.provider :virtualbox do |vb|
@@ -32,27 +31,30 @@ Vagrant::configure("2") do |config|
   config.vm.define "empty", autostart: false
 
   config.vm.define "dokku", primary: true do |vm|
-    vm.vm.network :forwarded_port, guest: 80, host: 8080
+    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
-    vm.vm.provision :shell, :inline => "apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
+    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
     vm.vm.provision :shell, :inline => "cd /root/dokku && make dokku-installer"
   end
 
   config.vm.define "dokku-deb", autostart: false do |vm|
-    vm.vm.network :forwarded_port, guest: 80, host: 8080
+    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 /root/dokku && make install-from-deb"
   end
 
   config.vm.define "build", autostart: false do |vm|
-    vm.vm.provision :shell, :inline => "apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
+    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
+    vm.vm.hostname = "#{DOKKU_DOMAIN}"
+    vm.vm.network :private_network, ip: DOKKU_IP
+    vm.vm.provision :shell, :inline => "apt-get update > /dev/null && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
     vm.vm.provision :shell, :inline => "cd /root/dokku && make deb-all"
   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 && cp /tmp/id_rsa.pub /root/.ssh/authorized_keys"
+    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"
   end
 end

bootstrap.sh

@@ -1,36 +1,101 @@
-#!/usr/bin/env bash
+#!/bin/bash
+#
 # 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
+# until the entire script is downloaded.
+# That's good because it prevents our output overlapping with curl's.
+# It also means that we can't run a partially downloaded script.
+
+
+bootstrap () {
+
+
 set -eo pipefail
 export DEBIAN_FRONTEND=noninteractive
 export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}
 
-if ! command -v apt-get &>/dev/null
-then
+echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
+if ! command -v apt-get &>/dev/null; then
   echo "This installation script requires apt-get. For manual installation instructions, consult http://progrium.viewdocs.io/dokku/advanced-installation ."
   exit 1
 fi
 
-apt-get update
-apt-get install -qq -y git make curl software-properties-common man-db help2man
-
+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
 
-cd ~
-test -d dokku || git clone $DOKKU_REPO
-cd dokku
-git fetch origin
+dokku_install_source() {
+  apt-get install -qq -y git make software-properties-common
+  cd /root
+  if [[ ! -d /root/dokku ]]; then
+    git clone $DOKKU_REPO /root/dokku
+  fi
+
+  cd /root/dokku
+  git fetch origin
+  git checkout $DOKKU_CHECKOUT
+  make install
+}
+
+dokku_install_package() {
+  echo "--> Initial apt-get update"
+  apt-get update -qq > /dev/null
+  apt-get install -qq -y 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 "    Installation will continue in 10 seconds."
+    sleep 10
+  fi
+  curl -sSL 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" | tee /etc/apt/sources.list.d/dokku.list
+  apt-get update -qq > /dev/null
+
+  if [[ -n $DOKKU_CHECKOUT ]]; then
+    apt-get install -y dokku=$DOKKU_CHECKOUT
+  else
+    apt-get install -y dokku
+  fi
+}
 
 if [[ -n $DOKKU_BRANCH ]]; then
-  git checkout origin/$DOKKU_BRANCH
+  export DOKKU_CHECKOUT="origin/$DOKKU_BRANCH"
+  dokku_install_source
 elif [[ -n $DOKKU_TAG ]]; then
-  git checkout $DOKKU_TAG
+  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
 
-make install
+}
 
-echo
-echo "Almost done! For next steps on configuration:"
-echo "  http://progrium.viewdocs.io/dokku/installation#user-content-configuring"
+bootstrap

circle.yml

@@ -5,19 +5,9 @@ dependencies:
   cache_directories:
     - "~/docker"
   override:
-    # need to add the dokku user to the docker group
-    - sudo -E CI=true make -e sshcommand
-    - sudo usermod -G docker dokku
-    - sudo -E CI=true DOCKER_VERSION=1.5.0 make -e install: { timeout: 300 }
-    - make -e ci-dependencies
-    #### circle does some weird *expletive* with regards to root and gh auth (needed for gitsubmodules test)
-    - sudo rsync -a ~ubuntu/.ssh/ ~root/.ssh/
-    - sudo chown -R root:root ~root/.ssh/
-    - sudo sed -e 's:/home/ubuntu:/root:g' ~root/.ssh/config
-    ####
-    - sudo -E make -e setup-deploy-tests
+    - ./tests/ci/parallel_runner.sh setup: { timeout: 300 }
   post:
     - sudo -E make -e lint
 test:
   override:
-    - ./tests/ci/parallel_runner.sh: { parallel: true, timeout: 1800 }
+    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 1800 }

contrib/dokku-installer.rb

@@ -21,9 +21,9 @@ if ARGV[0] == "onboot"
   exit
 end
 
-version   = "v0.3.16"
+version   = "v0.4.2"
 dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
-admin_key   = `cat /root/.ssh/authorized_keys`.split("\n").first
+admin_keys  = `cat /root/.ssh/authorized_keys`.split("\n")
 hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
 template  = DATA.read
 
@@ -42,7 +42,10 @@ post "/setup" do
     `rm #{dokku_root}/VHOST`
   end
   File.open("#{dokku_root}/HOSTNAME", "w") {|f| f.write params[:hostname] }
-  Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => params[:key])
+  keys = params[:keys].split("\n")
+  keys.each do |k|
+    Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => k)
+  end
   Thread.new {
     `rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start`
     `rm /etc/init/dokku-installer.conf && stop dokku-installer`
@@ -63,7 +66,7 @@ __END__
     <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="key" rows="7" id="key"><%= admin_key %></textarea>
+      <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>

contrib/dokku_client.sh

@@ -6,7 +6,7 @@ NAMES=(SEED GRASS FLOWE SHAD CABR SNAKE GOLD COW GUIKI PEDAL DELAN B-FLY BIDE KE
 
 random_number() {
   [[ -n "$1" ]] && RANGE="$1"
-  if [[ -n "$RANGE" ]];then
+  if [[ -n "$RANGE" ]]; then
     number=$RANDOM
     let "number %= $RANGE"
   else
@@ -46,7 +46,7 @@ if [[ ! -z $DOKKU_HOST ]]; then
     appname=""
     if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
       set +e
-      appname=$(git remote -v 2>/dev/null | grep -Ei "^dokku" | head -n 1 | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
+      appname=$(git remote -v 2>/dev/null | grep -Ei "dokku@$DOKKU_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
       set -e
     else
       echo "This is not a git repository"
@@ -58,7 +58,7 @@ if [[ ! -z $DOKKU_HOST ]]; then
           true
           ;;
         apps:destroy)
-          if [[ -z "$2" ]] || [[ "$2" == "force" ]];then
+          if [[ -z "$2" ]] || [[ "$2" == "force" ]]; then
             donotshift="YES"
           fi
           ;;
@@ -72,7 +72,7 @@ if [[ ! -z $DOKKU_HOST ]]; then
       appname=$(random_name)
       counter=0
       while ssh "dokku@$DOKKU_HOST" apps 2>/dev/null| grep -q "$appname"; do
-        if [[ $counter -ge 100 ]];then
+        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
@@ -94,7 +94,7 @@ if [[ ! -z $DOKKU_HOST ]]; then
     fi
 
     if [[ -z "$donotshift" ]]; then
-      ssh "dokku@$DOKKU_HOST" "$@"
+      ssh -t "dokku@$DOKKU_HOST" "$@"
       exit $?
     fi
 
@@ -102,11 +102,16 @@ if [[ ! -z $DOKKU_HOST ]]; then
       if [[ ! "$1" =~ --* ]]; then
         verb=$1
         shift
+
+        if [[ "$1" == "$appname" ]]; then
+          shift
+        fi
+
         args="$*"
       else
         long_args="--"
-        for arg in "$@";do
-          if [[ "$arg" =~ --* ]];then
+        for arg in "$@"; do
+          if [[ "$arg" =~ --* ]]; then
             long_args+=" $arg"
             args=("${args[@]/$arg}")
           else
@@ -116,10 +121,10 @@ if [[ ! -z $DOKKU_HOST ]]; then
       fi
     fi
     # shellcheck disable=SC2086
-    ssh "dokku@$DOKKU_HOST" $long_args "$verb" "$appname" "${args[@]}"
+    ssh -t "dokku@$DOKKU_HOST" $long_args "$verb" "$appname" "${args[@]}"
   }
 
-  if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]]; then
+  if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then
     _dokku "$@"
     exit $?
   fi

contrib/packer.json

@@ -19,7 +19,7 @@
         "sleep 30",
 
         "echo '--> Updating apt repositories'",
-        "sudo apt-get update > /dev/null",
+        "sudo apt-get update -qq > /dev/null",
 
         "echo '--> Installing make requirement'",
         "sudo apt-get -qq -y install build-essential",

contrib/stackscript.sh

@@ -3,15 +3,15 @@
 # <UDF name="ssh_key" default="" label="Public SSH Key for root user" example="Sets the root user's public ssh key, which is also automatically imported into the dokku installer">
 # <UDF name="notify_email" default="" Label="Send Finish Notification To" example="Email address to send notification to when finished." />
 
-function logit {
+logit() {
   # Simple logging function that prepends an easy-to-find marker '=> ' and a timestamp to a message
   TIMESTAMP=$(date -u +'%m/%d %H:%M:%S')
   MSG="=> ${TIMESTAMP} $1"
   echo ${MSG}
 }
 
-function set_ssh_key {
-  if [ -n "${SSH_KEY}" ]; then
+set_ssh_key() {
+  if [[ -n "${SSH_KEY}" ]]; then
     logit "Setting root ssh key"
     mkdir -p /root/.ssh
     chmod 700 /root/.ssh
@@ -21,20 +21,20 @@ function set_ssh_key {
   fi
 }
 
-function set_passwordless_ssh {
+set_passwordless_ssh() {
   logit "Turn off password authentication and root login for SSH"
   echo 'PasswordAuthentication no' >> /etc/ssh/sshd_config
   service ssh restart
 }
 
-function system_primary_ip {
+system_primary_ip() {
   # returns the primary IP assigned to eth0
   ifconfig eth0 | awk -F: '/inet addr:/ {print $2}' | awk '{ print $1 }'
 }
 
-function set_hostname {
+set_hostname() {
   logit "Set up hostname"
-  if [ -n "${HOSTNAME}" ]; then
+  if [[ -n "${HOSTNAME}" ]]; then
     echo $HOSTNAME > /etc/hostname
     echo $IPADDR $FQDN $HOSTNAME >> /etc/hosts
   else
@@ -46,7 +46,7 @@ function set_hostname {
   hostname -F /etc/hostname
 }
 
-function postfix_install_loopback_only {
+postfix_install_loopback_only() {
   logit "Installing and configuring Postfix"
   # Installs postfix and configure to listen only on the local interface. Also
   # allows for local mail delivery
@@ -62,8 +62,8 @@ function postfix_install_loopback_only {
   touch /tmp/restart-postfix
 }
 
-function notify_install_via_email {
-  if [ -n "${NOTIFY_EMAIL}" ]; then
+notify_install_via_email() {
+  if [[ -n "${NOTIFY_EMAIL}" ]]; then
     logit "Sending notification email to ${NOTIFY_EMAIL}"
     /usr/sbin/sendmail "${NOTIFY_EMAIL}" <<EOD
 To: ${NOTIFY_EMAIL}
@@ -77,8 +77,8 @@ EOD
   fi
 }
 
-function notify_restart_via_email {
-  if [ -n "${NOTIFY_EMAIL}" ]; then
+notify_restart_via_email() {
+  if [[ -n "${NOTIFY_EMAIL}" ]]; then
     logit "Sending notification email to ${NOTIFY_EMAIL} of required restart"
     /usr/sbin/sendmail "${NOTIFY_EMAIL}" <<EOD
 To: ${NOTIFY_EMAIL}
@@ -96,14 +96,14 @@ Before restarting, please go to this url:
 Then click "Edit" next to the selected configuration profile and make the following changes:
 
 - Change the "Kernel" option to the current "pv-grub" release
-- Set the "Xenify Distro" option to "no"
+- Set the "Distro helper" option to "no"
 
 Then save your changes. Next, reboot the instance from the Linode Dashboard. You'll receive an email once the instance is available to continue the dokku installation.
 EOD
   fi
 }
 
-function setup_linode {
+setup_linode() {
   logit "Installing via linode"
   DEBIAN_FRONTEND=noninteractive apt-get install -qq -y linux-virtual
   DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y grub2 grub-pc
@@ -115,7 +115,7 @@ function setup_linode {
   update-grub
 
   cp /etc/rc.local /etc/rc.local-bak
-  cat << EOF > /etc/rc.local
+  cat << "EOF" > /etc/rc.local
 #!/bin/sh -e
 sudo apt-get update >> /root/setup_linode.txt 2>&1
 sudo apt-get install -y linux-image-extra-"$(uname -r)" >> /root/setup_linode.txt 2>&1
@@ -133,30 +133,21 @@ EOF
   chmod +x /etc/rc.local
 }
 
-function install_prerequisites {
-  sudo apt-get install -qq -y curl > /dev/null 2>&1
-
-  logit "Installing docker gpg key"
-  curl --silent https://get.docker.com/gpg 2> /dev/null | apt-key add - > /dev/null 2>&1
-
-  logit "Installing dokku gpg key"
-  curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
-
-  logit "Running apt-get update"
-  sudo apt-get update > /dev/null
-
+install_prerequisites() {
   logit "Installing pre-requisites"
-  sudo apt-get install -qq -y apt-transport-https > /dev/null 2>&1
+  sudo apt-get update -qq > /dev/null
+  sudo apt-get install -qq -y apt-transport-https curl > /dev/null 2>&1
 
-  logit "Setting up apt repositories"
-  echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
+  logit "Installing docker"
+  curl -sSL https://get.docker.com/ | sh
+
+  logit "Installing dokku"
+  curl -sSL https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - > /dev/null 2>&1
   echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
-
-  logit "Running apt-get update"
-  sudo apt-get update > /dev/null
+  sudo apt-get update -qq > /dev/null
 }
 
-function install_dokku {
+install_dokku() {
   logit "Installing pre-requisites"
   sudo apt-get install -qq -y linux-image-extra-"$(uname -r)" > /dev/null 2>&1
 
@@ -174,7 +165,7 @@ postfix_install_loopback_only
 set_hostname
 install_prerequisites
 
-if [ -n "$LINODE_ID" ]; then
+if [[ -n "$LINODE_ID" ]]; then
   setup_linode
   notify_restart_via_email
 else

deb.mk

@@ -1,22 +1,22 @@
-BUILDSTEP_DESCRIPTION = 'Buildstep uses Docker and Buildpacks to build applications like Heroku'
-BUILDSTEP_REPO_NAME ?= progrium/buildstep
-BUILDSTEP_VERSION ?= 0.0.1
-BUILDSTEP_ARCHITECTURE = amd64
-BUILDSTEP_PACKAGE_NAME = buildstep_$(BUILDSTEP_VERSION)_$(BUILDSTEP_ARCHITECTURE).deb
+HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
+HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
+HEROKUISH_VERSION ?= 0.3.3
+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_ARCHITECTURE = amd64
 
-PLUGINHOOK_DESCRIPTION = 'Simple dispatcher and protocol for shell-based plugins, an improvement to hook scripts'
-PLUGINHOOK_REPO_NAME ?= progrium/pluginhook
-PLUGINHOOK_VERSION ?= 0.0.1
-PLUGINHOOK_ARCHITECTURE = amd64
-PLUGINHOOK_PACKAGE_NAME = pluginhook_$(PLUGINHOOK_VERSION)_$(PLUGINHOOK_ARCHITECTURE).deb
+PLUGN_DESCRIPTION = 'Hook system that lets users extend your application with plugins'
+PLUGN_REPO_NAME ?= progrium/plugn
+PLUGN_VERSION ?= 0.2.0
+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_VERSION ?= 0.0.1
+SSHCOMMAND_VERSION ?= 0.1.0
 SSHCOMMAND_ARCHITECTURE = amd64
 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
 
@@ -26,70 +26,58 @@ GOROOT = /usr/lib/go
 GOBIN = /usr/bin/go
 GOPATH = /home/vagrant/gocode
 
-.PHONY: install-from-deb deb-all deb-buildstep deb-dokku deb-gems deb-pluginhook deb-setup deb-sshcommand
+.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-gems deb-plugn deb-setup deb-sshcommand
 
 install-from-deb:
 	echo "--> Initial apt-get update"
-	sudo apt-get update > /dev/null
-	sudo apt-get install -y apt-transport-https
+	sudo apt-get update -qq > /dev/null
+	sudo apt-get install -qq -y apt-transport-https curl
 
-	echo "--> Installing docker gpg key"
-	curl --silent https://get.docker.com/gpg 2> /dev/null | apt-key add - 2>&1 >/dev/null
-
-	echo "--> Installing dokku gpg key"
-	curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null
-
-	echo "--> Setting up apt repositories"
-	echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
-	echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" > /etc/apt/sources.list.d/dokku.list
-
-	echo "--> Running apt-get update"
-	sudo apt-get update > /dev/null
-
-	echo "--> Installing pre-requisites"
-	sudo apt-get install -y linux-image-extra-`uname -r`
+	echo "--> Installing docker"
+	curl -sSL https://get.docker.com/ | sh
 
 	echo "--> Installing dokku"
-	sudo apt-get install -y 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
+	sudo apt-get update -qq > /dev/null
+	sudo apt-get install dokku
 
-	echo "--> Done!"
-
-deb-all: deb-buildstep deb-dokku deb-gems deb-pluginhook deb-sshcommand
+deb-all: deb-herokuish deb-dokku deb-gems deb-plugn deb-sshcommand
 	mv /tmp/*.deb .
 	echo "Done"
 
 deb-setup:
 	echo "-> Updating deb repository and installing build requirements"
-	sudo apt-get update > /dev/null
-	sudo apt-get install -qq -y git ruby1.9.1-dev 2>&1 > /dev/null
+	sudo apt-get update -qq > /dev/null
+	sudo apt-get install -qq -y gcc git ruby1.9.1-dev 2>&1 > /dev/null
 	command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
 	ssh -o StrictHostKeyChecking=no git@github.com || true
 
-deb-buildstep: deb-setup
-	rm -rf /tmp/tmp /tmp/build $(BUILDSTEP_PACKAGE_NAME)
+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 progrium/buildstep | wc -l\`" >> /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 buildstep image'" >> /tmp/tmp/post-install
-	echo "  sudo docker rmi progrium/buildstep" >> /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 buildstep into docker (around 5 minutes)'" >> /tmp/tmp/post-install
-	echo "sudo docker build -t progrium/buildstep /var/lib/buildstep 1> /dev/null" >> /tmp/tmp/post-install
+	echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install
+	echo "sudo docker build -t gliderlabs/herokuish /var/lib/herokuish 1> /dev/null" >> /tmp/tmp/post-install
 
 	echo "-> Cloning repository"
-	git clone -q "git@github.com:$(BUILDSTEP_REPO_NAME).git" /tmp/tmp/buildstep > /dev/null
-	rm -rf /tmp/tmp/buildstep/.git /tmp/tmp/buildstep/.gitignore
+	git clone -q "git@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"
 	mkdir -p "/tmp/build/var/lib"
-	cp -rf /tmp/tmp/buildstep /tmp/build/var/lib/buildstep
+	cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish
 
-	echo "-> Creating $(BUILDSTEP_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n buildstep -v $(BUILDSTEP_VERSION) -a $(BUILDSTEP_ARCHITECTURE) -p $(BUILDSTEP_PACKAGE_NAME) --deb-pre-depends 'lxc-docker >= 1.4.0' --after-install /tmp/tmp/post-install --url "https://github.com/$(BUILDSTEP_REPO_NAME)" --description $(BUILDSTEP_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 | docker-engine-cs' --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
@@ -98,13 +86,13 @@ deb-dokku: deb-setup
 
 	cp -r debian /tmp/build/DEBIAN
 	mkdir -p /tmp/build/usr/local/bin
-	mkdir -p /tmp/build/var/lib/dokku
+	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
 
 	cp dokku /tmp/build/usr/local/bin
-	cp -r plugins /tmp/build/var/lib/dokku
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/plugins/$$plugin/.core; done
+	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
@@ -128,23 +116,24 @@ deb-gems: deb-setup
 	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-pluginhook: deb-setup
-	rm -rf /tmp/tmp /tmp/build $(PLUGINHOOK_PACKAGE_NAME)
+deb-plugn: deb-setup
+	rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME)
 	mkdir -p /tmp/tmp /tmp/build
 
 	echo "-> Cloning repository"
-	git clone -q "git@github.com:$(PLUGINHOOK_REPO_NAME).git" /tmp/tmp/pluginhook > /dev/null
-	rm -rf /tmp/tmp/pluginhook/.git /tmp/tmp/pluginhook/.gitignore
+	git clone -q "git@github.com:$(PLUGN_REPO_NAME).git" /tmp/tmp/plugn > /dev/null
+	rm -rf /tmp/tmp/plugn/.git /tmp/tmp/plugn/.gitignore
 
 	echo "-> Copying files into place"
 	mkdir -p /tmp/build/usr/local/bin $(GOPATH)
+	sudo apt-get update -qq > /dev/null
 	sudo apt-get install -qq -y git golang mercurial 2>&1 > /dev/null
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && go get "code.google.com/p/go.crypto/ssh/terminal"
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && cd /tmp/tmp/pluginhook && go build -o pluginhook
-	mv /tmp/tmp/pluginhook/pluginhook /tmp/build/usr/local/bin/pluginhook
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && cd /tmp/tmp/plugn && make deps
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH) && cd /tmp/tmp/plugn && go build -o plugn
+	mv /tmp/tmp/plugn/plugn /tmp/build/usr/local/bin/plugn
 
-	echo "-> Creating $(PLUGINHOOK_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n pluginhook -v $(PLUGINHOOK_VERSION) -a $(PLUGINHOOK_ARCHITECTURE) -p $(PLUGINHOOK_PACKAGE_NAME) --url "https://github.com/$(PLUGINHOOK_REPO_NAME)" --description $(PLUGINHOOK_DESCRIPTION) --license 'MIT License' .
+	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

debian/config

@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+readonly ACTION="${1:-configure}"
+readonly VERSION="${2:-dev}"
+
+db_input "high" "dokku/web_config" || true
+db_go || true
+
+db_get "dokku/web_config"
+if [ $RET = "true" ]; then
+    exit 0
+fi
+
+db_input "high" "dokku/hostname" || true
+db_input "high" "dokku/vhost_enable" || true
+if [ "$ACTION" != "reconfigure" ]; then
+  db_input "high" "dokku/key_file" || true
+fi
+db_go || true

debian/control

@@ -3,8 +3,7 @@ Version: 0.3.12
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, software-properties-common, lxc-docker (>= 1.4.0), gcc, python-software-properties, man-db, buildstep, sshcommand, pluginhook
-Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroup-lite
-Provides: dokku
+Depends: locales, git, make, curl, software-properties-common, docker-engine | docker-engine-cs | lxc-docker, gcc, python-software-properties, man-db, herokuish, sshcommand
+Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroupfs-mount | cgroup-lite, plugn
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 Description: Docker powered mini-Heroku in around 100 lines of Bash

debian/postinst

@@ -1,6 +1,10 @@
 #!/bin/sh
 set -e
 
+. /usr/share/debconf/confmodule
+
+readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
+
 case "$1" in
   abort-upgrade|abort-remove|abort-deconfigure)
     ;;
@@ -12,13 +16,62 @@ case "$1" in
     sshcommand create dokku /usr/local/bin/dokku
     egrep -i "^docker" /etc/group || groupadd docker
     usermod -aG docker dokku
-    dokku plugins-install
+
+    # setup plugin directories
+    # should be replaced by `plugn init`
+    mkdir -p /var/lib/dokku/core-plugins/available /var/lib/dokku/plugins/available
+    mkdir -p /var/lib/dokku/core-plugins/enabled /var/lib/dokku/plugins/enabled
+    touch /var/lib/dokku/core-plugins/config.toml /var/lib/dokku/plugins/config.toml
+
+    # migrate old plugins
+    find /var/lib/dokku/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read 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;
+      fi
+    done
+
+    # enable all core plugins
+    find /var/lib/dokku/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do
+      if [ ! -d /var/lib/dokku/plugins/available/$plugin ]; then
+        ln -s /var/lib/dokku/core-plugins/available/$plugin /var/lib/dokku/plugins/available/$plugin;
+        PLUGIN_PATH=/var/lib/dokku/core-plugins plugn enable $plugin
+        PLUGIN_PATH=/var/lib/dokku/plugins plugn enable $plugin
+      fi
+    done
+
+    dokku plugin:install --core
+
     rm -f /home/dokku/VERSION
     cp /var/lib/dokku/STABLE_VERSION /home/dokku/VERSION
 
     if [ -f /etc/init/dokku-installer.conf ] && service dokku-installer status 2> /dev/null | grep waiting; then
         sudo service dokku-installer start
     fi
+
+    db_get "dokku/web_config"
+    if [ "$RET" = "true" ]; then
+      exit 0
+    fi
+
+    db_get "dokku/vhost_enable"
+    if [ "$RET" = "true" ]; then
+        db_get "dokku/hostname"
+        echo "$RET" > "${DOKKU_ROOT}/VHOST"
+    else
+        rm -f "${DOKKU_ROOT}/VHOST"
+    fi
+
+    db_get "dokku/hostname"
+    echo "$RET" > "${DOKKU_ROOT}/HOSTNAME"
+
+    if [ -z "${DEBCONF_RECONFIGURE}" ]; then
+      db_get "dokku/key_file"
+      sshcommand acl-add dokku default < "$RET"
+    fi
     ;;
 
   *)

debian/preinst

@@ -1,28 +1,47 @@
 #!/bin/sh
 set -e
 
+. /usr/share/debconf/confmodule
+
 case "$1" in
   install)
-    INIT_CONF="/etc/init/dokku-installer.conf"
-    NGINX_CONF="/etc/nginx/conf.d/dokku-installer.conf"
+    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 $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
-    echo 'upstream dokku-installer { server 127.0.0.1:2000; }' >> $NGINX_CONF
-    echo 'server {' >> $NGINX_CONF
-    echo '  listen      80;' >> $NGINX_CONF
-    echo '  location    / {' >> $NGINX_CONF
-    echo '    proxy_pass  http://dokku-installer;' >> $NGINX_CONF
-    echo '  }' >> $NGINX_CONF
-    echo '}' >> $NGINX_CONF
+      rm -f $NGINX_CONF
+      touch $NGINX_CONF
 
-    rm -f /etc/nginx/sites-enabled/*
-    service nginx reload
+      {
+        echo 'upstream dokku-installer { server 127.0.0.1:2000; }'
+        echo 'server {'
+        echo '  listen      80;'
+        echo '  location    / {'
+        echo '    proxy_pass  http://dokku-installer;'
+        echo '  }'
+        echo '}'
+      } >> $NGINX_CONF
+
+      rm -f /etc/nginx/sites-enabled/*
+      service nginx reload || /etc/init.d/nginx reload
+      exit 0
+    fi
+
+    if [ -z "${DEBCONF_RECONFIGURE}" ]; then
+      db_get "dokku/key_file"
+      if [ ! -f "$RET" ]; then
+          echo "Error: keyfile '$RET' not found."
+          echo "       you can enter a new keyfile path when you restart the installation."
+          db_reset "dokku/key_file"
+          exit 1
+      fi
+    fi
     ;;
 
   upgrade)

debian/templates

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

docs/advanced-installation.md

@@ -3,7 +3,7 @@
 You can always install dokku straight from the latest - potentially unstable - master release via the following bash command:
 
 ```shell
-wget -qO- https://raw.github.com/progrium/dokku/master/bootstrap.sh | sudo bash
+wget -qO- https://raw.githubusercontent.com/progrium/dokku/master/bootstrap.sh | sudo DOKKU_BRANCH=master bash
 ```
 
 ## Development
@@ -16,10 +16,10 @@ cd dokku
 sudo make install
 ```
 
-The `Makefile` allows source URLs to be overridden to include customizations from your own repositories. The `DOCKER_URL`, `PLUGINHOOK_URL`, `SSHCOMMAND_URL` and `STACK_URL` environment variables may be set to override the defaults (see the `Makefile` for how these apply). Example:
+The `Makefile` allows source URLs to be overridden to include customizations from your own repositories. The `DOCKER_URL`, `PLUGN_URL`, `SSHCOMMAND_URL` and `STACK_URL` environment variables may be set to override the defaults (see the `Makefile` for how these apply). Example:
 
 ```shell
-sudo SSHCOMMAND_URL=https://raw.github.com/yourusername/sshcommand/master/gitreceive make install
+sudo SSHCOMMAND_URL=https://raw.githubusercontent.com/yourusername/sshcommand/master/sshcommand make install
 ```
 
 ## Bootstrap a server from your own repository
@@ -27,19 +27,19 @@ sudo SSHCOMMAND_URL=https://raw.github.com/yourusername/sshcommand/master/gitrec
 The bootstrap script allows the dokku repository URL to be overridden to bootstrap a host from your own clone of dokku using the `DOKKU_REPO` environment variable. Example:
 
 ```shell
-wget https://raw.github.com/progrium/dokku/master/bootstrap.sh
+wget https://raw.githubusercontent.com/progrium/dokku/master/bootstrap.sh
 chmod +x bootstrap.sh
-sudo DOKKU_REPO=https://github.com/yourusername/dokku.git ./bootstrap.sh
+sudo DOKKU_REPO=https://github.com/yourusername/dokku.git DOKKU_BRANCH=master ./bootstrap.sh
 ```
 
-## Custom buildstep build
+## Custom herokuish build
 
-Dokku ships with a pre-built version of version of the [buildstep](https://github.com/progrium/buildstep) component by default. If you want to build your own version you can specify that with an env variable.
+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
 cd dokku
-sudo BUILD_STACK=true STACK_URL=https://github.com/progrium/buildstep.git make install
+sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make install
 ```
 
 ## Configuring
@@ -57,3 +57,25 @@ If you are using the vagrant installation, you can use the following command to
     $ cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
 
 That's it!
+
+## VMs with less than 1GB of memory
+
+Having less than 1GB of system memory available for dokku and its containers, for example Digital Ocean's small 512MB machines, might result in unexpected errors, such as **! [remote rejected] master -> master (pre-receive hook declined)** during installation of NPM dependencies (https://github.com/npm/npm/issues/3867).
+
+To work around this issue, it might suffice to augment the linux swap file size to a maximum of twice the physical memory size.
+
+To resize the swap file of a 512MB machine to 1GB, follow these steps while in SSH within your machine:
+
+```shell
+cd /var
+touch swap.img
+chmod 600 swap.img
+
+dd if=/dev/zero of=/var/swap.img bs=1024k count=1000
+mkswap /var/swap.img
+swapon /var/swap.img
+free
+
+echo "/var/swap.img    none    swap    sw    0    0" >> /etc/fstab
+```
+Reference: https://www.digitalocean.com/community/tutorials/how-to-configure-virtual-memory-swap-file-on-a-vps

docs/application-deployment.md

@@ -25,9 +25,17 @@ You're done!
 
 Dokku only supports deploying from its master branch, so if you'd like to deploy a different local branch use: ```git push dokku <local branch>:master```
 
-Right now Buildstep supports buildpacks for Node.js, Ruby, Python, [and more](https://github.com/progrium/buildstep#supported-buildpacks). It's not hard to add more, [go add more](https://github.com/progrium/buildstep#adding-buildpacks)!
+Right now Herokuish supports buildpacks for Node.js, Ruby, Python, [and more](https://github.com/gliderlabs/herokuish#buildpacks).
 Please check the documentation for your particular build pack as you may need to include configuration files (such as a Procfile) in your project root.
 
+## Deploying to server over SSH
+
+Pushing to the dokku remote may prompt you to input a password for the dokku user. It's preferable, however, to use key-based authentication, and you can add your public key to the dokku user's authorized_keys file with:
+
+```
+cat ~/.ssh/id_rsa.pub | ssh [sudouser]@[yourdomain].com "sudo sshcommand acl-add dokku [description]"
+```
+
 ## Deploying with private git submodules
 
 Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `~dokku/.ssh` and potentially add github.com (or your VCS host key) into `~dokku/.ssh/known_hosts`. A decent test like this should help confirm you've done it correctly.
@@ -40,7 +48,29 @@ ssh -T git@github.com
 
 ## Specifying a custom buildpack
 
-If buildpack detection isn't working well for you or you want to specify a custom buildpack for one repository you can create & commit a file in the root of your git repository named `.env` containing `export BUILDPACK_URL=<repository>` before pushing. This will tell buildstep to fetch the specified buildpack and use it instead of relying on the built-in buildpacks & their detection methods.
+If buildpack detection isn't working well for you or you want to specify a custom buildpack for one repository you can create & commit a file in the root of your git repository named `.env` containing `export BUILDPACK_URL=<repository>` before pushing. This will tell herokuish to fetch the specified buildpack and use it instead of relying on the built-in buildpacks & their detection methods.
+
+## Dockerfile deployment
+
+Deployment of `Dockerfile` repos is supported as of v0.3.15. Simply place a Dockerfile in the root of your repo and push to dokku. If you are converting from a heroku/dokku buildpack deployment, ensure you are not setting `$BUILDPACK_URL` or including a `.buildpacks` file in the root of your repo.
+
+By default, we will extract the first `EXPOSE` port and tell nginx to proxy your app to that port. Alternatively, you can set `$DOKKU_DOCKERFILE_PORT` in your app's dokku configuration.
+
+By default no arguments are passed to `docker run` when deploying the container and the `CMD` or `ENTRYPOINT` defined in the `Dockerfile` are executed. You can take advantage of docker ability of overriding the `CMD` or passing parameters to your `ENTRYPOINT` setting `$DOKKU_DOCKERFILE_START_CMD`. Let's say for example you are deploying a base nodejs image, with the following `ENTRYPOINT`:
+
+```
+ENTRYPOINT ["node"]
+```
+
+You can do:
+
+```
+dokku config:set DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
+```
+
+To tell docker what to run.
+
+Setting `$DOKKU_DOCKERFILE_CACHE_BUILD` to `true` or `false` will enable or disable docker's image layer cache. Lastly, for more granular build control, you may also pass any `docker build` option to `docker`, by setting `$DOKKU_DOCKER_BUILD_OPTS`.
 
 ## Default vhost
 
@@ -91,13 +121,13 @@ This is in particular useful, then you want to deploy to root domain, as
     remote: -----> Application deployed:
     remote:        http://dokku.me
 
-# Zero downtime deploy
+## Zero downtime deploy
 
-Following a deploy Dokku's default behaviour is to switch new traffic over to the new container immediately.
+Following a deploy, dokku will now wait `DOKKU_DEFAULT_CHECKS_WAIT` seconds (default: `10`), and if the container is still running, then route traffic to the new container.
 
-This can be problematic for applications that take some time to boot up and can lead to `502 Bad Gateway` errors.
+This can be problematic for applications whose boot up time can vary and can lead to `502 Bad Gateway` errors.
 
-Dokku provides a way to run a set of checks against the new container, and only switch traffic over if all checks complete successfully.
+Dokku provides a way to run a set of more precise checks against the new container, and only switch traffic over if all checks complete successfully.
 
 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.
 
@@ -107,14 +137,79 @@ A check is a relative URL and may be followed by expected content from the page,
 /about      Our Amazing Team
 ```
 
-Dokku will wait `DOKKU_CHECKS_WAIT` seconds (default: `5`) before running the checks to give server time to start. For shorter/longer wait, change the `DOKKU_CHECKS_WAIT` environment variable.
+Dokku will wait `DOKKU_CHECKS_WAIT` seconds (default: `5`) before running the checks to give server time to start. For shorter/longer wait, change the `DOKKU_CHECKS_WAIT` environment variable.  This can also be overridden in the CHECKS file by setting WAIT=nn.
 
 Dokku will wait `DOKKU_WAIT_TO_RETIRE` seconds (default: `60`) before stopping the old container such that no existing connections to it are dropped.
 
-# Removing a deployed app
+Dokku will retry the checks DOKKU_CHECKS_ATTEMPTS times until the checks are successful or DOKKU_CHECKS_ATTEMPTS is exceeded.  In the latter case, the deployment is considered failed. This can be overridden in the CHECKS file by setting ATTEMPTS=nn.
+
+Checks can be skipped entirely by setting `DOKKU_SKIP_ALL_CHECKS` to `true` either globally or per application. You can choose to skip only default checks by setting `DOKKU_SKIP_DEFAULT_CHECKS` to `true` either globally or per application.
+
+See [checks-examples.md](checks-examples.md) for examples and output.
+
+## Removing a deployed app
 
 SSH onto the server, then execute:
 
 ```shell
 dokku apps:destroy myapp
 ```
+
+## Image tagging
+
+The dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
+
+```
+tags <app>                                       List all app image tags
+tags:create <app> <tag>                          Add tag to latest running app image
+tags:deploy <app> <tag>                          Deploy tagged app image
+tags:destroy <app> <tag>                         Remove app image tag
+```
+
+Example:
+```
+root@dokku:~# dokku tags node-js-app
+=====> Image tags for dokku/node-js-app
+REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
+dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
+
+root@dokku:~# dokku tags:create node-js-app v0.9.0
+=====> Added v0.9.0 tag to dokku/node-js-app
+
+root@dokku:~# dokku tags node-js-app
+=====> Image tags for dokku/node-js-app
+REPOSITORY          TAG                 IMAGE ID            CREATED              VIRTUAL SIZE
+dokku/node-js-app   latest              936a42f25901        About a minute ago   1.025 GB
+dokku/node-js-app   v0.9.0              936a42f25901        About a minute ago   1.025 GB
+
+root@dokku:~# dokku tags:deploy node-js-app v0.9.0
+-----> Releasing node-js-app (dokku/node-js-app:v0.9.0)...
+-----> Deploying node-js-app (dokku/node-js-app:v0.9.0)...
+-----> Running pre-flight checks
+       For more efficient zero downtime deployments, create a file CHECKS.
+       See http://progrium.viewdocs.io/dokku/checks-examples.md for examples
+       CHECKS file not found in container: Running simple container check...
+-----> Waiting for 10 seconds ...
+-----> Default container check successful!
+=====> node-js-app container output:
+       Detected 512 MB available memory, 512 MB limit per process (WEB_MEMORY)
+       Recommending WEB_CONCURRENCY=1
+       > node-js-sample@0.1.0 start /app
+       > node index.js
+       Node app is running at localhost:5000
+=====> end node-js-app container output
+-----> Running post-deploy
+-----> Configuring node-js-app.dokku.me...
+-----> Creating http nginx.conf
+-----> Running nginx-pre-reload
+       Reloading nginx
+-----> Shutting down old containers in 60 seconds
+=====> 025eec3fa3b442fded90933d58d8ed8422901f0449f5ea0c23d00515af5d3137
+=====> Application deployed:
+       http://node-js-app.dokku.me
+
+```
+
+## Dokku/Docker Container Management Compatibility
+
+Dokku is, at it's core, a docker container manager. Thus, it does not necessarily play well with other out-of-band processes interacting with the docker daemon. One thing to note as in [issue #1220](https://github.com/progrium/dokku/issues/1220), dokku executes a cleanup function prior to every deployment. This function removes all exited containers and all 'unattached' images.

docs/assets/style.css

@@ -0,0 +1,245 @@
+body {
+  font-family: 'Open Sans', sans-serif;
+  font-weight: 400;
+  padding-bottom: 40px;
+  color: #5a5a5a;
+  -webkit-font-smoothing: antialiased;
+}
+
+h1 {
+  color: #5a5a5a;
+  font-weight: 400;
+  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 0 0 1em;
+}
+.header a {
+  background-image: url(https://cdn.rawgit.com/progrium/dokku/master/docs/assets/dokku.png);
+  color: #fff;
+  text-indent: 40px;
+  background-position: center left;
+  display: block;
+  width: 100%;
+  height: 100%;
+  -webkit-background-size: contain;
+  -moz-background-size: contain;
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.blurb {
+  color: #424242;
+  background-color: #ededed;
+  background-image: url(https://cdn.rawgit.com/progrium/dokku/master/docs/assets/gplaypattern.png);
+  padding: 45px 0;
+  text-align: center;
+}
+.blurb p {
+  font-size: 17px;
+  font-weight: 300;
+  margin: 18px 0 18px;
+  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 .path {
+  color: #2a8fbd;
+  user-select: none;
+}
+.quickstart-code .prompt {
+  color: #ff9900;
+  user-select: none;
+}
+.quickstart-code .command {
+  color: #ffffcc;
+}
+.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: normal;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.featurette-heading .text-muted {
+  font-weight: 300;
+}
+.list-group-item {
+  border: none;
+  font-size: 13px;
+  font-weight: normal;
+  padding: .2rem .5rem;
+  color: #157577;
+}
+a.list-group-item {
+  color: #666
+}
+.list-group-item.disabled:first-child, .list-group-item.disabled:first-child:focus, .list-group-item.disabled:first-child:hover {
+  margin-top: 0;
+}
+.list-group-item.disabled, .list-group-item.disabled:focus, .list-group-item.disabled:hover {
+  background: none;
+  color: #bbb;
+  cursor: default;
+  font-weight: normal;
+  font-size: 11px;
+  margin-bottom: 1em;
+  margin-top: 2em;
+  text-transform: uppercase;
+}
+.anchorjs-link {
+    color: #24cbce;
+}
+.markdown-body {
+  -webkit-font-smoothing: antialiased;
+  box-sizing: border-box;
+  color: rgb(71, 74, 84);
+  font-size: 14px;
+  font-weight: normal;
+  height: 20px;
+  line-height: 20px;
+  text-align: left;
+}
+.markdown-body h1 {
+  border-bottom: 1px solid #dfdfdf;
+  color: #444;
+  font-size: 24px;
+  padding-bottom: 1em;
+  margin-top: 0;
+  text-rendering: optimizelegibility;
+}
+.markdown-body h2 {
+  font-size: 17px;
+  font-weight: 700;
+  color: #555;
+  margin-top: 3em;
+  text-transform: uppercase;
+}
+.markdown-body h3 {
+  font-size: 15px;
+  font-weight: 700;
+  color: #555;
+  margin: 1em 0;
+}
+.markdown-body h4 {
+  font-size: 14px;
+  font-weight: 700;
+  color: #555;
+  margin: 1em 0;
+}
+.markdown-body h1 + h2 {
+  margin-top: 1em;
+}
+code {
+  padding: 0;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
+  margin: 0;
+  font-size: 85%;
+  background-color: #fff;
+  background-color: rgba(0,0,0,0.06);
+  color: #333;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+code:before {
+  letter-spacing: -0.2em;
+  content: "\00a0";
+}
+code:after {
+  letter-spacing: -0.2em;
+  content: "\00a0";
+}
+pre code:before, pre code:after {
+  letter-spacing: 0;
+  content: "";
+}
+pre {
+  display: block;
+  line-height: 1.428571429;
+  word-break: break-all;
+  word-wrap: break-word;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+  font-size: 12px;
+  box-shadow: 0 0 0 3px #eee;
+  overflow: auto !important;
+  padding: 10px;
+  background-color: #fff;
+  color: #4d4d4c;
+  margin: 2em 0;
+}
+@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;
+  }
+}

docs/checks-examples.md

@@ -0,0 +1,203 @@
+# 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:
+
+	  /                       My Amazing App
+	  /stylesheets/index.css  .body
+	  /scripts/index.js       $(function()
+	  /images/logo.png
+
+To check an application that supports multiple hostnames, use relative URLs
+that include the hostname, for example:
+
+	 //admin.example.com     Admin Dashboard
+	 //static.example.com/logo.png
+
+You can also specify the protocol to explicitly check HTTPS requests.
+
+The default behavior is to wait for 5 seconds before running the first check,
+and timeout each check to 30 seconds.
+
+By default, checks will be attempted 5 times.  (Retried 4 times)
+
+You can change these by setting WAIT, TIMEOUT and ATTEMPTS to different values, for
+example:
+
+	  WAIT=30     # Wait 1/2 minute
+	  TIMEOUT=60  # Timeout after a minute
+	  ATTEMPTS=10  # attempt checks 10 times
+
+# 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.
+
+## CHECKS file
+
+````
+WAIT=5
+ATTEMPTS=6
+/check.txt simple_check
+````
+
+> check.txt is a text file returning the string 'simple_check'
+
+## Deploy Output
+
+> Note: The output has been trimmed for brevity
+
+````
+git push dokku master
+
+-----> Cleaning up...
+-----> Building myapp from herokuish...
+-----> Adding BUILD_ENV to build environment...
+-----> Ruby app detected
+-----> Compiling Ruby/Rails
+-----> Using Ruby version: ruby-2.0.0
+
+.....
+
+-----> Discovering process types
+       Procfile declares types -> web
+-----> Releasing myapp...
+-----> Deploying myapp...
+-----> Running pre-flight checks
+-----> Attempt 1/6 Waiting for 5 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 ...
+       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 ...
+       CHECKS expected result:
+       http://localhost/check.txt => "simple_check"
+-----> All checks successful!
+=====> myapp container output:
+       => Booting Thin
+       => Rails 4.2.0 application starting in production on http://0.0.0.0:5000
+       => Run `rails server -h` for more startup options
+       => Ctrl-C to shutdown server
+       Thin web server (v1.6.3 codename Protein Powder)
+       Maximum connections set to 1024
+       Listening on 0.0.0.0:5000, CTRL+C to stop
+=====> end myapp container output
+-----> Running post-deploy
+-----> Configuring myapp.dokku.example.com...
+-----> Creating http nginx.conf
+-----> Running nginx-pre-reload
+       Reloading nginx
+-----> Shutting down old container in 60 seconds
+=====> Application deployed:
+       http://myapp.dokku.example.com
+````
+
+# Example: Failing Rails Deployment
+In this example, a Rails application fails to deploy.  The reason for the failure is that the postgres database connection fails.  The initial checks will fail while we wait for the server to start up, just like in the above example.  However, once the server does start accepting connections, we will see an error 500 due to the postgres database connection failure.
+
+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
+ATTEMPTS=6
+/
+````
+
+> The check to the root url '/' would normally access the database.
+
+## Deploy Output
+
+> Note: The output has been trimmed for brevity
+
+````
+git push dokku master
+
+-----> Cleaning up...
+-----> Building myapp from herokuish...
+-----> Adding BUILD_ENV to build environment...
+-----> Ruby app detected
+-----> Compiling Ruby/Rails
+-----> Using Ruby version: ruby-2.0.0
+
+.....
+
+Discovering process types
+Procfile declares types -> web
+Releasing myapp...
+Deploying myapp...
+Running pre-flight checks
+-----> Attempt 1/6 Waiting for 5 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 ...
+       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 ...
+       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 ...
+       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 ...
+       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 ...
+       CHECKS expected result:
+       http://localhost/ => ""
+ !
+curl: (22) The requested URL returned error: 500 Internal Server Error
+Could not start due to 1 failed checks.
+ !    Check attempt 6/6 failed.
+=====> myapp container output:
+       => Booting Thin
+       => Rails 4.2.0 application starting in production on http://0.0.0.0:5000
+       => Run `rails server -h` for more startup options
+       => Ctrl-C to shutdown server
+       Thin web server (v1.6.3 codename Protein Powder)
+       Maximum connections set to 1024
+       Listening on 0.0.0.0:5000, CTRL+C to stop
+       Started GET "/" for 172.17.42.1 at 2015-03-26 21:36:47 +0000
+         Is the server running on host "172.17.42.1" and accepting
+         TCP/IP connections on port 5431?
+       PG::ConnectionBad (could not connect to server: Connection refused
+         Is the server running on host "172.17.42.1" and accepting
+         TCP/IP connections on port 5431?
+       ):
+         vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:651:in `initialize'
+         vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:651:in `new'
+         vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:651:in `connect'
+         vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:242:in `initialize'
+         vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `new'
+         vendor/bundle/ruby/2.0.0/gems/activerecord-4.2.0/lib/active_record/connection_adapters/postgresql_adapter.rb:44:in `postgresql_connection
+=====> end myapp container output
+/usr/local/bin/dokku: line 49: 23409 Killed                  dokku deploy "$APP"
+To dokku@dokku.example.com:myapp
+ ! [remote rejected] dokku -> master (pre-receive hook declined)
+error: failed to push some refs to 'dokku@dokku.example.com:myapp'
+````

docs/community/clients.md

@@ -4,7 +4,7 @@ Given the constraints, running dokku commands remotely via SSH is fine. For cert
 
 While dokku does not yet have an official client, there are a multitude of ways in which you can interact with your dokku installation. The easiest is to use the **bash** client, though you may wish to use another.
 
-## (bash) `dokku_client.sh`
+## (bash, zsh, etc.) `dokku_client.sh`
 
 Of all methods, this is the *most* official method of interacting with your dokku installation. It is a bash script that interacts with a remote dokku installation via ssh. It is available in `contrib/dokku_client.sh` in the root of the dokku repository.
 
@@ -18,6 +18,19 @@ git clone git@github.com:progrium/dokku.git ~/.dokku
 alias dokku='$HOME/.dokku/contrib/dokku_client.sh'
 ```
 
+Alternatively, if using another shell such as **zsh**, create an alias command which invokes the script using **bash**:
+
+```shell
+# zsh: add the following to either .zshenv or .zshrc
+alias dokku='bash $HOME/.dokku/contrib/dokku_client.sh'
+
+# fish: add the following to ~/.config/fish/config.fish
+alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
+
+# csh: add the following to .cshrc
+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.
 
 ## (nodejs) dokku-toolbelt

docs/components.md

@@ -1,8 +1,8 @@
 # Components
 
  * [Docker](https://github.com/dotcloud/docker) - Container runtime and manager
- * [Buildstep](https://github.com/progrium/buildstep) - Buildpack builder
- * [pluginhook](https://github.com/progrium/pluginhook) - Shell based plugins and hooks
+ * [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
 
 Looking to keep codebase as simple and hackable as possible, so try to keep your line count down.

docs/configuration-management.md

@@ -11,6 +11,6 @@ config:set <app> KEY1=VALUE1 [KEY2=VALUE2 ...] - set one or more config vars
 config:unset <app> KEY1 [KEY2 ...] - unset one or more config vars
 ```
 
-The variables are available both at at run time and during the application build/compilation step. You no longer need a `user-env` plugin as Dokku handles this functionality in a way equivalent to how Heroku handles it.
+The variables are available both at run time and during the application build/compilation step. You no longer need a `user-env` plugin as Dokku handles this functionality in a way equivalent to how Heroku handles it.
 
 > Note: Global `BUILD_ENV` files are currently migrated into a global `ENV` file and sourced before app-specific variables. This means that app-specific variables will take precedence over global variables. Configuring your global `ENV` file is manual, and should be considered potentially dangerous as configuration applies to all applications.

docs/deployment/ssl-configuration.md

@@ -0,0 +1,91 @@
+# SSL Configuration
+
+> New as of 0.4.0
+
+Dokku supports SSL/TLS certificate inspection and CSR/Self-signed certificate generation via the `certs` plugin. Note that whenever SSL/TLS support is enabled SPDY is also enabled.
+
+```
+certs:add <app> CRT KEY                                     Add an ssl endpoint to an app. Can also import from a tarball on stdin.
+certs:generate <app> DOMAIN                                 Generate a key and certificate signing request (and self-signed certificate)
+certs:info <app>                                            Show certificate information for an ssl endpoint.
+certs:remove <app>                                          Remove an SSL Endpoint from an app.
+certs:update <app> CRT KEY                                  Update an SSL Endpoint on an app. Can also import from a tarball on stdin
+```
+
+## Per-application certificate management
+
+Dokku provides built-in support for managing SSL certificates on a per-application basis. SSL is managed via nginx outside of application containers, and as such can be updated on-the-fly without rebuilding containers. At this time, applications only support a single SSL certificate at a time. To support multiple domains for a single application, wildcard certificate usage is encouraged.
+
+### Certificate setting
+
+The `certs:add` command can be used to push a `tar` containing a certificate `.crt` and `.key` file to a single application. The command should correctly handle cases where the `.crt` and `.key` are not named properly or are nested in a subdirectory of said `tar` file. You can import it as follows:
+
+```shell
+tar cvf cert-key.tar server.crt server.key
+# replace APP with your app name
+dokku certs:add < cert-key.tar
+```
+
+### Certificate generation
+
+> Note: Using this method will create a self-signed certificate, which is only recommended for development or staging use, not production environments.
+
+The `certs:generate` command will walk you through the correct `openssl` commands to create a key, csr and a self-signed cert for a given app/domain. We automatically put the self-signed cert in place as well as add the specified domain to the application configuration.
+
+If you decide to obtain a CA signed certficate, you can import that certificate using the aformentioned `dokku certs:add` command.
+
+### Certificate information
+
+The `certs:info` command will simply inspect the install SSL cert and print out details. NOTE: The server-wide certificate will be inspect if installed and no app-specific certificate exists.
+
+```
+root@dokku:~/dokku# dokku certs:info node-js-app
+-----> Fetching SSL Endpoint info for node-js-app...
+-----> Certificate details:
+=====> Common Name(s):
+=====>    test.dokku.me
+=====> Expires At: Aug 24 23:32:59 2016 GMT
+=====> Issuer: C=US, ST=California, L=San Francisco, O=dokku.me, CN=test.dokku.me
+=====> Starts At: Aug 25 23:32:59 2015 GMT
+=====> Subject: C=US; ST=California; L=San Francisco; O=dokku.me; CN=test.dokku.me
+=====> SSL certificate is self signed.
+```
+
+### Certificate removal
+
+The `certs:remove` command only works on app-specific certificates. It will `rm` the app-specific tls directory, rebuild the nginx configuration, and reload nginx.
+
+## Global Certification
+
+Global certificate management is a manual process. To enable TLS connections for all your applications at once you will need a wildcard TLS certificate.
+
+To enable TLS across all apps, you can run the following commands:
+
+```shell
+mkdir -p /home/dokku/tls
+cp server.crt /home/dokku/tls/server.crt
+cp server.key /home/dokku/tls/server.key
+```
+
+Next, you will want to enable the certificates by editing `/etc/nginx/conf.d/dokku.conf` and uncommenting these two lines (remove the `#`):
+
+```
+ssl_certificate /home/dokku/tls/server.crt;
+ssl_certificate_key /home/dokku/tls/server.key;
+```
+
+The settings will take affect at the next deploy. If you would like to propagate the change to all apps immediately, you can also run the following command:
+
+```shell
+dokku ps:restartall
+```
+
+Once TLS is enabled, the application will be accessible by `https://` (redirection from `http://` is applied as well).
+
+> Note: TLS will not be enabled unless the application's VHOST matches the certificate's name. (i.e. if you have a cert for `*.example.com` TLS won't be enabled for `something.example.org` or `example.net`)
+
+## HSTS Header
+
+The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.
+
+Beware that if you enable the header and a subsequent deploy of your application results in an HTTP deploy (for whatever reason), the way the header works means that a browser will not attempt to request the HTTP version of your site if the HTTPS version fails.

docs/development/plugin-creation.md

@@ -3,9 +3,10 @@
 If you create your own plugin:
 
 1. Take a look at the plugins shipped with dokku and hack away!
-2. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
-3. Edit [this page](http://progrium.viewdocs.io/dokku/plugins) and add a link to it.
-4. Subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases
+2. Check out the [list of triggers](http://progrium.viewdocs.io/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.
+5. Subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases
 
 ### Sample plugin
 
@@ -14,13 +15,13 @@ The below plugin is a dummy `dokku hello` plugin. If your plugin exposes command
 ```shell
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 case "$1" in
   hello)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2";
+    [[ -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"
     ;;
@@ -30,9 +31,9 @@ case "$1" in
     ;;
 
   help)
-    cat && cat<<EOF
-    hello <app>                                     Says "Hello <app>"
-    hello:world                                     Says "Hello world"
+    cat<<EOF
+    hello <app>, Says "Hello <app>"
+    hello:world, Says "Hello world"
 EOF
     ;;
 
@@ -43,11 +44,20 @@ EOF
 esac
 ```
 
+Each plugin requires a `plugin.toml` descriptor file with the following required fields:
+
+```shell
+[plugin]
+description = "dokku hello plugin"
+version = "0.1.0"
+[plugin.config]
+```
+
 A few notes:
 
 - You should always support `DOKKU_TRACE` as specified on the 2nd line of the plugin.
 - If your command requires that an application exists, ensure you check for it's existence in the manner prescribed above.
-- A `help` command is required, though it is allowed to be empty.
+- A `help` command is required, though it is allowed to be empty. Also, the command syntax will need to separated by `, ` in order to maintain columnar output alignment.
 - Commands *should* be namespaced.
 - As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows dokku to output a `command not found` message.
 - Be sure you want the "set -eo pipefail" option. Look at the following example :
@@ -55,8 +65,7 @@ A few notes:
     ```shell
     IMAGE=$(docker images | grep "user/repo" | awk '{print $3}')
     if [[ -z $IMAGE ]]; then
-        echo "user/repo image not found... Did you run 'dokku plugins-install'?"
-        exit 1
+        dokku_log_fail "user/repo image not found... Did you run 'dokku plugin:install'?"
     fi
     ```
 
@@ -76,6 +85,8 @@ A few notes:
 - As some plugins require access to set app config settings and do not want/require the default Heroku-style behavior of a restart, we have the following "internal" commands that provide this functionality :
 
   ```shell
-  dokku config:set-norestart APP KEY1=VALUE1 [KEY2=VALUE2 ...]
-  dokku config:unset-norestart APP KEY1 [KEY2 ...]
+  dokku config:set --no-restart APP KEY1=VALUE1 [KEY2=VALUE2 ...]
+  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.

docs/development/plugin-triggers.md

@@ -1,15 +1,15 @@
-# Pluginhooks
+# Plugin triggers
 
-[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/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.
 
-Pluginhooks are simply scripts that are executed by the system. You can use any language you want, so long as the script:
+Plugin triggers are simply scripts that are executed by the system. You can use any language you want, so long as the script:
 
 - Is executable
 - Has the proper language requirements installed
 
-For instance, if you wanted to write a pluginhook in PHP, you would need to have `php` installed and available on the CLI prior to pluginhook invocation.
+For instance, if you wanted to write a plugin trigger in PHP, you would need to have `php` installed and available on the CLI prior to plugin trigger invocation.
 
-The following is an example for the `nginx-hostname` pluginhook. It reverses the hostname that is provided to nginx during deploys. If you created an executable file named `nginx-hostname` with the following code in your plugin, it would be invoked by dokku during the normal app deployment process:
+The following is an example for the `nginx-hostname` plugin trigger. It reverses the hostname that is provided to nginx during deploys. If you created an executable file named `nginx-hostname` with the following code in your plugin trigger, it would be invoked by dokku during the normal app deployment process:
 
 ```shell
 #!/usr/bin/env bash
@@ -21,18 +21,18 @@ NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
 echo "$NEW_SUBDOMAIN.$VHOST"
 ```
 
-## Available Pluginhooks
+## Available plugin triggers
 
-There are a number of plugin-related pluginhooks. These can be optionally implemented by plugins and allow integration into the standard dokku plugin 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/backup/teardown process.
 
-The following pluginhooks describe those available to a dokku installation. As well, there is an example for each pluginhook that you can use as templates for your own plugin development.
+The following plugin triggers describe those available to a dokku installation. As well, there is an example for each trigger that you can use as templates for your own plugin development.
 
-> The example pluginhook code is not guaranteed to be implemented as in within dokkku, and are merely simplified examples. Please look at the dokku source for larger, more in-depth examples.
+> The example plugin trigger code is not guaranteed to be implemented as in within dokkku, and are merely simplified examples. Please look at the dokku source for larger, more in-depth examples.
 
 ### `install`
 
 - Description: Used to setup any files/configuration for a plugin.
-- Invoked by: `dokku plugins-install`.
+- Invoked by: `dokku plugin:install`.
 - Arguments: None
 - Example:
 
@@ -50,8 +50,8 @@ fi
 
 ### `dependencies`
 
-- Description: Used to install system-level dependencies. Invoked by `plugins-install-dependencies`.
-- Invoked by: `dokku plugins-install-dependencies`
+- Description: Used to install system-level dependencies. Invoked by `plugin:install-dependencies`.
+- Invoked by: `dokku plugin:install-dependencies`
 - Arguments: None
 - Example:
 
@@ -77,13 +77,13 @@ esac
 ### `update`
 
 - Description: Can be used to run plugin updates on a regular interval. You can schedule the invoker in a cron-task to ensure your system gets regular updates.
-- Invoked by: `dokku plugins-update`.
+- Invoked by: `dokku plugin:update`.
 - Arguments: None
 - Example:
 
 ```shell
 #!/usr/bin/env bash
-# Update the buildstep image from git source
+# Update the herokuish image from git source
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
@@ -93,7 +93,7 @@ sudo BUILD_STACK=true make install
 
 ### `commands help`
 
-- Description: Used to aggregate all plugin `help` output. Your plugin should implement a `help` command in your `commands` file to take advantage of this pluginhook. This must be implemented inside the `commands` pluginhook file.
+- Description: Used to aggregate all plugin `help` output. Your plugin should implement a `help` command in your `commands` file to take advantage of this plugin trigger. This must be implemented inside the `commands` plugin file.
 - Invoked by: `dokku help`
 - Arguments: None
 - Example:
@@ -106,9 +106,9 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
   help | derp:help)
-    cat && cat<<EOF
-    derp:herp                                       Herps the derp
-    derp:serp [file]                                Shows the file's serp
+    cat<<EOF
+    derp:herp, Herps the derp
+    derp:serp [file], Shows the file's serp
 EOF
     ;;
 
@@ -121,7 +121,7 @@ esac
 
 ### `backup-export`
 
-- Description: Used to backup files for a given plugin. If your plugin writes files to disk, this pluginhook should be used to echo out their full paths. Any files listed will be copied by the backup plugin to the backup tar.gz.
+- 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:
@@ -180,9 +180,9 @@ for file in */REDIRECT; do
 done
 ```
 
-### `pre-build-buildstep`
+### `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 buildstep.
+- Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to applications using buildpacks.
 - Invoked by: `dokku build`
 - Arguments: `$APP`
 - Example:
@@ -195,9 +195,9 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `post-build-buildstep`
+### `post-build-buildpack`
 
-- Description: Allows you to run commands after the build image is create for a given app. Only applies to applications using buildstep.
+- Description: Allows you to run commands after the build image is create for a given app. Only applies to applications using buildpacks.
 - Invoked by: `dokku build`
 - Arguments: `$APP`
 - Example:
@@ -240,11 +240,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `pre-release-buildstep`
+### `pre-release-buildpack`
 
-- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using buildstep.
+- Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
 - Invoked by: `dokku release`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
@@ -252,8 +252,9 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # Installs the graphicsmagick package into the container
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 dokku_log_info1" Installing GraphicsMagick..."
 
@@ -266,11 +267,11 @@ test $(docker wait $ID) -eq 0
 docker commit $ID $IMAGE > /dev/null
 ```
 
-### `post-release-buildstep`
+### `post-release-buildpack`
 
-- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using buildstep.
+- Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using buildpacks.
 - Invoked by: `dokku release`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
@@ -278,8 +279,9 @@ docker commit $ID $IMAGE > /dev/null
 # Installs a package specified by the `CONTAINER_PACKAGE` env var
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 dokku_log_info1" Installing $CONTAINER_PACKAGE..."
 
@@ -296,13 +298,16 @@ docker commit $ID $IMAGE > /dev/null
 
 - Description: Allows you to run commands before environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
 - Invoked by: `dokku release`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 # TODO
 ```
@@ -311,13 +316,16 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 - Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to applications using a dockerfile.
 - Invoked by: `dokku release`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 # TODO
 ```
@@ -335,10 +343,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # `DOKKU_DISABLE_DEPLOY` env var is set to `true` for an app
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 CONTAINERID="$1"; APP="$2"; PORT="$3" ; HOSTNAME="${4:-localhost}"
 
-[[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV
+eval "$(config_export app $APP)"
 DOKKU_DISABLE_DEPLOY="${DOKKU_DISABLE_DEPLOY:-false}"
 
 if [[ "$DOKKU_DISABLE_DEPLOY" = "true" ]]; then
@@ -351,7 +360,7 @@ fi
 
 - Description: Allows the running of code before the container's process is started.
 - Invoked by: `dokku deploy`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
@@ -359,11 +368,9 @@ fi
 # Runs gulp in our container
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-source "$(dirname $0)/../common/functions"
-
-APP="$1"
-IMAGE="dokku/$APP"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 dokku_log_info1 "Running gulp"
 id=$(docker run -d $IMAGE /bin/bash -c "cd /app && gulp default")
@@ -392,7 +399,7 @@ curl "http://httpstat.us/200"
 
 - Description: Can be used to run commands before an app is deleted.
 - Invoked by: `dokku apps:destroy`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
@@ -400,8 +407,10 @@ curl "http://httpstat.us/200"
 # Clears out the gulp asset build cache for applications
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-APP="$1"; IMAGE="dokku/$APP"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"
+APP="$1"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 if [[ -d $GULP_CACHE_DIR ]]; then
   docker run --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
@@ -412,7 +421,7 @@ fi
 
 - Description: Can be used to run commands after an application is deleted.
 - Invoked by: `dokku apps:destroy`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
@@ -446,13 +455,16 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 - Description:
 - Invoked by: `dokku deploy`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 # TODO
 ```
@@ -461,13 +473,16 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 - Description:
 - Invoked by: `dokku run`
-- Arguments: `$APP`
+- Arguments: `$APP $IMAGE_TAG`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
 
 # TODO
 ```
@@ -589,3 +604,79 @@ APP="$1"; REV="$2"
 
 dokku hg-build $APP $REV
 ```
+
+### `receive-branch`
+
+- Description: Allows you to customize what occurs when a specific branch is received. Can be used to add support for specific branch names
+- Invoked by: `dokku git-hook`, `dokku ps:rebuild`
+- Arguments: `$APP $REV $REFNAME`
+- Example:
+
+```shell
+#!/bin/bash
+# Gives dokku the ability to support multiple branches for a given service
+# Allowing you to have multiple staging environments on a per-branch basis
+
+reference_app=$1
+refname=$3
+newrev=$2
+APP=${refname/*\//}.$reference_app
+
+if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
+  REFERENCE_REPO="$DOKKU_ROOT/$reference_app
+  git clone --bare --shared --reference "$REFERENCE_REPO" "$REFERENCE_REPO" "$DOKKU_ROOT/$APP" > /dev/null
+fi
+plugn trigger receive-app $APP $newrev
+```
+
+### `tags-create`
+
+- Description: Allows you to run commands once a tag for an application image has been added
+- Invoked by: `dokku tags:create`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Upload an application image to docker hub
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+
+IMAGE_ID=$(docker inspect --format '{{ .Id }}' $IMAGE)
+docker tag -f $IMAGE_ID $DOCKER_HUB_USER/$APP:$IMAGE_TAG
+docker push $DOCKER_HUB_USER/$APP:$IMAGE_TAG
+```
+
+### `tags-destroy`
+
+- Description: Allows you to run commands once a tag for an application image has been removed
+- Invoked by: `dokku tags:destroy`
+- Arguments: `$APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+# Remove an image tag from docker hub
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1"; IMAGE_TAG="$2"
+
+some code to remove a docker hub tag because it's not implemented in the CLI....
+```
+
+### `retire-container-failed`
+
+- Description: Allows you to run commands if/when retiring old containers has failed
+- Invoked by: `dokku deploy`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1"; HOSTNAME=$(hostname -s)
+
+mail -s "$APP containers on $HOSTNAME failed to retire" ops@co.com
+```

docs/development/release-process.md

@@ -0,0 +1,70 @@
+# Release Process
+
+Dokku is released in intervals *at most* three weeks apart, though may be released much quicker.
+
+To propose a release, the following tasks need to be performed:
+
+- The installable version must be changed in the `docs/installation.md` file.
+- The installable version must be changed in the `docs/home.html` file
+- The installable version must be changed in the `docs/index.md` file
+- The installable version must be changed in the `README.md` file.
+- The installable version must be changed in the `contrib/dokku-installer.rb` 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.
+
+## Versioning
+
+Dokku follows semver standards. As we are not yet at a stable release, breaking changes will require *only* a minor release, while all other changes only require a patch release. Once we hit stable, breaking changes will require a major release.
+
+Tags should be created via the following method:
+
+```shell
+git tag v0.9.9
+```
+
+At the moment, tags need not be signed, though that may change in the future.
+
+## Debian Packages
+
+The `build` target in the dokku `Vagrantfile` creates debian packages for dokku at a point in time. The version will be based upon the latest local tag - you may create your own, internal tags/releases if that is so desired.
+
+Debian package information is held in the `debian` directory of the dokku project.
+
+For the public project, releases should be pushed to packagecloud.io *after* a tag is created but *before* said tag is pushed to github. The following may be the release workflow:
+
+
+```shell
+git tag v0.9.9
+vagrant up build
+export PACKAGECLOUD_TOKEN=SOME_TOKEN
+package_cloud push dokku/dokku/ubuntu/trusty dokku_0.9.9_amd64.deb
+```
+
+If new versions of other packages were created, these should also be pushed at this time.
+
+> If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.
+
+## 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:
+
+```
+## 0.9.9
+
+Some description concerning major changes in this release, or potential incompatibilities.
+
+### New Features
+
+- #SOME_ID: @pull-request-creator Description
+
+### Bug Fixes
+
+- #SOME_ID: @pull-request-creator Description
+
+### Docs Changes
+
+- #SOME_ID: @pull-request-creator Description
+```

docs/development/testing.md

@@ -0,0 +1,36 @@
+# Dokku test suite
+
+Dokku now has a full test suite to assist in quick iterating development. These tests include a linter using [shellcheck](https://github.com/koalaman/shellcheck), functional unit tests using the [bats testing framework](https://github.com/sstephenson/bats), and a deployment suite of example apps that use the most popular languages and frameworks.
+
+Bats tests can be found here:
+  ```
+  tests/unit/*.bats
+  ```
+
+Example apps can be found here:
+  ```
+  tests/apps/
+  ```
+
+### Executing tests locally
+
+- Setup dokku in a [vagrant vm](http://progrium.viewdocs.io/dokku/getting-started/install/vagrant)
+- Test setup and execution
+
+  ```shell
+  $ vagrant ssh
+  $ 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 lint  # linter
+  $ make unit-tests  # bats tests
+  $ make deploy-tests  # app deployment tests
+  ```
+- Additionally you may run a specific app deployment tests with a target similar to:
+
+  ```shell
+  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/docker-options.md

@@ -0,0 +1,68 @@
+docker-options
+========================
+
+Usage
+-----
+
+```bash
+$ dokku help
+...
+    docker-options <app>                               Display apps docker options for all phases
+    docker-options <app> <phase(s)>                    Display apps docker options for phase (comma-separated phase list)
+    docker-options:add <app> <phase(s)> OPTION         Add docker option to app for phase (comma-separated phase list)
+    docker-options:remove <app> <phase(s)> OPTION      Remove docker option from app for phase (comma-separated phase list)
+...
+````
+
+Add some options (first, for the deployed/running app and second when executing `dokku run`)
+
+```bash
+$ dokku docker-options:add myapp deploy "-v /host/path:/container/path"
+$ dokku docker-options:add myapp run "-v /another/container/path"
+```
+
+Check what we added
+
+```bash
+$ dokku docker-options myapp
+Deploy options:
+    -v /host/path:/container/path
+Run options:
+    -v /another/container/path
+```
+
+Remove an option
+```bash
+$ 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
+- `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)
+------------
+
+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:
+
+```bash
+--link container_name:alias
+-v /host/path:/container/path
+-v /another/container/path
+```
+
+The above example will result in the following options being passed to docker during `dokku run`:
+
+```bash
+--link container_name:alias -v /host/path:/container/path -v /another/container/path
+```
+
+You may also include comments (lines beginning with a #) and blank lines in the DOCKER_OPTIONS file.
+
+Move information on docker options can be found here: http://docs.docker.io/en/latest/reference/run/ .

docs/dokku-events-logs.md

@@ -0,0 +1,73 @@
+# Dokku Event Logs
+
+Docker provides an _events_ command to show system's real time events. Likewise, Dokku can record events as syslog entries and also provides a plugin to display the last ones.
+
+```
+events [-t]                                     Show the last events (-t follows)
+events:list                                     List logged events
+events:on                                       Enable events logger
+events:off                                      Disable events logger
+```
+
+## Usage
+
+Enable the plugin:
+
+```
+$ dokku events:on
+Enabling dokku events logger
+```
+
+Dokku will then write log entries to ``/var/log/syslog`` as well as a Dokku-specific logs sub-directory ``/var/log/dokku/events.log``, which can be easily displayed with the command `dokku events`:
+
+```
+Jul  3 16:09:48 dokku.me dokku[127630]: INVOKED: pre-release-buildpack( pythonapp )
+Jul  3 16:10:02 dokku.me dokku[128095]: INVOKED: docker-args-run( rubyapp )
+Jul  3 16:10:02 dokku.me dokku[128114]: INVOKED: docker-args-run( nhl )
+Jul  3 16:10:03 dokku.me dokku[128136]: INVOKED: post-release-buildpack( pythonapp )
+Jul  3 16:10:03 dokku.me dokku[128195]: INVOKED: pre-deploy( pythonapp )
+Jul  3 16:10:23 dokku.me dokku[129253]: INVOKED: docker-args-deploy( pythonapp )
+Jul  3 16:10:24 dokku.me dokku[129337]: INVOKED: bind-external-ip( pythonapp )
+Jul  3 16:10:24 dokku.me dokku[129451]: INVOKED: check-deploy( pythonapp 6274ced0d4be11af4490cd18abaf77cdd593f025133f403d984e80d86a39acec web 5000 10.0.16.80 )
+Jul  3 16:10:35 dokku.me dokku[129561]: INVOKED: docker-args-deploy( pythonapp )
+Jul  3 16:10:35 dokku.me dokku[129649]: INVOKED: bind-external-ip( pythonapp )
+Jul  3 16:10:36 dokku.me dokku[129760]: INVOKED: check-deploy( pythonapp ac88a56ee4161ff37e4b92d1498c3eadc91f0aa7c8b81b44fc077e2a51d54cc0 worker )
+Jul  3 16:10:46 dokku.me dokku[129851]: INVOKED: post-deploy( pythonapp )
+Jul  3 16:10:46 dokku.me dokku[129945]: INVOKED: nginx-pre-reload( pythonapp )
+Jul  3 16:15:02 dokku.me dokku[130397]: INVOKED: docker-args-run( goapp )
+Jul  3 16:21:02 dokku.me dokku[130796]: INVOKED: docker-args-run( rubyapp )
+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
+receive-app
+pre-release-buildpack
+nginx-pre-reload
+docker-args-deploy
+post-build-buildpack
+post-domains-update
+post-release-dockerfile
+check-deploy
+backup-import
+backup-export
+git-pre-pull
+git-post-pull
+nginx-hostname
+bind-external-ip
+pre-deploy
+post-delete
+dependencies
+pre-build-buildpack
+docker-args-run
+pre-build-dockerfile
+post-release-buildpack
+post-build-dockerfile
+pre-release-dockerfile
+update
+```

docs/getting-started/install/debian.md

@@ -0,0 +1,39 @@
+# Debian Package Installation Notes
+
+As of 0.3.18, dokku defaults to being installed via debian package. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of dokku without the use of our `bootstrap.sh` bash script. The following are the steps run by said script:
+
+```shell
+# install prerequisites
+sudo apt-get update -qq > /dev/null
+sudo apt-get install -qq -y apt-transport-https curl
+
+# install docker
+curl -sSL https://get.docker.com/ | sh
+
+# install 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
+sudo apt-get update -qq > /dev/null
+sudo apt-get install dokku
+```
+
+## Unattended installation
+
+In case you want to perform an unattended installation of dokku, this is made possible through [debconf](https://en.wikipedia.org/wiki/Debconf_%28software_package%29), which allows you to configure a package before installing it.
+
+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
+```
+
+After setting the desired options, proceed with the installation as described above.
+
+### debconf options
+
+| Name               | Type    | Default               | Description                                                              |
+| ------------------ | ------- | --------------------- | ------------------------------------------------------------------------ |
+| 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/key_file     | string  | /root/.ssh/id_rsa.pub | SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |

docs/getting-started/install/linode.md

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

docs/getting-started/install/vagrant.md

@@ -21,7 +21,8 @@
     # - `BOX_URI`
     # - `BOX_MEMORY`
     # - `DOKKU_DOMAIN`
-    # - `DOKKU_IP`.
+    # - `DOKKU_IP`
+    # - `FORWARDED_PORT`.
     cd path/to/dokku
     vagrant up
     ```
@@ -29,7 +30,7 @@
 
     ```
     Host dokku.me
-        Port 2222
+        Port 22
     ```
 
 - Copy your SSH key via `cat ~/.ssh/id_rsa.pub | pbcopy` and paste it into the dokku-installer at http://dokku.me . Change the `Hostname` field on the Dokku Setup screen to your domain and then check the box that says `Use virtualhost naming`. Then click *Finish Setup* to install your key. You'll be directed to application deployment instructions from here.

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

@@ -18,8 +18,8 @@ If you’re stumped, give us a holler in the Dokku IRC channel. Someone from the
 
 If [here](http://webchat.freenode.net/?channels=dokku) for a web-based client IRC client.
 
-## Stackoverflow
+## Stack Overflow
 
 http://stackoverflow.com/
 
-Tag your questions with `dokku` to enable existing users of stackoverflow to find your questions.
+Tag your questions with `dokku` to enable existing users of Stack Overflow to find your questions.

docs/home.html

@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
+    <title>Dokku - The smallest PaaS implementation you've ever seen</title>
+
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
+    <style type="text/css">
+      body{padding-bottom:40px;color:#5a5a5a}
+      h1{color:#5a5a5a;font-family:'montserrat',Optima,Segoe,"Segoe UI",Candara,Calibri,Arial,sans-serif;font-weight:700;line-height:1.1;margin-bottom:12px;margin-top:12px;text-rendering:optimizelegibility}
+      .header{background-color:#2a8fbd;padding:22px 0}
+      .header .heading{color:#fff;font-size:23px;margin:0;padding:0}
+      .blurb{color:#424242;background-color:#ededed;background-image:url(./assets/gplaypattern.png);padding:45px 0;text-align:center}
+      .blurb p{font-size:17px;font-weight:300;margin:18px 0;text-align:center}
+      .quickstart-code{display:block;font-size:12px;line-height:1.3em;margin:45px auto;max-width: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 .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}
+      }
+    </style>
+  </head>
+  <body>
+    <div class="header">
+      <div class="container">
+        <h1 class="heading">Dokku</h1>
+      </div>
+    </div>
+
+    <div class="blurb">
+      <div class="container">
+        <h2>The smallest PaaS implementation you've ever seen</h2>
+        <p>Docker powered mini-Heroku in around 200 lines of Bash</p>
+        <div class="blurb-buttons">
+          <a class="btn btn-lg btn-warning" href="http://progrium.viewdocs.io/dokku/installation">View Documentation</a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container marketing">
+      <div class="quickstart-code">
+        <p class="title">Quick-start Instructions</p>
+        <div class="shell">
+          <p class="line">
+            <span class="path">~</span>
+            <span class="prompt">$</span>
+            <span class="command">wget https://raw.githubusercontent.com/progrium/dokku/v0.4.2/bootstrap.sh</span>
+          </p>
+          <p class="line">
+            <span class="path">~</span>
+            <span class="prompt">$</span>
+            <span class="command">sudo DOKKU_TAG=v0.4.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>
+          </p>
+        </div>
+      </div>
+
+      <hr class="featurette-divider">
+
+      <!-- START THE FEATURETTES -->
+
+      <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>
+          <p class="lead">Powered by Docker, you can install Dokku on any hardware. Use it on inexpensive cloud providers. Use the extra cash to buy a pony or feed kittens. You'll save tens of dollars a year on your dog photo sharing website.</p>
+        </div>
+        <div class="col-md-5">
+          <img class="featurette-image img-responsive center-block" alt="Docker Logo" src="./assets/docker.png">
+        </div>
+      </div>
+
+      <hr class="featurette-divider">
+
+      <div class="row featurette">
+        <div class="col-md-7 col-md-push-5">
+          <h2 class="featurette-heading">Easy Git Deploys. <span class="text-muted">From your command-line to the cloud.</span></h2>
+          <p class="lead">Once it's set up on a host, you can push Heroku-compatible applications to it via Git. They'll build using Heroku buildpacks and then run in isolated containers. The end result is your own, single-host version of Heroku.</p>
+        </div>
+        <div class="col-md-5 col-md-pull-7">
+          <img class="featurette-image img-responsive center-block" alt="Git Logo" src="./assets/git.png">
+        </div>
+      </div>
+
+      <hr class="featurette-divider">
+
+      <div class="row featurette">
+        <div class="col-md-7">
+          <h2 class="featurette-heading">Extensible Platform. <span class="text-muted">Customize your PaaS.</span></h2>
+          <p class="lead">Write dokku plugins in any language. Share them online with others, and extend those already available. Dokku's simple core is easy to hack and add the features you need to get your job done.</p>
+        </div>
+        <div class="col-md-5">
+          <img class="featurette-image img-responsive center-block" alt="Extend Logo" src="./assets/extend.png">
+        </div>
+      </div>
+
+      <hr class="featurette-divider">
+    </div>
+
+    <div class="container">
+      <footer>
+        <p class="pull-right"><a href="#">Back to top</a></p>
+        <p>&copy; 2013 Dokku</p>
+      </footer>
+    </div>
+  </body>
+</html>

docs/index.md

@@ -1,38 +1,70 @@
-# Dokku Documentation
+<div class="blurb">
+  <div class="container">
+    <h2>The smallest PaaS implementation you've ever seen</h2>
+    <p>Docker powered mini-Heroku in around 200 lines of Bash</p>
+    <div class="blurb-buttons">
+      <a class="btn btn-lg btn-warning" href="http://progrium.viewdocs.io/dokku/installation">View Documentation</a>
+    </div>
+  </div>
+</div>
 
-Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.
+<div class="container marketing">
+  <div class="quickstart-code">
+    <p class="title">Quick-start Instructions</p>
+    <div class="shell">
+      <p class="line">
+        <span class="path">~</span>
+        <span class="prompt">$</span>
+        <span class="command">wget https://raw.githubusercontent.com/progrium/dokku/v0.4.2/bootstrap.sh</span>
+      </p>
+      <p class="line">
+        <span class="path">~</span>
+        <span class="prompt">$</span>
+        <span class="command">sudo DOKKU_TAG=v0.4.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>
+      </p>
+    </div>
+  </div>
 
-### Getting Started
+  <hr class="featurette-divider">
 
-- [Installation](http://progrium.viewdocs.io/dokku/installation)
-- [Upgrading](http://progrium.viewdocs.io/dokku/upgrading)
-- [Troubleshooting](http://progrium.viewdocs.io/dokku/troubleshooting)
-- [Getting Help](http://progrium.viewdocs.io/dokku/getting-started/where-to-get-help)
+  <!-- START THE FEATURETTES -->
 
-### Deployment
+  <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>
+      <p class="lead">Powered by Docker, you can install Dokku on any hardware. Use it on inexpensive cloud providers. Use the extra cash to buy a pony or feed kittens. You'll save tens of dollars a year on your dog photo sharing website.</p>
+    </div>
+    <div class="col-md-5">
+      <img class="featurette-image img-responsive center-block" alt="Docker Logo" src="assets/docker.png">
+    </div>
+  </div>
 
-- [Application Deployment](http://progrium.viewdocs.io/dokku/application-deployment)
-- [Configuration management](http://progrium.viewdocs.io/dokku/configuration-management)
-- [Process management](http://progrium.viewdocs.io/dokku/process-management)
-- [DNS Configuration](http://progrium.viewdocs.io/dokku/dns)
-- [Nginx Configuration](http://progrium.viewdocs.io/dokku/nginx)
-- [Running Remote commands](http://progrium.viewdocs.io/dokku/remote-commands)
+  <hr class="featurette-divider">
 
-### Community Contributions
+  <div class="row featurette">
+    <div class="col-md-7 col-md-push-5">
+      <h2 class="featurette-heading">Easy Git Deploys. <span class="text-muted">From your command-line to the cloud.</span></h2>
+      <p class="lead">Once it's set up on a host, you can push Heroku-compatible applications to it via Git. They'll build using Heroku buildpacks and then run in isolated containers. The end result is your own, single-host version of Heroku.</p>
+    </div>
+    <div class="col-md-5 col-md-pull-7">
+      <img class="featurette-image img-responsive center-block" alt="Git Logo" src="assets/git.png">
+    </div>
+  </div>
 
-- [Clients](http://progrium.viewdocs.io/dokku/community/clients)
-- [Plugins](http://progrium.viewdocs.io/dokku/plugins)
+  <hr class="featurette-divider">
 
-### Development
+  <div class="row featurette">
+    <div class="col-md-7">
+      <h2 class="featurette-heading">Extensible Platform. <span class="text-muted">Customize your PaaS.</span></h2>
+      <p class="lead">Write dokku plugins in any language. Share them online with others, and extend those already available. Dokku's simple core is easy to hack and add the features you need to get your job done.</p>
+    </div>
+    <div class="col-md-5">
+      <img class="featurette-image img-responsive center-block" alt="Extend Logo" src="assets/extend.png">
+    </div>
+  </div>
 
-- [Plugin Creation](http://progrium.viewdocs.io/dokku/development/plugin-creation)
-- [Pluginhooks](http://progrium.viewdocs.io/dokku/development/pluginhooks)
-
-## Things this project won't do
-
- * **Multi-host.** It runs on one host. If you need more, have a look at [Deis](http://deis.io/).
- * **Multitenancy.** Multi-app, and loosely multi-user based on SSH keys, but that's it.
-
-## Sponsors
-
-Though we love everybody doing open source, we especially love [Deis](http://deis.io/) for sponsoring Dokku.
+  <hr class="featurette-divider">
+</div>

docs/installation.md

@@ -3,23 +3,22 @@
 ## Requirements
 
 - A fresh VM running Ubuntu `14.04 x64`
+- At least `1GB` of system memory ([workaround for 512MB machines](http://progrium.viewdocs.io/dokku/advanced-installation))
+- The VM should have a FQDN set before installation (check by running `sudo hostname -f`).
 
-Ubuntu 14.04 x64 x64. Ideally have a domain ready to point to your host. It's designed for and is probably best to use a fresh VM. The bootstrapper will install everything it needs.
+Ubuntu 14.04 x64. Ideally have a domain ready to point to your host. It's designed for and is probably best to use a fresh VM. The bootstrapper will install everything it needs.
 
 ## Installing the latest Stable version
 
 To install the latest stable version of dokku, you can run the following bootstrapper command:
 
 ```shell
-# This may need to be run twice
-wget -qO- https://raw.github.com/progrium/dokku/v0.3.16/bootstrap.sh | sudo DOKKU_TAG=v0.3.16 bash
+# installs dokku via apt-get
+wget https://raw.githubusercontent.com/progrium/dokku/v0.4.2/bootstrap.sh
+sudo DOKKU_TAG=v0.4.2 bash bootstrap.sh
 
-# Install the web installer. See `Configuring` under
-# `Advanced Install Customization` if you wish to perform the
-# rest of the install via CLI
-cd /root/dokku && make dokku-installer
-
-# Go to your server's IP and follow the web installer
+# By default, this will start the web-based installer on your server's IP
+# You may *instead* follow the debian packaging notes for a more automated installation
 ```
 
 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:
@@ -29,5 +28,6 @@ For various reasons, certain hosting providers may have other steps that should
 
 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)

docs/nginx.md

@@ -1,16 +1,36 @@
 # Nginx
 
-Dokku uses nginx as it's server for routing requests to specific applications.
+Dokku uses nginx as it's 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)
+```
 
 ## TLS/SPDY support
 
 Dokku provides easy TLS/SPDY support out of the box. This can be done app-by-app or for all subdomains at once. Note that whenever TLS support is enabled SPDY is also enabled.
 
+### SSL Configuration
+
+In 0.4.0, SSL Configuration has been replaced by the [`certs` plugin](http://progrium.viewdocs.io/dokku/deployment/ssl-configuration)). For users of dokku 0.3.x, please refer to the following sections.
+
 ### Per App
 
-To enable TLS connection to to one of your applications, copy or symlink the `.crt` and `.key` files into the application's `/home/dokku/:app/tls` folder (create this folder if it doesn't exist) as `server.crt` and `server.key` respectively.
+To enable TLS connections to to one of your applications, do the following:
+
+* Create a key file and a cert file.
+ * You can find detailed steps for generating a self-signed certificate at https://devcenter.heroku.com/articles/ssl-certificate-self
+ * If you are not paranoid and need it just for a DEV or STAGING app, you can use http://www.selfsignedcertificate.com/ to generate your 2 files more easily.
+* Rename your files to server.key and server.crt
+* tar these 2 files together, *without* subdirectories. Example: tar cvf cert-key.tar server.crt server.key
+* Install the pair for your app, like this: ssh dokku@ip-of-your-dokku-server nginx:import-ssl < cert-key.tar
+
+You will need to repeat the steps above for each domain used to serve your app. You can't simply create a single tar with all key/cert files in it (see https://github.com/progrium/dokku/issues/1195).
 
-Redeployment of the application will be needed to apply TLS configuration. Once it is redeployed, the application will be accessible by `https://` (redirection from `http://` is applied as well).
 
 ### All Subdomains
 
@@ -41,21 +61,49 @@ You can import ssl certificates via tarball using the following command:
 dokku nginx:import-ssl myapp < archive-of-certs.tar
 ```
 
-This archive should is expanded via `tar xvf`. It should contain `server.crt` and `server.key`.
+This archive is expanded via `tar xvf`. It should contain `server.crt` and `server.key`.
+
+
+## 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:
+
+```shell
+dokku config:set myapp DOKKU_SSL_TERMINATED=1
+```
+
+Only use this option if:
+1. All requests are terminated at the load balancer, and forwarded to Nginx
+2. The load balancer is configured to send the `X-Forwarded-` headers (this may be off by default)
+
+If it's possible to make HTTP/S requests directly to Nginx, bypassing the load balancer, or if the load balancer is not configured to set these headers, then it becomes possible for a client to set these headers to arbitrary values.
+
+This could result in security issue, for example, if your application looks at the value of the `X-Forwarded-Proto` to determine if the request was made over HTTPS.
+
 
 ## Customizing the nginx configuration
 
-> New as of 0.3.10
+> New as of 0.4.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, you should copy the existing template - ssl or non-ssl - into your `$DOKKU_ROOT/$APP` directory at the file `nginx.conf.template`.
+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, you should copy the existing template - ssl or non-ssl - into your application repository's root directory as the file `nginx.conf.template`. The next time you deploy, Nginx will use your template instead of the default.
 
-For instance - assuming defaults - to customize the nginx template in use for the `myapp` application, create a file at `/home/dokku/myapp/nginx.conf.template` with the following contents:
+> New as of 0.3.10.
+
+You may also place this file on disk at the path `/home/dokku/myapp/nginx.conf.template`. If placed on disk on the dokku server, the template file **must** be owned by the user `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:
 
 ```
 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;
 
   # set a custom header for requests
   add_header X-Served-By www-ec2-01;
@@ -75,7 +123,28 @@ server {
 }
 ```
 
-The above is a sample, http configuration that adds an `X-Served-By` header to requests. The template is manually uploaded this template file and **must** it owned by `dokku:dokku`.
+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.
+
+### 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):
+
+    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
+
+    mkdir /home/dokku/myapp/nginx.conf.d/
+    echo 'client_max_body_size 50M;' > /home/dokku/myapp/nginx.conf.d/upload.conf
+    chown dokku:dokku /home/dokku/myapp/nginx.conf.d/upload.conf
+    service nginx reload
 
 ## Customizing hostnames
 
@@ -87,7 +156,7 @@ 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.
 
-You can optionally override this in a plugin by implementing the `nginx-hostname` pluginhook. For example, you can reverse the subdomain with the following sample `nginx-hostname` pluginhook:
+You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. For example, you can reverse the subdomain with the following sample `nginx-hostname` plugin trigger:
 
 ```shell
 #!/usr/bin/env bash
@@ -105,13 +174,13 @@ You can also use the built-in `domains` plugin to handle:
 
 ### Disabling VHOSTS
 
-If desired, it is possible to disable vhosts by setting the `NO_VHOST` environment variable:
+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.
+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
 
@@ -161,7 +230,7 @@ d6499edb0edb        dokku/node-js-app:latest   "/bin/bash -c '/star   About a mi
 
 # Default site
 
-By default, dokku will route any received request with an unknown HOST header value to the lexicographically first site in the nginx config stack. If this is not the desired behavior, you may want to add the following configuration to nginx. This will catch all unknown HOST header values and return a `410 Gone` response.
+By default, dokku will route any received request with an unknown HOST header value to the lexicographically first site in the nginx config stack. If this is not the desired behavior, you may want to add the following configuration to nginx. This will catch all unknown HOST header values and return a `410 Gone` response. You can replace the `return 410;` with `return 444;` which will cause nginx to not respond to requests that do not match known domains (connection refused).
 
 ```
 server {

docs/plugins.md

@@ -1,10 +1,11 @@
 # Plugins
 
-Dokku itself is built out of plugins and uses [pluginhook](https://github.com/progrium/pluginhook) 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/progrium/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.
 
     nginx-vhosts/
+    ├── plugin.toml  # plugin metadata
     ├── commands     # contains additional commands
     ├── install      # runs on dokku installation
     └── post-deploy  # runs after an app is deployed
@@ -12,23 +13,47 @@ Let's take a quick look at the current dokku nginx plugin that's shipped with do
 ## Installing a plugin
 
 ```shell
+# 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>
+
+# previous versions (0.3.x and below) of dokku require a manual process to install plugins
 cd /var/lib/dokku/plugins
 git clone <git url>
 dokku plugins-install
 ```
 
-> todo: add a command to dokku to install a plugin, given a git repository `dokku plugin:install <git url>`?
-
 ## Creating your own plugin
 
 [See the full documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation).
 
+## Official Plugins (Beta)
+
+The following plugins are available and provided by dokku maintainers. Where noted, these plugins should be considered beta software and may not have been used as thoroughly as community plugins. Please file issues against their respective issue trackers.
+
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [CouchDB (beta)](https://github.com/dokku/dokku-couchdb)                                          | [dokku][]             | 0.4.0+                |
+| [Elasticsearch (beta)](https://github.com/dokku/dokku-elasticsearch-plugin)                       | [dokku][]             | 0.4.0+                |
+| [MariaDB (beta)](https://github.com/dokku/dokku-mariadb-plugin)                                   | [dokku][]             | 0.4.0+                |
+| [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+                |
+| [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+                |
+| [Maintenance mode (beta)](https://github.com/dokku/dokku-maintenance)                             | [dokku][]             | 0.4.0+                |
+| [HTTP Auth (beta)](https://github.com/dokku/dokku-http-auth)                                      | [dokku][]             | 0.4.0+                |
+
 ## Community plugins
 
 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
 [ademuk]: https://github.com/ademuk
+[alessio]: https://github.com/alessio
 [alex-sherwin]: https://github.com/alex-sherwin
 [alexanderbeletsky]: https://github.com/alexanderbeletsky
 [Aomitayo]: https://github.com/Aomitayo
@@ -37,6 +62,7 @@ Note: The following plugins have been supplied by our community and may not have
 [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
 [dyson]: https://github.com/dyson
 [F4-Group]: https://github.com/F4-Group
@@ -47,7 +73,6 @@ Note: The following plugins have been supplied by our community and may not have
 [hughfletcher]: https://github.com/hughfletcher
 [iskandar]: https://github.com/iskandar
 [jeffutter]: https://github.com/jeffutter
-[jezdez]: https://github.com/jezdez
 [jlachowski]: https://github.com/jlachowski
 [krisrang]: https://github.com/krisrang
 [Kloadut]: https://github.com/Kloadut
@@ -78,6 +103,13 @@ Note: The following plugins have been supplied by our community and may not have
 [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
 
@@ -85,47 +117,33 @@ Note: The following plugins have been supplied by our community and may not have
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | Compatible with 0.2.0 |
-| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | Compatible with 0.2.0 |
-| [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin)                                       | [hughfletcher][]      |                       |
-| [PostgreSQL](https://github.com/Kloadut/dokku-pg-plugin)                                          | [Kloadut][]           | Compatible with 0.2.0 |
-| [PostgreSQL](https://github.com/jezdez/dokku-postgres-plugin)                                     | [jezdez][]            | Compatible with 0.2.0 |
-| [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
-| [PostgreSQL (single container)](https://github.com/jeffutter/dokku-postgresql-plugin)             | [jeffutter][]         | This plugin creates a single postgresql container that all your apps can use. Thus only one instance of postgresql running (good for servers without a ton of memory). |
-| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | Compatible with 0.2.0 |
-| [PostGIS](https://github.com/fermuch/dokku-pg-plugin)                                             | [fermuch][]           |                       |
+| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | 0.3.x                  |
+| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | 0.3.x                  |
+| [MariaDB (single container)](https://github.com/krisrang/dokku-mariadb)                           | [krisrang][]          | 0.3.26+                |
+| [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]         | 0.3.x                  |
+| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | 0.3.x                  |
+| [PostgreSQL (single container)](https://github.com/Flink/dokku-psql-single-container)             | [Flink][]             | 0.3.26+                |
 
 #### Caching
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [Memcached](https://github.com/jezdez/dokku-memcached-plugin)                                     | [jezdez][]            | Compatible with 0.2.0 |
-| [Memcached](https://github.com/jlachowski/dokku-memcached-plugin)                                 | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
-| [Redis](https://github.com/jezdez/dokku-redis-plugin)                                             | [jezdez][]            | Requires https://github.com/rlaneve/dokku-link; compatible with 0.2.0 |
-| [Redis](https://github.com/luxifer/dokku-redis-plugin)                                            | [luxifer][]           |                       |
-| [Redis](https://github.com/sekjun9878/dokku-redis-plugin)                                         | [sekjun9878][]        | A better Redis plugin with automatic instance creation and Dokku Link support
-| [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | Compatible with 0.2.0 |
+| [Redis](https://github.com/sekjun9878/dokku-redis-plugin)                                         | [sekjun9878][]         | 0.3.26+                |
+| [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | 0.3.x                  |
 | [Varnish](https://github.com/Zenedith/dokku-varnish-plugin)                                       | [Zenedith][]          | Varnish cache between nginx and application with base configuration|
 
 #### Queuing
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [RabbitMQ](https://github.com/jlachowski/dokku-rabbitmq-plugin)                                   | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
-| [RabbitMQ (single container)](https://github.com/jlachowski/dokku-rabbitmq-single-plugin)         | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
+| [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         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [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/jezdez/dokku-elasticsearch-plugin)                             | [jezdez][]            | Compatible with 0.2.0 to 0.3.13 |
-| [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup>                   | [blag][]              | Compatible with 0.2.0 |
-| [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin)                   | [jeffutter][]         |                       |
-| [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 2014-02-22: targeting dokku @ [latest][217d00a]; will fail with Dokku earlier than [28de3ec][]. |
-| [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin)                     | [jeffutter][]         | Incompatible with 0.2.0 (checked at [dccee02][]) |
-| [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin)                                           | [Aomitayo][]          |                       |
+| [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 0.3.x                  |
 
 [dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709
 
@@ -134,10 +152,12 @@ Note: The following plugins have been supplied by our community and may not have
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [Circus](https://github.com/apmorton/dokku-circus)                                                | [apmorton][]          |                       |
-| [Shoreman ](https://github.com/statianzo/dokku-shoreman)                                          | [statianzo][]         | Compatible with 0.2.0 |
-| [Supervisord](https://github.com/statianzo/dokku-supervisord)                                     | [statianzo][]         | Compatible with 0.2.0 |
-| [Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)                       | [sehrope][]           | Works with dokku @ [c77cbf1][] - no 0.2.0 compatibility |
 | [Forego](https://github.com/iskandar/dokku-forego)                                                | [iskandar][]          | Compatible with 0.2.x |
+| [Forego](https://github.com/Flink/dokku-forego)                                                   | [Flink][]             | 0.4.0+                |
+| [Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)                       | [sehrope][]           | 0.4.0+                |
+| [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       | 0.3.x                 |
+| [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
@@ -146,32 +166,24 @@ Note: The following plugins have been supplied by our community and may not have
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [app-url](https://github.com/mikecsh/dokku-app-url)                                               | [mikecsh][]           | Works with 0.2.0      |
 | [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [heichblatt][]        |                       |
-| [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | dokku >= [c77cbf1][]  |
+| [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][]          |                       |
-| [git rev-parse HEAD in env](https://github.com/nornagon/dokku-git-rev)                            | [nornagon][]          | Compatible with 0.2.0 |
-| [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | Works with v0.2.3     |
-| [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | dokku >= [c77cbf1][]. 2014-02-17: [a043e98][] targeting dokku @ [latest][217d00a] |
-| [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     |                       |
-| [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | 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+                 |
+| [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][]           |                       |
-| [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | Works with v0.2.3     |
-| [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | Requires dokku >= [c77cbf1][] |
-| [Ports](https://github.com/heichblatt/dokku-ports)                                                | [heichblatt][]        |                       |
-| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     |                       |
-| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>2</sup>            | [cedricziel][]        | 2014-01-17: compatible with upstream/master |
-| [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>3</sup>                   | [cedricziel][]        | 2014-01-17: compatible with upstream/master |
-| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | Compatible with 0.3.1 |
-| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | Compatible with 0.2.0 |
-| [Maintenance mode](https://github.com/Flink/dokku-maintenance)                                    | [Flink][]             |                       |
-| [HTTP Auth](https://github.com/Flink/dokku-http-auth)                                             | [Flink][]             |                       |
+| [Nuke Containers](https://github.com/heichblatt/dokku-nuke)                                       | [heichblatt][]        |                       |
+| [Open App Ports](https://github.com/heichblatt/dokku-ports)                                       | [heichblatt][]        |                       |
+| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | 0.4.0+                |
+| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>2</sup>            | [cedricziel][]        | 0.3.x                 |
+| [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                 |
 
-[8fca220]: https://github.com/progrium/dokku/commit/8fca2204edb0017796d6915ca9157c05b1238e28
 [217d00a]: https://github.com/progrium/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
-[98332de]: https://github.com/dyson/dokku-persistent-storage/commit/98332de4b5b640610bee535f4d5260263074e18b
-[a043e98]: https://github.com/stuartpb/dokku-bind-port/commit/a043e9892f4815b6525c850131e09fd64db5c1fa
 
 <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)
 
@@ -183,22 +195,24 @@ Note: The following plugins have been supplied by our community and may not have
 
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
-| [Wordpress](https://github.com/dudagroup/dokku-wordpress-template)                                | [abossard][]          | Dokku dev, mariadb, volume, domains |
-| [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         |                       |
-| [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            |                       |
+| [Airbrake deploy](https://github.com/Flink/dokku-airbrake-deploy)                                 | [Flink][]             | 0.4.0+                |
+| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          | 0.2.0+ (tag 0.2.0), 0.3.0+ (tag 0.3.0), 0.4.0+ |
 | [Chef cookbooks](https://github.com/fgrehm/chef-dokku)                                            | [fgrehm][]            |                       |
 | [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] |                       |
 | [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+ |
 | [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
-| [Slack Notifications](https://github.com/ribot/dokku-slack)                                       | [ribot][]             |                       |
 | [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski][]        |                       |
-| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          |                       |
+| [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     | 0.3.26+                |
+| [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][]  |                       |
-| [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         |                       |
 | [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      |                       |
-| [Rails logs](https://github.com/Flink/dokku-rails-logs)                                           | [Flink][]             |                       |
-| [Airbrake deploy](https://github.com/Flink/dokku-airbrake-deploy)                                 | [Flink][]             |                       |
+| [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.
 
@@ -206,15 +220,48 @@ Note: The following plugins have been supplied by our community and may not have
 
 The following plugins have been removed as their functionality is now in Dokku Core.
 
-| 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)    |
-| [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains 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) |
+| 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)          |
+| [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              |
+| [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)             |
+| [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)       |
+| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | v0.3.10 (domains plugin)        |
 
 <sup>1</sup> Conflicts with [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)
 <sup>2</sup> Similar to the heroku-labs feature (see https://devcenter.heroku.com/articles/labs-user-env-compile)
+
+[a043e98]: https://github.com/stuartpb/dokku-bind-port/commit/a043e9892f4815b6525c850131e09fd64db5c1fa
+
+
+### Unmaintained Plugins
+
+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](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+ |
+| [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][]          |                       |
+| [PostGIS](https://github.com/fermuch/dokku-pg-plugin)                                             | [fermuch][]           |                       |
+| [PostgreSQL (single container)](https://github.com/jeffutter/dokku-postgresql-plugin)             | [jeffutter][]         | This plugin creates a single postgresql container that all your apps can use. Thus only one instance of postgresql running (good for servers without a ton of memory). |
+| [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin)                     | [jeffutter][]         | Incompatible with 0.2.0 (checked at [dccee02][]) |
+| [Redis](https://github.com/luxifer/dokku-redis-plugin)                                            | [luxifer][]           |                       |

docs/process-management.md

@@ -4,10 +4,40 @@ Dokku supports rudimentary process (really container) management via the `ps` pl
 
 ```
 ps <app>                                        List processes running in app container(s)
+ps:rebuildall                                   Rebuild all apps
+ps:rebuild <app>                                Rebuild an app
+ps:restartall                                   Restart all deployed app containers
+ps:restart <app>                                Restart app container(s)
+ps:scale <app> <proc>=<count> [<proc>=<count>]  Set how many processes of a given process to run
 ps:start <app>                                  Start app container(s)
 ps:stop <app>                                   Stop app container(s)
-ps:restart <app>                                Restart app container(s)
-ps:restartall                                   Restart all deployed app containers
 ```
 
-*NOTE*: As of v0.3.14, `dokku deploy:all` in now deprecated by `ps:restartall` and will be removed in a future version.
+## Scaling
+
+Dokku allows you to run multiple process types at different container counts. For example, if you had an app that contained 1 web app listener and 1 background job processor, dokku can, spin up 1 container for each process type defined in the Procfile. *By default, dokku will only start a single web process (if defined.)* However, if you wanted, for example, 2 job processors running simultaneously, you can modify this behavior in one of the following ways.
+
+### DOKKU_SCALE file
+
+You can optionally create a `DOKKU_SCALE` file in the root of your repository. Dokku expects this file to contain one line for every process defined in your Procfile.
+
+Example:
+```
+web=1
+worker=2
+```
+
+### `ps:scale` command
+
+Dokku can also manage scaling itself via the `ps:scale` command. This command can be used to scale multiple process types at the same time.
+
+```
+dokku ps:scale app_name web=1 worker=2
+```
+
+*NOTE*: Dokku will always use the DOKKU_SCALE file that ships with the repo to override any local settings.
+
+
+## The web proctype
+
+Like Heroku, we handle the `web` proctype differently from others. The `web` proctype is the only proctype that will invoke custom checks as defined by a CHECKS file. It is also the only proctype that will be launched in a container that is either proxied via nginx or bound to an external port.

docs/template.html

@@ -1,105 +1,95 @@
-<!doctype html>
-<head>
-  <meta charset="utf-8">
-  <title>{{NAME}} :: viewdocs.io</title>
-  <link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:300,600' rel='stylesheet' type='text/css'>
-  <link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
-  <link rel="stylesheet" href="http://static.gist.io/css/screen.css">
-  <style type="text/css">
-    body {
-      background: #f0f3f3;
-      font: 500 16px proxima-nova-1, proxima-nova-2, 'Proxima Nova', 'Montserrat', HelveticaNeue, Helvetica, Arial, sans-serif;
-    }
-    article pre {
-      background-color: #fff;
-      border-radius: 2px;
-      box-shadow: 0 0 10px rgba(0,0,0,.1);
-      color: #222;
-      font-family: 'Source Code Pro', Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
-      font-size: 14px;
-      overflow: auto;
-      padding: 10px;
-      width: 100%;
-      -moz-border-radius: 2px;
-      -webkit-border-radius: 2px;
-    }
-    article p code {
-      background-color: #fff;
-      border-radius: 2px;
-      box-shadow: 0 0 10px rgba(0,0,0,.1);
-      color: #333;
-      font-family: 'Source Code Pro', Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
-      font-size: 14px;
-      padding: 0 4px;
-      -moz-border-radius: 2px;
-      -webkit-border-radius: 2px;
-    }
-    article .highlight {
-      padding: 0;
-    }
-    article h1 {
-      font-size: 2em;
-      font-weight: bold;
-    }
-    article h2 {
-      font-size: 1.5em;
-      font-weight: bold;
-    }
-    article h3 {
-      font-size: 1em;
-      text-transform: uppercase;
-      font-weight: bold;
-    }
-    article ul, article ol {
-      list-style-position: outside;
-      padding-left: 20px;
-    }
-    th:nth-of-type(1) {
-      width: 230px;
-    }
-    th:nth-of-type(2) {
-      width: 140px;
-    }
-    tr, td {
-      line-height: 24px;
-      text-align: left;
-    }
-    #gistbody h1:first-child {
-      border-bottom: 1px solid #dadada;
-      display: block;
-      color: #000;
-      font-weight: 700;
-      font-size: 20px;
-      line-height: 1;
-      margin: 0 0 24px 0;
-      padding-bottom: 31px;
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-    }
-    .content {
-      font-size: 1em;
-    }
-  </style>
-</head>
-<body>
-  <section class="content">
-    <header>
-      <h1 id="gistid"><a href="http://github.com/{{USER}}/{{NAME}}">{{NAME}}</a> :: <a href="/{{NAME}}">index</a></h1>
-      </header>
-      <article id="gistbody" class="instapaper_body entry-content">
-        {{CONTENT}}
-      </article>
-    </section>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <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 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/0.4.2/docs/assets/style.css" rel="stylesheet">
+
+  </head>
+  <body>
+    <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>
+            </h1>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-xs-8 col-md-6 col-md-push-4 markdown-body" style="padding-top:16px">
+          {{CONTENT}}
+        </div>
+        <div class="col-xs-4 col-md-2 col-md-pull-6 col-md-offset-2" style="padding-top:16px">
+          <div class="list-group">
+            <a href="#" class="list-group-item disabled">Getting Started</a>
+            <a href="http://progrium.viewdocs.io/dokku/installation" class="list-group-item">Installation</a>
+            <a href="http://progrium.viewdocs.io/dokku/upgrading" class="list-group-item">Upgrading</a>
+            <a href="http://progrium.viewdocs.io/dokku/troubleshooting" class="list-group-item">Troubleshooting</a>
+            <a href="http://progrium.viewdocs.io/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="http://progrium.viewdocs.io/dokku/application-deployment" class="list-group-item">Deploying an Application</a>
+            <a href="http://progrium.viewdocs.io/dokku/configuration-management" class="list-group-item">Environment Variables</a>
+            <a href="http://progrium.viewdocs.io/dokku/process-management" class="list-group-item">Scaling Processes</a>
+            <a href="http://progrium.viewdocs.io/dokku/dns" class="list-group-item">DNS Configuration</a>
+            <a href="http://progrium.viewdocs.io/dokku/nginx" class="list-group-item">Nginx Configuration</a>
+            <a href="http://progrium.viewdocs.io/dokku/deployment/ssl-configuration" class="list-group-item">SSL Configuration</a>
+            <a href="http://progrium.viewdocs.io/dokku/remote-commands" class="list-group-item">Remote commands</a>
+            <a href="http://progrium.viewdocs.io/dokku/docker-options" class="list-group-item">Docker Container Options</a>
+            <a href="http://progrium.viewdocs.io/dokku/dokku-events-logs" class="list-group-item">Dokku Event Logs</a>
+
+            <a href="#" class="list-group-item disabled">Community Contributions</a>
+
+            <a href="http://progrium.viewdocs.io/dokku/community/clients" class="list-group-item">Clients</a>
+            <a href="http://progrium.viewdocs.io/dokku/plugins" class="list-group-item">Plugins</a>
+
+            <a href="#" class="list-group-item disabled">Development</a>
+
+            <a href="http://progrium.viewdocs.io/dokku/development/plugin-creation" class="list-group-item">Plugin Creation</a>
+            <a href="http://progrium.viewdocs.io/dokku/development/plugin-triggers" class="list-group-item">Plugin Triggers</a>
+            <a href="http://progrium.viewdocs.io/dokku/development/testing" class="list-group-item">Running Tests</a>
+            <a href="http://progrium.viewdocs.io/dokku/development/release-process" class="list-group-item">Release Process</a>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/1.3.0/anchor.js"></script>
     <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-      ga('create', 'UA-6824126-17', 'viewdocs.io');
-      ga('send', 'pageview');
+    document.addEventListener("DOMContentLoaded", function (e) {
+      anchors.options.visible = 'always';
+      anchors.add('.markdown-body h1, .markdown-body h2, .markdown-body h3, .markdown-body h4');
+
+      var elements = document.querySelectorAll('table'),
+          classNames = ['table', 'table-striped', 'table-hover', 'table-condensed'],
+          addClass = function (el, className) {
+            if (el.classList) {
+              el.classList.add(className);
+            } else {
+              el.className += ' ' + className;
+            }
+          }
+
+      Array.prototype.forEach.call(classNames, function (className, i) {
+        Array.prototype.forEach.call(elements, function (el, i) {
+          addClass(el, className);
+        });
+      });
+    });
     </script>
-    <script src="//static.getclicky.com/js" type="text/javascript"></script>
-    <script type="text/javascript">try{ clicky.init(100672863); }catch(e){}</script>
-    <noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/100672863ns.gif" /></p></noscript>
   </body>
 </html>

docs/troubleshooting.md

@@ -27,9 +27,9 @@ A value of 64 would allow domains with up to 64 characters. Set it to 128 if you
 Save the file and try stopping nginx and starting it again:
 
 ```
-root@dockerapps:~/dokku/buildstep# /etc/init.d/nginx stop
+root@dockerapps:~/dokku# /etc/init.d/nginx stop
  * Stopping nginx nginx                                        [ OK ]
-root@dockerapps:~/dokku/buildstep# /etc/init.d/nginx start
+root@dockerapps:~/dokku# /etc/init.d/nginx start
  * Starting nginx nginx                                        [ OK ]
 ```
 
@@ -65,8 +65,8 @@ __Solution (Less solution, more helpful troubleshooting steps):__
   Find the failed phase's container image (*077581956a92* in this example)
 
     ```
-    root@dokku:~# docker ps -a  | grep builder
-    94d9515e6d93        077581956a92                "/build/builder"       29 minutes ago      Exited (0) 25 minutes ago                       cocky_bell
+    root@dokku:~# docker ps -a  | grep build
+    94d9515e6d93        077581956a92                "/build"       29 minutes ago      Exited (0) 25 minutes ago                       cocky_bell
     ```
 
   Start a new container with the failed image and poke around (i.e. ensure you can access the internet from within the container or attempt the failed command, if known)
@@ -109,26 +109,6 @@ Also see [issue #116](https://github.com/progrium/dokku/issues/116)
 
 ***
 
-__Symptom:__ I want to deploy my nodejs app on dokku and use a postinstall script within the package.json but I keep getting this error:
-
-    npm WARN cannot run in wd app@1.0.0 echo blah (wd=/build/app)
-
-__Solution:__
-
-This is a permissions problem as dokku (buildstep) uses a root account for running the application. (This may change please see this thread: https://github.com/progrium/buildstep/pull/42).
-
-To allow npm to work as root account one must set the configuration option of ```unsafe-perm``` to true. There are many ways to set this configuration option but the one I've found works most consistently with the heroku-nodejs-buildpack is as a .npmrc file. The file should contain
-
-```
-unsafe-perm = true
-```
-
-Note that this is NOT required on heroku as heroku does not use a root account for running the application.
-
-Please see https://github.com/progrium/dokku/issues/420 and https://github.com/heroku/heroku-buildpack-nodejs/issues/92.
-
-***
-
 __Symptom:__ I successfully deployed my application with no deployment errors and receiving Bad Gateway when attempting to access the application
 
 __Solution:__
@@ -141,3 +121,31 @@ When specifying your port you may want to use something similar to:
 
 Please see https://github.com/progrium/dokku/issues/282
 
+***
+
+__Symptom:__ Deployment fails because of slow internet connection, messages shows `gzip: stdin: unexpected end of file`
+
+__Solution:__
+
+If you see output similar this when deploying:
+
+```
+ Command: 'set -o pipefail; curl --fail --retry 3 --retry-delay 1 --connect-timeout 3 --max-time 30 https://s3-external-1.amazonaws.com/heroku-buildpack-ruby/ruby-2.0.0-p451-default-cache.tgz -s -o - | tar zxf -' failed unexpectedly:
+ !
+ !     gzip: stdin: unexpected end of file
+ !     tar: Unexpected EOF in archive
+ !     tar: Unexpected EOF in archive
+ !     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:
+
+```
+#/home/dokku/ENV
+export CURL_TIMEOUT=600
+export CURL_CONNECT_TIMEOUT=30
+```
+
+References
+* https://github.com/progrium/dokku/issues/509
+* https://github.com/dokku-alt/dokku-alt/issues/169

docs/upgrading.md

@@ -1,73 +1,62 @@
 # Upgrading
 
-Dokku is in active development. You can update the deployment step and the build step separately.
+This document covers upgrades for the 0.3.0 series and up. If upgrading from previous versions, we recommend [a fresh install](http://progrium.viewdocs.io/dokku/installation) on a new server.
 
-**Note**: If you are upgrading from a revision prior to [27d4bc8c3c](https://github.com/progrium/dokku/commit/27d4bc8c3c19fe580ef3e65f2f85b85101cd83e4), follow the instructions in [this wiki entry](https://github.com/progrium/dokku/wiki/Migrating-to-Dokku-0.2.0).
+> As of 0.3.18, dokku is installed by default via a debian package. Source-based installations are still available, though not recommended.
 
-To update the deploy step (this is updated less frequently):
+## Dokku
+
+If dokku was installed via a debian package, you can upgrade dokku via the following command:
+
+```shell
+sudo apt-get install dokku
+```
+
+For unattended upgrades, you may run the following command:
+
+```shell
+sudo apt-get install -qq -y dokku
+```
+
+If you have installed dokku from source, you may run the following commands to upgrade:
 
 ```shell
 cd ~/dokku
 git pull --tags origin master
+
+# continue to install from source
+sudo DOKKU_BRANCH=master make install
+
+# upgrade to debian package-based installation
 sudo make install
 ```
 
-Nothing needs to be restarted. Changes will take effect on the next push / deployment.
-
-To update the build step:
+All changes will take effect upon next application deployment. To trigger a rebuild of every application, simply run the following command:
 
 ```shell
-git clone https://github.com/progrium/buildstep.git
-cd buildstep
+dokku ps:rebuildall
+```
+
+## Herokuish image
+
+If dokku was installed via a debian package, you can upgrade herokuish via the following command:
+
+```shell
+sudo apt-get install herokuish
+```
+
+For unattended upgrades, you may run the following command:
+
+```shell
+sudo apt-get install -qq -y herokuish
+```
+
+In some cases, it may be desirable to run a specific version of herokuish. To install/upgrade herokuish from source, run the following commands:
+
+```shell
+cd /tmp
+git clone https://github.com/gliderlabs/herokuish.git
+cd herokuish
 git pull origin master
-sudo make build
+IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest VERSION=master make -e build-in-docker
 ```
-
-This will build a fresh Ubuntu Quantal image, install a number of packages, and
-eventually replace the Docker image for buildstep.
-
-## Migrating from 0.1.0 to 0.2.0
-
-This should be summary of breaking changes between 0.1 and 0.2 version with instructions to upgrade.
-
-### software-properties-common
-
-software-properties-common is now a dependency for plugins. Before running dokku install script, make sure it is installed.
-
-```shell
-> sudo apt-get install software-properties-common
-```
-
-### Gitreceive removed
-
-PR [#270](https://github.com/progrium/dokku/pull/270).
-
-Starting with Dokku 0.2.0, [Gitrecieve](https://github.com/progrium/gitreceive) is replaced by a `git` plugin.
-
-Dokku no longer uses the `git` user. Everything is done with the `dokku` user account.
-
-This causes the remote url to change. Instead of pushing to `git@hostname:app`, you should now push to `dokku@hostname:app`.
-The url must be modified using the `git remote set-url` command :
-
-    git remote set-url deploy dokku@hostname:app
-
-Where `deploy` is the name of the remote.
-
-Additionally, the repositiories on the server must be migrated to work with dokku 0.2.0
-
-There is an upgrade [script](https://gist.github.com/plietar/7201430), which is meant to automate this migration. To use it:
-
-1. run the script as root
-2. `git pull` to get the latest version of dokku
-3. make install
-4. `dokku ps:restartall`
-
-TDB.
-
-### Cache directory
-
-Commit [#6350f373](https://github.com/progrium/dokku/commit/6350f373be2cef4f3bb90912099e1be6196522d1)
-
-Buildstep have to be re-installed in order to support cache directory.
-
-TDB.

dokku

@@ -3,14 +3,25 @@ set -eo pipefail
 shopt -s nullglob
 
 export DOKKU_DISTRO=${DOKKU_DISTRO:="ubuntu"}
-export DOKKU_IMAGE=${DOKKU_IMAGE:="progrium/buildstep"}
+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:="/var/lib/dokku/plugins"}
+export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}
+export PLUGIN_AVAILABLE_PATH=${PLUGIN_AVAILABLE_PATH:="$PLUGIN_PATH/available"}
+export PLUGIN_ENABLED_PATH=${PLUGIN_ENABLED_PATH:="$PLUGIN_PATH/enabled"}
+export PLUGIN_CORE_PATH=${PLUGIN_CORE_PATH:="$DOKKU_LIB_ROOT/core-plugins"}
+export PLUGIN_CORE_AVAILABLE_PATH=${PLUGIN_CORE_AVAILABLE_PATH:="$PLUGIN_CORE_PATH/available"}
+export PLUGIN_CORE_ENABLED_PATH=${PLUGIN_CORE_ENABLED_PATH:="$PLUGIN_CORE_PATH/enabled"}
+
+export DOKKU_API_VERSION=1
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
 export DOKKU_VALID_EXIT=0
 
-source "$PLUGIN_PATH/common/functions"
+export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
+export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
+
+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
@@ -21,7 +32,7 @@ parse_args "$@"
 args=("$@")
 if [[ "${args[0]}" =~ ^--.* ]]; then
   for arg in "$@"; do
-    if [[ "$arg" =~ ^--.* ]];then
+    if [[ "$arg" =~ ^--.* ]]; then
       shift 1
     else
       break
@@ -30,14 +41,14 @@ if [[ "${args[0]}" =~ ^--.* ]]; then
 fi
 ! has_tty && DOKKU_QUIET_OUTPUT=1
 
-if [[ $(id -un) != "dokku" && $1 != plugins-install* && $1 != "plugins-update" ]]; then
+if [[ $(id -un) != "dokku" && $1 != plugin:*install* && $1 != "plugin:update" && $1 != nginx:*-logs ]]; then
   sudo -u dokku -E -H $0 "$@"
   exit
 fi
 
 if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
   export -n SSH_ORIGINAL_COMMAND
-  if [[ $1 =~ config-* ]];then
+  if [[ $1 =~ config-* ]] || [[ $1 =~ docker-options* ]]; then
     xargs $0 <<<$SSH_ORIGINAL_COMMAND
     exit $?
   else
@@ -48,110 +59,156 @@ fi
 
 case "$1" in
   receive)
-    APP="$2"; IMAGE="dokku/$APP"; IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
+    APP="$2"; IMAGE=$(get_app_image_name $APP); IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
     dokku_log_info1 "Cleaning up..."
-    dokku cleanup
+    docker_cleanup
     dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE..."
     dokku build "$APP" "$IMAGE_SOURCE_TYPE" "$TMP_WORK_DIR"
-    dokku_log_info1 "Releasing $APP..."
-    dokku release "$APP" "$IMAGE_SOURCE_TYPE"
-    dokku_log_info1 "Deploying $APP..."
-    dokku deploy "$APP"
-    dokku_log_info2 "Application deployed:"
-         dokku urls "$APP" | sed "s/^/       /"
-    echo
+    release_and_deploy "$APP"
     ;;
 
   deploy)
-    APP="$2"; IMAGE="dokku/$APP"
-    pluginhook pre-deploy $APP
+    [[ -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
 
-    if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
-      oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER")
-    fi
+    is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
+    DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
+    oldids=$(get_app_container_ids $APP)
 
-    # start the app
-    DOCKER_ARGS=$(: | pluginhook docker-args $APP deploy)
-    DOCKER_ARGS+=$(: | pluginhook docker-args-deploy $APP)
-    BIND_EXTERNAL=$(pluginhook bind-external-ip $APP)
+    DOKKU_RESTART_LIMIT=$(dokku config:get $APP DOKKU_RESTART_LIMIT || echo 10)
+    DOKKU_RESTART_LIMIT=${DOKKU_RESTART_LIMIT:=10}
 
-    is_image_buildstep_based "$IMAGE" && DOKKU_BUILDSTEP=true
-    [[ -n "$DOKKU_BUILDSTEP" ]] && START_CMD="/start web"
-    [[ -z "$DOKKU_BUILDSTEP" ]] && eval "$(grep DOKKU_DOCKERFILE_PORT $DOKKU_ROOT/$APP/ENV)"
+    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)
 
-    if [[ "$BIND_EXTERNAL" = "false" ]];then
-      port=${DOKKU_DOCKERFILE_PORT:=5000}
-      id=$(docker run -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
-      ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $id)
-    else
-      id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE $START_CMD)
-      port=$(docker port $id 5000 | sed 's/[0-9.]*://')
-      ipaddr=127.0.0.1
-    fi
+    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"}
 
-    # if we can't post-deploy successfully, kill new container
-    kill_new() {
-      docker inspect $id &> /dev/null && docker kill $id > /dev/null
-      trap - INT TERM EXIT
-      kill -9 $$
-    }
+    DOKKU_DEFAULT_DOCKER_ARGS=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG)
 
-    # run checks first, then post-deploy hooks, which switches Nginx traffic
-    trap kill_new INT TERM EXIT
-    dokku_log_info1 "Running pre-flight checks"
-    pluginhook check-deploy  $APP $port $ipaddr $id
-    trap -        INT TERM EXIT
+    while read line || [[ -n "$line" ]]; do
+      TRIM=${line%#*}
+      PROC_TYPE=${TRIM%%=*}
+      PROC_COUNT=${TRIM#*=}
+      CONTAINER_INDEX=1
 
-    # now using the new container
-    echo $id > "$DOKKU_ROOT/$APP/CONTAINER"
-    echo $ipaddr > "$DOKKU_ROOT/$APP/IP"
-    echo $port > "$DOKKU_ROOT/$APP/PORT"
-    echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$port" > "$DOKKU_ROOT/$APP/URL"
+      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' "
+        DOCKER_ARGS+=" --restart=on-failure:$DOKKU_RESTART_LIMIT"
+        [[ "$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
+      else
+        CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1))
+      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"
-    pluginhook post-deploy  $APP $port $ipaddr
+    plugn trigger post-deploy $APP $port $ipaddr
 
     # kill the old container
-    if [[ -n "$oldid" ]]; then
+    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 container in $WAIT seconds"
+      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
-        docker kill $oldid
+        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
-
     ;;
 
   cleanup)
-    # delete all non-running container
-    # shellcheck disable=SC2046
-    docker rm $(docker ps -a -f 'status=exited' -q) &> /dev/null &
-    # delete unused images
-    # shellcheck disable=SC2046
-    docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null &
-    ;;
-
-  plugins)
-    ls -1 -d $PLUGIN_PATH/*/
-    ;;
-
-  plugins-install)
-    pluginhook install
-    ;;
-
-  plugins-install-dependencies)
-    pluginhook dependencies
-    ;;
-
-  plugins-update)
-    pluginhook update
+    docker_cleanup
     ;;
 
   # DEPRECATED as of v0.3.14
@@ -165,29 +222,26 @@ case "$1" in
     echo ""
     echo "Options:"
 
-    cat<<EOF | pluginhook commands help | sort
-    help                                            Print the list of commands
-    plugins                                         Print active plugins
-    plugins-install                                 Install active plugins
-    plugins-update                                  Update active plugins
+    cat<<EOF | plugn trigger commands help | sort | column -c2 -t -s,
+    help, Print the list of commands
 EOF
     ;;
 
   *)
     implemented=0
-    for script in $PLUGIN_PATH/*/commands; do
+    for script in $PLUGIN_ENABLED_PATH/*/commands; do
       set +e; $script "$@" ; exit_code=$? ; set -e
-      if [ "$exit_code" -eq "$DOKKU_NOT_IMPLEMENTED_EXIT" ]; then
+      if [[ "$exit_code" -eq "$DOKKU_NOT_IMPLEMENTED_EXIT" ]]; then
         continue
       fi
 
       implemented=1
-      if [ "$exit_code" -ne "$DOKKU_VALID_EXIT" ]; then
+      if [[ "$exit_code" -ne "$DOKKU_VALID_EXIT" ]]; then
         exit $exit_code
       fi
     done
 
-    if [ "$implemented" -eq 0 ]; then
+    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

plugins/00_dokku-standard/commands

@@ -1,48 +1,48 @@
 #!/usr/bin/env bash
+[[ " build release trace delete ls run url urls version help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname $0)/../common/functions"
+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="dokku/$APP"; IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
+    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
-      buildstep)
+      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
-        # *DEPRECATED* in v0.4.0: `pluginhook pre-build` will be removed in future releases
-        pluginhook pre-build "$APP"
-        pluginhook pre-build-buildstep "$APP"
+        plugn trigger pre-build-buildpack "$APP"
 
-        # *DEPRECATED* in v0.3.14: `pluginhook docker-args` will be removed in future releases
-        # https://github.com/progrium/dokku/issues/896 & https://github.com/progrium/dokku/issues/906
-        DOCKER_ARGS=$(: | pluginhook docker-args $APP build)
-        DOCKER_ARGS+=$(: | pluginhook docker-args-build $APP)
-        id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build/builder)
+        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
 
-        # *DEPRECATED* in v0.4.0: `pluginhook post-build` will be removed in future releases
-        pluginhook post-build "$APP"
-        pluginhook post-build-buildstep "$APP"
+        plugn trigger post-build-buildpack "$APP"
         ;;
 
       dockerfile)
         # extract first port from Dockerfile
-        DOCKERFILE_PORT=$(grep EXPOSE Dockerfile | head -1 | awk '{ print $2 }')
-        [[ -n "$DOCKERFILE_PORT" ]] && dokku config:set-norestart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT
+        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"
 
-        # sticking with same pattern of building app image before pre-build for now.
-        docker build -t "$IMAGE" .
-        # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
-        pluginhook pre-build-dockerfile "$APP"
-        pluginhook post-build-dockerfile "$APP"
+        [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
+        docker build $DOKKU_DOCKER_BUILD_OPTS -t "$IMAGE" .
+
+        plugn trigger post-build-dockerfile "$APP"
         ;;
 
       *)
@@ -52,31 +52,29 @@ case "$1" in
     ;;
 
   release)
-    APP="$2"; IMAGE="dokku/$APP"; IMAGE_SOURCE_TYPE="$3"
+    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
-      buildstep)
-        # *DEPRECATED* in v0.4.0: `pluginhook pre-release` will be removed in future releases
-        pluginhook pre-release "$APP"
-        pluginhook pre-release-buildstep "$APP"
-        if [[ -f "$DOKKU_ROOT/ENV" ]]; then
-          id=$(docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh" < "$DOKKU_ROOT/ENV")
+      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 [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
-          id=$(docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh" < "$DOKKU_ROOT/$APP/ENV")
+        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
-        # *DEPRECATED* in v0.4.0: `pluginhook post-release` will be removed in future releases
-        pluginhook post-release "$APP"
-        pluginhook post-release-buildstep "$APP"
+        plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG"
         ;;
 
       dockerfile)
-        # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
-        pluginhook pre-release-dockerfile "$APP"
-        pluginhook post-release-dockerfile "$APP"
+        # 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"
         ;;
 
       *)
@@ -88,8 +86,7 @@ case "$1" in
   trace)
     [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p $DOKKU_ROOT/.dokkurc
     [[ "$2" == "on" ]] || [[ "$2" == "off" ]] || {
-      echo "Valid trace options are [on/off]"
-      exit 1
+      dokku_log_fail "Valid trace options are [on/off]"
     }
 
     if [[ "$2" == "on" ]]; then
@@ -108,56 +105,47 @@ case "$1" in
     ;;
 
   ls)
-    apps=$(ls -d $DOKKU_ROOT/*/ 2>/dev/null) || (echo "You haven't depoyed any applications yet" && exit 1)
+    dokku_apps=$(ls -d $DOKKU_ROOT/*/ 2>/dev/null) || (dokku_log_fail "You haven't deployed any applications yet")
 
-    dokku_col_log_info2_quiet "App Name" "Container id"
+    dokku_col_log_info1_quiet "App Name" "Container Type" "Container Id" "Status"
 
-    for app in $apps; do
-      if [[ -f $app/CONTAINER ]]; then
-        dokku_col_log_msg "$(basename $app)" "$(< $app/CONTAINER)"
+    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 "$(basename $app)"
+        dokku_col_log_msg "$APP" "NOT_DEPLOYED" "NOT_DEPLOYED" "NOT_DEPLOYED"
       fi
     done
     ;;
 
-  logs)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2";
-
-    if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
-      CONTAINER=$(<$DOKKU_ROOT/$APP/CONTAINER)
-      if [[ $3 == "-t" ]]; then
-        docker logs --follow $CONTAINER
-      else
-        docker logs $CONTAINER | tail -n 100
-      fi
-    else
-      echo "Application's container not found"
-    fi
-    ;;
-
   run)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2"; IMAGE="dokku/$APP"
+    [[ -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=$(: | pluginhook docker-args $APP run)
-    DOCKER_ARGS+=$(: | pluginhook docker-args-run $APP)
+    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_buildstep_based "$IMAGE" && EXEC_CMD="/exec"
+    is_image_herokuish_based "$IMAGE" && EXEC_CMD="/exec"
 
     docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
     ;;
 
   url | urls)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2";
+    [[ -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
@@ -177,28 +165,36 @@ case "$1" in
       SCHEME="https"
     fi
 
-    if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
-      echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")"
+    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/HOSTNAME"):$(< "$DOKKU_ROOT/$APP/PORT")"
+      echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")"
     fi
   ;;
 
   version)
-    cat "$DOKKU_ROOT/VERSION" || {
-      echo "Unable to determine dokku's version" 2>&1
-      exit 1
-    }
+    cat "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
     ;;
 
   help)
-    cat && cat<<EOF
-    ls                                              Pretty listing of deployed applications and containers
-    logs <app> [-t]                                 Show the last logs for an application (-t follows)
-    run <app> <cmd>                                 Run a command in the environment of an application
-    url <app>                                       Show the first URL for an application (compatibility)
-    urls <app>                                      Show all URLs for an application
-    version                                         Print dokku's version
+    cat<<EOF
+    ls, Pretty listing of deployed applications and containers
+    run <app> <cmd>, Run a command in the environment of an application
+    url <app>, Show the first URL for an application (compatibility)
+    urls <app>, Show all URLs for an application
+    version, Print dokku's version
 EOF
     ;;
 

plugins/00_dokku-standard/install

@@ -41,3 +41,18 @@ WantedBy=multi-user.target
 EOF
     ;;
 esac
+
+
+cat<<EOF > /etc/update-motd.d/99-dokku
+#!/bin/sh
+
+if [ ! -f "/home/dokku/HOSTNAME" ]; then
+  echo "\nTo avoid cli-based dokku configuration, use the web installer"
+  echo "Debian-based installs should have this running and available"
+  echo "on port 80. You can also install it via the following commands:"
+  echo ""
+  echo "  cd /root/dokku"
+  echo "  sudo make dokku-installer\n"
+fi
+EOF
+chmod +x /etc/update-motd.d/99-dokku

plugins/00_dokku-standard/plugin.toml

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

plugins/20_events/backup-check

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

plugins/20_events/backup-export

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

plugins/20_events/backup-import

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

plugins/20_events/bind-external-ip

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

plugins/20_events/check-deploy

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

plugins/20_events/commands

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+[[ " events events:on events:off events:list 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
+    events [-t], Show the last events (-t follows)
+    events:list, List logged events
+    events:on, Enable events logger
+    events:off, Disable events logger
+EOF
+    ;;
+
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;
+
+esac
+

plugins/20_events/dependencies

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

plugins/20_events/docker-args-build

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

plugins/20_events/docker-args-deploy

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

plugins/20_events/docker-args-run

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

plugins/20_events/git-post-pull

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

plugins/20_events/git-pre-pull

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

plugins/20_events/hook

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename $0)" "$@"

plugins/20_events/install

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+DOKKU_RSYSLOG_FILTER=/etc/rsyslog.d/99-dokku.conf
+DOKKU_LOGROTATE_FILE=/etc/logrotate.d/dokku
+
+flag_rsyslog_needs_restart=n
+
+# This can be done unconditionally as mkdir -p
+# exits gracefully if the path already exists
+mkdir -m 775 -p "$DOKKU_LOGS_DIR"
+chown syslog:dokku "$DOKKU_LOGS_DIR"
+
+if [[ ! -f  "$DOKKU_EVENTS_LOGFILE" ]]; then
+  touch "$DOKKU_EVENTS_LOGFILE"
+  # chown syslog:root might not work on SUSE
+  chown syslog:dokku "$DOKKU_EVENTS_LOGFILE"
+  chmod 664 "$DOKKU_EVENTS_LOGFILE"
+fi
+
+if [[ ! -f  "$DOKKU_RSYSLOG_FILTER" ]]; then
+  cat >"$DOKKU_RSYSLOG_FILTER" <<EOF
+:syslogtag, contains, "dokku" $DOKKU_EVENTS_LOGFILE
+EOF
+  flag_rsyslog_needs_restart=y
+fi
+
+if [[ ! -f "$DOKKU_LOGROTATE_FILE" ]]; then
+  cat >"$DOKKU_LOGROTATE_FILE" <<EOF
+$DOKKU_LOGS_DIR/*.log {
+        daily
+        rotate 7
+        missingok
+        notifempty
+        su syslog dokku
+        compress
+        delaycompress
+        postrotate
+                reload rsyslog >/dev/null 2>&1 || true
+        endscript
+        create 664 syslog dokku
+}
+EOF
+  flag_rsyslog_needs_restart=y
+fi
+
+if [[ "$flag_rsyslog_needs_restart" == "y" ]]; then
+  service rsyslog restart
+fi
+
+[[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename $0)" "$@"
+
+exit 0

plugins/20_events/nginx-hostname

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

plugins/20_events/nginx-pre-reload

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

plugins/20_events/plugin.toml

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

plugins/20_events/post-build-buildpack

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

plugins/20_events/post-build-dockerfile

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

plugins/20_events/post-delete

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

plugins/20_events/post-deploy

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

plugins/20_events/post-domains-update

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

plugins/20_events/post-release-buildpack

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

plugins/20_events/post-release-dockerfile

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

plugins/20_events/pre-build-buildpack

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

plugins/20_events/pre-build-dockerfile

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

plugins/20_events/pre-delete

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

plugins/20_events/pre-deploy

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

plugins/20_events/pre-release-buildpack

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

plugins/20_events/pre-release-dockerfile

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

plugins/20_events/receive-app

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

plugins/20_events/receive-branch

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

plugins/20_events/retire-container-failed

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

plugins/20_events/update

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

plugins/WARNING

@@ -1,2 +0,0 @@
-
-Please note that the hooks in Dokku are experimental and are likely to change quite a bit.

plugins/apps/commands

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
+[[ " apps apps:create apps:destroy help apps:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 case "$1" in
   apps)
@@ -9,8 +10,8 @@ case "$1" in
     ;;
 
   apps:create)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    [[ -d "$DOKKU_ROOT/$2" ]] && dokku_log_warn "Name is already taken" && exit 1
+    [[ -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"
@@ -18,12 +19,12 @@ case "$1" in
     ;;
 
   apps:destroy)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    [[ "$2" == "tls" ]] && echo "Unable to destroy tls directory" && exit 1
-    APP="$2"; IMAGE="dokku/$APP"
-
+    [[ -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)."
@@ -32,31 +33,29 @@ case "$1" in
 
       read -p "> " app_name
       if [[ "$app_name" != "$APP" ]]; then
-        dokku_log_warn "Confirmation did not match $APP. Aborted."
-        exit 1
+        dokku_log_fail "Confirmation did not match $APP. Aborted."
       fi
     fi
 
     echo "Destroying $APP (including all add-ons)"
 
-    pluginhook pre-delete $APP
-    if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
-      ID=$(< "$DOKKU_ROOT/$APP/CONTAINER")
-
-      docker stop $ID > /dev/null || true
-      docker rm $ID  > /dev/null || true
+    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
 
-    docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null &
-
-    pluginhook post-delete $APP
+    plugn trigger post-delete $APP $IMAGE_TAG
     ;;
 
   help | apps:help)
-    cat && cat<<EOF
-    apps                                            List your apps
-    apps:create <app>                               Create a new app
-    apps:destroy <app>                              Permanently destroy an app
+    cat<<EOF
+    apps, List your apps
+    apps:create <app>, Create a new app
+    apps:destroy <app>, Permanently destroy an app
 EOF
     ;;
 

plugins/apps/plugin.toml

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

plugins/apps/post-delete

@@ -1,4 +1,12 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-[[ -n $1 ]] && rm -r "$DOKKU_ROOT/$1" > /dev/null
+APP="$1"; IMAGE_REPO=$(get_app_image_repo $APP)
+[[ -n $APP ]] && rm -rf "$DOKKU_ROOT/$APP" > /dev/null
+
+# remove all application containers & images
+# shellcheck disable=SC2046
+docker rm -f $(docker ps -a --no-trunc | egrep "dokku/${APP}:" | awk '{ print $1 }' | xargs) &>/dev/null || true
+# shellcheck disable=SC2046
+docker rmi $(docker images -q $IMAGE_REPO | xargs) &>/dev/null || true

plugins/apps/pre-delete

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG); CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+verify_app_name "$APP"
 
-APP="$1"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
 if [[ -d $CACHE_DIR ]]; then
   docker run --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
 fi

plugins/backup/commands

@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
+[[ " backup:export backup:import help backup:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
-CURRENT_BACKUP_VERSION=1
-
 case "$1" in
   backup:export)
+    CURRENT_BACKUP_VERSION=1
     OUTPUT_FILE="$2"
     BACKUP_DIR="$DOKKU_ROOT"
 
     BACKUP_TMP_DIR=$(mktemp -d)
     BACKUP_TMP_FILE="$BACKUP_TMP_DIR/backup.tar"
 
-    : | pluginhook backup-export 1 $BACKUP_DIR | tar -cf $BACKUP_TMP_FILE --files-from -
+    : | plugn trigger backup-export 1 $BACKUP_DIR | tar -cf $BACKUP_TMP_FILE --files-from -
 
     pushd $BACKUP_DIR > /dev/null
     find . -maxdepth 1 -type d -not -name . | sed 's:./::g' > "$BACKUP_TMP_DIR/.dokku_backup_apps"
@@ -50,14 +50,12 @@ case "$1" in
     tar xf $INPUT_FILE --directory=$BACKUP_TMP_DIR
 
     if [[ ! -f $BACKUP_TMP_DIR/.dokku_backup_version ]]; then
-      echo "Unable to determine backup version"
-      exit 1
+      dokku_log_fail "Unable to determine backup version"
     fi
 
     VERSION=$(< $BACKUP_TMP_DIR/.dokku_backup_version)
     if [[ $VERSION -ne 1 ]]; then
-      echo "Unknown format version $VERSION"
-      exit 1
+      dokku_log_fail "Unknown format version $VERSION"
     fi
 
     echo "Importing a version $VERSION backup..."
@@ -65,12 +63,11 @@ case "$1" in
     BACKUP_ROOT="$BACKUP_TMP_DIR""$DOKKU_ROOT"
     TARGET_DIR="$DOKKU_ROOT"
 
-    if ! pluginhook backup-check $VERSION "$BACKUP_ROOT" "$TARGET_DIR" "$BACKUP_TMP_DIR/.dokku_backup_apps"; then
+    if ! plugn trigger backup-check $VERSION "$BACKUP_ROOT" "$TARGET_DIR" "$BACKUP_TMP_DIR/.dokku_backup_apps"; then
       if $force; then
         echo "-f used. Ignoring warnings."
       else
-        echo "Archive did not pass sanity checks. Use -f to import anyway" >&2
-        exit 1
+        dokku_log_fail "Archive did not pass sanity checks. Use -f to import anyway"
       fi
     fi
 
@@ -78,7 +75,7 @@ case "$1" in
     while read app; do mkdir "$TARGET_DIR/$app"; echo "Imported $app"; done < $BACKUP_TMP_DIR/.dokku_backup_apps
 
     # have the plugins import their stuff
-    pluginhook backup-import $VERSION "$BACKUP_ROOT" $TARGET_DIR "$BACKUP_TMP_DIR/.dokku_backup_apps"
+    plugn trigger backup-import $VERSION "$BACKUP_ROOT" $TARGET_DIR "$BACKUP_TMP_DIR/.dokku_backup_apps"
 
     rm -rf $BACKUP_TMP_DIR
 
@@ -86,9 +83,9 @@ case "$1" in
     ;;
 
   help | backup:help)
-    cat && cat<<EOF
-    backup:export [file]                            Export dokku configuration files
-    backup:import [file]                            Import dokku configuration files
+    cat<<EOF
+    backup:export [file], Export dokku configuration files
+    backup:import [file], Import dokku configuration files
 EOF
     ;;
 

plugins/backup/plugin.toml

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

plugins/build-env/plugin.toml

@@ -0,0 +1,4 @@
+[plugin]
+description = "dokku core build-env plugin"
+version = "0.4.0"
+[plugin.config]

plugins/build-env/pre-build-buildpack

@@ -1,21 +1,22 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
-APP="$1"; IMAGE="dokku/$APP"; BUILD_ENV=""
+APP="$1"; IMAGE=$(get_app_image_name $APP); BUILD_ENV=""
+verify_app_name "$APP"
 
-[[ -f "$DOKKU_ROOT/BUILD_ENV" ]] && cat "$DOKKU_ROOT/BUILD_ENV" >> "$DOKKU_ROOT/ENV" && rm "$DOKKU_ROOT/BUILD_ENV"
+[[ -z $(config_get --global CURL_CONNECT_TIMEOUT) ]] && config_set --global CURL_CONNECT_TIMEOUT=5
+[[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=30
 
-! (grep -q CURL_CONNECT_TIMEOUT "$DOKKU_ROOT/ENV" > /dev/null 2>&1) && echo "export CURL_CONNECT_TIMEOUT=5" >> "$DOKKU_ROOT/ENV"
-! (grep -q CURL_TIMEOUT "$DOKKU_ROOT/ENV" > /dev/null 2>&1) && echo "export CURL_TIMEOUT=30" >> "$DOKKU_ROOT/ENV"
-
-if [[ -f "$DOKKU_ROOT/ENV" ]]; then
-  BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")
+if [[ -n $(config_export global) ]]; then
+  BUILD_ENV+=$'\n'
+  BUILD_ENV+=$(config_export global)
   BUILD_ENV+=$'\n'
 fi
-if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
+if [[ -n $(config_export app $APP) ]]; then
   BUILD_ENV+=$'\n'
-  BUILD_ENV+=$(< "$DOKKU_ROOT/$APP/ENV")
+  BUILD_ENV+=$(config_export app $APP)
   BUILD_ENV+=$'\n'
 fi
 

plugins/certs/commands

@@ -0,0 +1,176 @@
+#!/usr/bin/env bash
+[[ " certs:add certs:generate certs:info certs:remove certs:update help certs: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/certs/functions"
+source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
+
+is_tar_import() {
+  [[ -t 0 ]] && return 1
+  return 0
+}
+
+is_file_import() {
+  local CRT_FILE="$3"
+  local KEY_FILE="$4"
+
+  if [[ -f $CRT_FILE ]] && [[ -f $KEY_FILE ]]; then
+    return 0
+  fi
+
+  return 1
+}
+
+certs_set() {
+  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$2"
+  APP="$2"; CRT_FILE="$3"; KEY_FILE="$4"
+
+  is_file_import $CRT_FILE $KEY_FILE || is_tar_import || dokku_log_fail "Tar archive containing server.crt and server.key expected on stdin"
+
+  if is_tar_import; then
+    TEMP_DIR=$(mktemp -d)
+    cd $TEMP_DIR
+    tar xvf - <&0
+
+    CRT_FILE_SEARCH=$(find . -type f -name "*.crt")
+    CRT_FILE_COUNT=$(printf "%s" "$CRT_FILE_SEARCH" | grep -c '^')
+    if [[ $CRT_FILE_COUNT -lt 1 ]]; then
+      dokku_log_fail "Tar archive is missing .crt file"
+    elif [[ $CRT_FILE_COUNT -gt 1 ]]; then
+      dokku_log_fail "Tar archive contains more than one .crt file"
+    else
+      CRT_FILE=$CRT_FILE_SEARCH
+    fi
+
+    KEY_FILE_SEARCH=$(find . -type f -name "*.key")
+    KEY_FILE_COUNT=$(printf "%s" "$KEY_FILE_SEARCH" | grep -c '^')
+    if [[ $KEY_FILE_COUNT -lt 1 ]]; then
+      dokku_log_fail "Tar archive is missing .key file"
+    elif [[ $KEY_FILE_COUNT -gt 1 ]]; then
+      dokku_log_fail "Tar archive contains more than one .key file"
+    else
+      KEY_FILE=$KEY_FILE_SEARCH
+    fi
+  fi
+
+  mkdir -p "$DOKKU_ROOT/$APP/tls"
+  mv "$CRT_FILE" "$DOKKU_ROOT/$APP/tls/server.crt"
+  mv "$KEY_FILE" "$DOKKU_ROOT/$APP/tls/server.key"
+  cd $DOKKU_ROOT
+  rm -rf $TEMP_DIR
+  nginx_build_config $APP
+}
+
+case "$1" in
+  certs:add)
+    certs_set "$@"
+    ;;
+
+  certs:generate)
+    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+    verify_app_name "$2"
+    APP="$2"; DOMAIN="$3"; SSL_PATH="$DOKKU_ROOT/$APP/tls"
+
+    if [[ ! -f "$SSL_PATH/server.key" ]] && [[ ! -f "$SSL_PATH/server.crt" ]]; then
+      TMP_WORK_DIR=$(mktemp -d -t "dokku_certs.XXXXXXXXX")
+      trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' INT TERM EXIT
+
+      pushd $TMP_WORK_DIR > /dev/null
+
+      openssl genrsa -des3 -passout pass:x -out server.pass.key 2048
+      openssl rsa -passin pass:x -in server.pass.key -out server.key
+      openssl req -new -key server.key -out server.csr
+      openssl x509 -req -days 365 -in server.csr -signkey server.key -out server.crt
+
+      mkdir -p "$DOKKU_ROOT/$APP/tls"
+      dokku_log_info1 "Installing certificate and key..."
+      mv -f $TMP_WORK_DIR/server.key $TMP_WORK_DIR/server.crt $SSL_PATH
+      [[ -n "$DOMAIN" ]] && (dokku domains:add $APP $DOMAIN || nginx_build_config $APP)
+      dokku_log_info1 "The following is a certificate signing request that can be used"
+      dokku_log_info1 "to generate an 'officially' signed SSL certificate for $APP at $DOMAIN"
+      dokku_log_info1 "by a CA of your choosing."
+      cat server.csr
+    else
+      dokku_log_info1 "$APP has an SSL endpoint already defined"
+    fi
+    ;;
+
+  certs:info)
+    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+    verify_app_name "$2"
+    APP="$2"; SSL_TYPE=$(is_ssl_enabled $APP)
+    case "$SSL_TYPE" in
+      app)
+        SSL_PATH="$DOKKU_ROOT/$APP/tls"
+      ;;
+
+      global)
+        SSL_PATH="$DOKKU_ROOT/tls"
+      ;;
+
+      *)
+      ;;
+    esac
+
+    if [[ -n "$SSL_PATH" ]]; then
+      dokku_log_info1 "Fetching SSL Endpoint info for $APP..."
+      dokku_log_info1 "Certificate details:"
+      dokku_log_info2 "Common Name(s): "
+
+      for domain in $(get_ssl_hostnames $APP | xargs); do
+        dokku_log_info2 "   $domain"
+      done
+
+      dokku_log_info2 "Expires At: $(openssl x509 -in $SSL_PATH/server.crt -noout -text | grep "Not After :" | awk -F " : " '{ print $2 }')"
+      dokku_log_info2 "Issuer: $(openssl x509 -in $SSL_PATH/server.crt -noout -text | grep "Issuer:" | xargs | sed -e "s/Issuer: //g")"
+      dokku_log_info2 "Starts At: $(openssl x509 -in $SSL_PATH/server.crt -noout -text | grep "Not Before:" | awk -F ": " '{ print $2 }')"
+      dokku_log_info2 "Subject: $(openssl x509 -in $SSL_PATH/server.crt -noout -subject | sed -e "s:subject= ::g"| sed -e "s:^/::g" | sed -e "s:/:; :g")"
+      SSL_VERIFY_OUTPUT="$(openssl verify -verbose -purpose sslserver $SSL_PATH/server.crt | awk -F ':' '{ print $2 }' | tail -1 | xargs || true)"
+      if [[ "$SSL_VERIFY_OUTPUT" == "OK" ]]; then
+        SSL_SELF_SIGNED="verified by a certificate authority."
+      else
+        SSL_SELF_SIGNED="self signed."
+      fi
+      dokku_log_info2 "SSL certificate is $SSL_SELF_SIGNED"
+    else
+      dokku_log_info1 "$APP does not have an SSL endpoint"
+    fi
+    ;;
+
+  certs:remove)
+    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+    verify_app_name "$2"
+    APP="$2"; APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
+
+    if [[ -d "$APP_SSL_PATH" ]]; then
+      dokku_log_info1 "Removing SSL endpoint from $APP"
+      rm -rf $APP_SSL_PATH
+      plugn trigger post-domains-update $APP
+    else
+      dokku_log_info1 "An app-specific SSL endpoint is not defined"
+    fi
+    ;;
+
+  certs:update)
+    certs_set "$@"
+    ;;
+
+  help | certs:help)
+    cat && cat<<EOF
+    certs:add <app> CRT KEY, Add an ssl endpoint to an app. Can also import from a tarball on stdin
+    certs:chain CRT [CRT ...], [NOT IMPLEMENTED] Print the ordered and complete chain for the given certificate.
+    certs:generate <app> DOMAIN, Generate a key and certificate signing request (and self-signed certificate)
+    certs:info <app>, Show certificate information for an ssl endpoint.
+    certs:key <app> CRT KEY [KEY ...], [NOT IMPLEMENTED] Print the correct key for the given certificate.
+    certs:remove <app>, Remove an SSL Endpoint from an app.
+    certs:rollback <app>, [NOT IMPLEMENTED] Rollback an SSL Endpoint for an app.
+    certs:update <app> CRT KEY, Update an SSL Endpoint on an app. Can also import from a tarball on stdin
+EOF
+    ;;
+
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;
+
+esac

plugins/certs/functions

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+# returns 'global', 'app', 'false'
+# if both are configured, app trumps global
+is_ssl_enabled() {
+  local APP=$1; verify_app_name $APP
+  APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
+  WILDCARD_SSL_PATH="$DOKKU_ROOT/tls"
+
+  if [[ -e "$APP_SSL_PATH/server.crt" ]] && [[ -e "$APP_SSL_PATH/server.key" ]]; then
+    echo app
+    return 0
+  elif  [[ -e "$WILDCARD_SSL_PATH/server.crt" ]] && [[ -e "$WILDCARD_SSL_PATH/server.key" ]]; then
+    echo global
+    return 0
+  else
+    return 1
+  fi
+}
+
+get_ssl_hostnames() {
+  local APP=$1; verify_app_name $APP
+  case "$(is_ssl_enabled $APP)" in
+    app)
+      SSL_PATH="$DOKKU_ROOT/$APP/tls"
+    ;;
+
+    global)
+      SSL_PATH="$DOKKU_ROOT/tls"
+    ;;
+  esac
+
+  SSL_HOSTNAME=$(openssl x509 -in $SSL_PATH/server.crt -noout -subject | tr '/' '\n' | grep CN= | cut -c4-)
+  SSL_HOSTNAME_ALT=$(openssl x509 -in $SSL_PATH/server.crt -noout -text | grep --after-context=1 '509v3 Subject Alternative Name:' | tail -n 1 | sed -e "s/[[:space:]]*DNS://g"  | tr ',' '\n' || true)
+  if [[ -n "$SSL_HOSTNAME_ALT" ]]; then
+    SSL_HOSTNAMES="${SSL_HOSTNAME}\n${SSL_HOSTNAME_ALT}"
+  else
+    SSL_HOSTNAMES=$SSL_HOSTNAME
+  fi
+  echo -e $SSL_HOSTNAMES
+  return 0
+}