Release 0.3.26

Merge pull request #1128 from progrium/1091_mh-switch-to-herokuish
switching to herokuish. closes #1091
2015-08-24 16:01:28 -04:00 · 2015-08-24 12:11:05 -07:00 · 2015-08-24 14:54:13 -04:00 · 2015-08-24 14:26:34 -04:00 · 2015-08-24 14:20:36 -04:00 · 2015-08-24 09:22:07 -07:00
107 changed files with 1862 additions and 636 deletions
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,23 +1,172 @@
 # History

+## 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: @michaelhobbs Heroku-style Container-Level scaling
+- #1118: @michaelshobbs Heroku-style Container-Level scaling
 - #1210: @cddr Split nginx logs out by $APP
- #1232: @michaelhobbs Allow passing of docker build options and document dockerfile deployment. Closes #1231
+- #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: @michaelhobbs Handle docker opts over ssh without escaping quotes. closes #1187
+- #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: @michaelhobbs Filter out literal wildcard when deploying an unrelated domain. Closes #1185
+- #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: @michaelhobbs Let circleci dictate docker install (fixes master)
+- #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
@@ -27,13 +176,13 @@
 - #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: @michaelhobbs [docs] add dokku-logspout 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: @michaelhobbs Call pre-build-dockerfile before docker build
+- #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
@@ -42,16 +191,16 @@
 - #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: @michaelhobbs allow docker-options over ssh. plus test. closes #1135
- #1146: @michaelhobbs Don't re-deploy on domains:add. allow multple domains on command line. Closes #1142
- #1147: @michaelhobbs Utilize all 4 free CircleCI containers
+- #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: @michaelhobbs unify default and custom nginx template processing
+- #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
@@ -61,29 +210,29 @@

 - #1056: @joshco New check retries feature
 - #1060: @josegonzalez Add .template suffix to nginx configuration templates. Refs #1054
- #1064: @michaelhobbs [docs] Document test suite
- #1065: @michaelhobbs Minor dev env cleanup
+- #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: @michaelhobbs Include official docker-options plugin. closes #1062
- #1081: @michaelhobbs Force testing .env with no newline. Closes #1025, #1026, #1063
- #1082: @michaelhobbs Test cleanup with slight performance boost
+- #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: @michaelhobbs Make docker-options adhere to DOKKU_NOT_IMPLEMENTED_EXIT pattern
- #1088: @michaelhobbs Support dockerfiles without expose command. closes #1083
- #1097: @michaelhobbs Use config:set-norestart in domains plugin. config:get for dockerfile port. closes #1041
+- #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
@@ -97,18 +246,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
@@ -117,27 +266,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
@@ -145,31 +294,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

@@ -178,45 +327,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
@@ -253,7 +402,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

@@ -267,7 +416,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
@@ -299,9 +448,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
--- a/36
+++ b/36
@@ -2,8 +2,8 @@ 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
+STACK_URL ?= https://github.com/gliderlabs/herokuish.git
+PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
 PLUGINS_PATH ?= /var/lib/dokku/plugins

 # If the first argument is "vagrant-dokku"...
@@ -14,6 +14,12 @@ ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
  $(eval $(RUN_ARGS):;@:)
 endif

+ifeq ($(CIRCLECI),true)
+	BUILD_STACK_TARGETS = circleci deps build
+else
+	BUILD_STACK_TARGETS = build-in-docker
+endif
+
 .PHONY: all apt-update install copyfiles man-db version plugins dependencies sshcommand pluginhook docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku

 include tests.mk
@@ -27,7 +33,7 @@ install: dependencies copyfiles plugin-dependencies plugins version
 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 rubygem*.deb
@@ -88,12 +94,12 @@ docker: aufs
 	usermod -aG docker dokku
 ifndef CI
 	curl -sSL https://get.docker.com/gpg | apt-key add -
-	echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
+	echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
 	apt-get update
 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 lxc-docker-1.6.2
 endif
 	sleep 2 # give docker a moment i guess
 endif
@@ -104,22 +110,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.*://' && 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
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Dokku [![Build Status](https://img.shields.io/circleci/project/progrium/dokku.svg "Build Status")](https://circleci.com/gh/progrium/dokku/tree/master) [![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku) [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=dokku) [![Documentation](https://img.shields.io/badge/docs-viewdocs-blue.svg "Viewdocs")](http://progrium.viewdocs.io/dokku/index)
+# 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/)

 Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. Sponsored by our friends at [Deis](http://deis.io/).

@@ -10,8 +10,8 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S

 To install the latest stable release, you can run the following commands as a user that has access to `sudo`:

-    wget https://raw.github.com/progrium/dokku/v0.3.19/bootstrap.sh
-    sudo DOKKU_TAG=v0.3.19 bash bootstrap.sh
+    wget https://raw.github.com/progrium/dokku/v0.3.26/bootstrap.sh
+    sudo DOKKU_TAG=v0.3.26 bash bootstrap.sh

 ### Upgrading

@@ -19,7 +19,7 @@ To install the latest stable release, you can run the following commands as a us

 ## 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

--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,10 +5,20 @@
 # 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"}

+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
@@ -35,16 +45,18 @@ dokku_install_package() {
  curl -sSL https://get.docker.io/gpg | apt-key add -
  curl -sSL https://packagecloud.io/gpg.key | apt-key add -

-  echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
+  apt-get update > /dev/null
+  apt-get install -qq -y "linux-image-extra-$(uname -r)" apt-transport-https
+
+  echo "deb https://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

-  sudo apt-get update > /dev/null
-  sudo apt-get install -qq -y "linux-image-extra-$(uname -r)" apt-transport-https
+  apt-get update > /dev/null

  if [[ -n $DOKKU_CHECKOUT ]]; then
-    sudo apt-get install -qq -y dokku=$DOKKU_CHECKOUT
+    apt-get install -qq -y dokku=$DOKKU_CHECKOUT
  else
-    sudo apt-get install -qq -y dokku
+    apt-get install -qq -y dokku
  fi
 }

@@ -68,3 +80,7 @@ elif [[ -n $DOKKU_TAG ]]; then
 else
  dokku_install_package
 fi
+
+}
+
+bootstrap
--- a/contrib/dokku-installer.rb
+++ b/contrib/dokku-installer.rb
@@ -21,9 +21,9 @@ if ARGV[0] == "onboot"
  exit
 end

-version   = "v0.3.19"
+version   = "v0.3.26"
 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>
--- a/contrib/dokku_client.sh
+++ b/contrib/dokku_client.sh
@@ -102,6 +102,11 @@ if [[ ! -z $DOKKU_HOST ]]; then
      if [[ ! "$1" =~ --* ]]; then
        verb=$1
        shift
+        
+        if [[ "$1" == "$appname" ]]; then
+          shift
+        fi
+        
        args="$*"
      else
        long_args="--"
--- a/contrib/stackscript.sh
+++ b/contrib/stackscript.sh
@@ -149,7 +149,7 @@ function install_prerequisites {
  sudo apt-get install -qq -y apt-transport-https > /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
+  echo "deb https://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

  logit "Running apt-get update"
--- a/deb.mk
+++ b/deb.mk
@@ -1,8 +1,8 @@
-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.0.1
+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
@@ -10,7 +10,7 @@ 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_VERSION ?= 0.2.0
 PLUGINHOOK_ARCHITECTURE = amd64
 PLUGINHOOK_PACKAGE_NAME = pluginhook_$(PLUGINHOOK_VERSION)_$(PLUGINHOOK_ARCHITECTURE).deb

@@ -26,7 +26,7 @@ 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-pluginhook deb-setup deb-sshcommand

 install-from-deb:
 	echo "--> Initial apt-get update"
@@ -40,7 +40,7 @@ install-from-deb:
 	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://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"
@@ -54,7 +54,7 @@ install-from-deb:

 	echo "--> Done!"

-deb-all: deb-buildstep deb-dokku deb-gems deb-pluginhook deb-sshcommand
+deb-all: deb-herokuish deb-dokku deb-gems deb-pluginhook deb-sshcommand
 	mv /tmp/*.deb .
 	echo "Done"

@@ -65,31 +65,31 @@ deb-setup:
 	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 'lxc-docker-1.6.2' --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
@@ -140,7 +140,7 @@ deb-pluginhook: deb-setup
 	mkdir -p /tmp/build/usr/local/bin $(GOPATH)
 	sudo apt-get update > /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) && go get "golang.org/x/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

--- a/debian/control
+++ b/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
+Depends: locales, git, make, curl, software-properties-common, lxc-docker-1.6.2, gcc, python-software-properties, man-db, herokuish, sshcommand, pluginhook
 Pre-Depends: nginx, dnsutils, ruby, ruby-dev, rubygem-rack, rubygem-rack-protection, rubygem-sinatra, rubygem-tilt, apparmor, cgroup-lite
-Provides: dokku
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 Description: Docker powered mini-Heroku in around 100 lines of Bash
--- a/debian/preinst
+++ b/debian/preinst
@@ -29,7 +29,7 @@ case "$1" in
      } >> $NGINX_CONF

      rm -f /etc/nginx/sites-enabled/*
-      service nginx reload
+      service nginx reload || /etc/init.d/nginx reload
      exit 0
    fi

--- a/docs/advanced-installation.md
+++ b/docs/advanced-installation.md
@@ -32,14 +32,14 @@ chmod +x 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
--- a/docs/application-deployment.md
+++ b/docs/application-deployment.md
@@ -25,7 +25,7 @@ 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
@@ -48,7 +48,7 @@ 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

@@ -56,6 +56,20 @@ Deployment of `Dockerfile` repos is supported as of v0.3.15. Simply place a Dock

 By default, we will extract the first `EXPOSE` port and tell nginx to proxy your app to that port. Alternatively, you can set `$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
@@ -109,11 +123,11 @@ This is in particular useful, then you want to deploy to root domain, as

 # 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.

@@ -123,12 +137,14 @@ 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.  This can be overridden in the CHECKS file by setting WAIT=nn.
+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.

 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
@@ -138,3 +154,7 @@ SSH onto the server, then execute:
 ```shell
 dokku apps:destroy myapp
 ```
+
+# 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.
--- a/docs/assets/docker.png
+++ b/docs/assets/docker.png
--- a/docs/assets/extend.png
+++ b/docs/assets/extend.png
--- a/docs/assets/git.png
+++ b/docs/assets/git.png
--- a/docs/assets/gplaypattern.png
+++ b/docs/assets/gplaypattern.png
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -0,0 +1,125 @@
+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(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: 650px;
+  padding: 0;
+}
+.quickstart-code .title {
+  background-color: #dfdfdf;
+  background-image: linear-gradient(top, #f7f7f7 0%, #dfdfdf 7%, #ccc 100%);
+  border-bottom: 1px solid #111;
+  color: #444;
+  display: block;
+  font-weight: 400;
+  font-size: 14px;
+  margin: 0 20px;
+  padding: 3px 0;
+  text-align: center;
+  text-shadow: 0 1px 0 rgba(255,255,255,0.5);
+  border-radius: 5px 5px 0 0;
+  box-shadow: 0 3px 0 rgba(0,0,0,0.5);
+}
+.quickstart-code .shell {
+  background-color: #171717;
+  font-family: Menlo, Consolas, "Courier New", Courier, "Liberation Mono", monospace;
+  margin: 0 20px;
+  padding: 20px;
+  text-shadow: none;
+  border-radius: 0 0 5px 5px;
+  box-shadow: 0 5px 30px rgba(0,0,0,0.3);
+}
+.quickstart-code .line {
+  display: block;
+  margin: 0;
+  padding: 0;
+}
+.quickstart-code .line span {
+  display: inline-block;
+}
+.quickstart-code .path {
+  color: #2a8fbd;
+  user-select: none;
+}
+.quickstart-code .prompt {
+  color: #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;
+}
+
+@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;
+  }
+}
--- a/docs/checks-examples.md
+++ b/docs/checks-examples.md
@@ -53,7 +53,7 @@ ATTEMPTS=6
 git push dokku master

 -----> Cleaning up...
-----> Building myapp from buildstep...
+-----> Building myapp from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -71,13 +71,13 @@ git push dokku master
       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.  
+ !    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.  
+ !    Check attempt 2/6 failed.
 -----> Attempt 3/6 Waiting for 5 seconds ...
       CHECKS expected result:
       http://localhost/check.txt => "simple_check"
@@ -124,7 +124,7 @@ ATTEMPTS=6
 git push dokku master

 -----> Cleaning up...
-----> Building myapp from buildstep...
+-----> Building myapp from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -142,38 +142,38 @@ Running pre-flight checks
       http://localhost/ => ""
 !
 curl: (7) Failed to connect to 172.17.0.188 port 5000: Connection refused
- !    Check attempt 1/6 failed.  
+ !    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.  
+ !    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.  
+ !    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.  
+ !    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.  
+ !    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.  
+ !    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
--- a/docs/community/clients.md
+++ b/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
--- a/docs/components.md
+++ b/docs/components.md
@@ -1,7 +1,7 @@
 # Components

 * [Docker](https://github.com/dotcloud/docker) - Container runtime and manager
- * [Buildstep](https://github.com/progrium/buildstep) - Buildpack builder
+ * [Herokuish](https://github.com/gliderlabs/herokuish) - Buildpack builder
 * [pluginhook](https://github.com/progrium/pluginhook) - Shell based plugins and hooks
 * [sshcommand](https://github.com/progrium/sshcommand) - Fixed commands over SSH

--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -32,8 +32,8 @@ case "$1" in

  help)
    cat && cat<<EOF
-    hello <app>                                     Says "Hello <app>"
-    hello:world                                     Says "Hello world"
+    hello <app>, Says "Hello <app>"
+    hello:world, Says "Hello world"
 EOF
    ;;

@@ -48,7 +48,7 @@ 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 :
--- a/docs/development/pluginhooks.md
+++ b/docs/development/pluginhooks.md
@@ -83,7 +83,7 @@ esac

 ```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

@@ -107,8 +107,8 @@ 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
+    derp:herp, Herps the derp
+    derp:serp [file], Shows the file's serp
 EOF
    ;;

@@ -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,9 +240,9 @@ 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`
 - Example:
@@ -266,9 +266,9 @@ 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`
 - Example:
@@ -589,3 +589,27 @@ 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
+pluginhook receive-app $APP $newrev
+```
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -0,0 +1,68 @@
+# 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 `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
+```
--- a/docs/docker-options.md
+++ b/docs/docker-options.md
@@ -8,9 +8,9 @@ Usage
 $ dokku help
 ...
    docker-options <app>                               Display apps docker options for all phases
-    docker-options <app> <phase(s)>                    Display apps docker options for phase (comma seperated phase list)
-    docker-options:add <app> <phase(s)> OPTION         Add docker option to app for phase (comma seperated phase list)
-    docker-options:remove <app> <phase(s)> OPTION      Remove docker option from app for phase (comma seperated phase list)
+    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)
 ...
 ````

--- a/docs/dokku-events-logs.md
+++ b/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-buildstep( 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-buildstep( 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-buildstep
+nginx-pre-reload
+docker-args-deploy
+post-build-buildstep
+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-buildstep
+docker-args-run
+pre-build-dockerfile
+post-release-buildstep
+post-build-dockerfile
+pre-release-dockerfile
+update
+```
--- a/docs/getting-started/install/debian.md
+++ b/docs/getting-started/install/debian.md
@@ -3,13 +3,13 @@
 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
-curl --silent https://get.docker.io/gpg 2> /dev/null | apt-key add - 2>&1 >/dev/null
-curl --silent https://packagecloud.io/gpg.key 2> /dev/null | apt-key add - 2>&1 >/dev/null
+curl -sL https://get.docker.io/gpg 2> /dev/null | sudo apt-key add - 2>&1 >/dev/null
+curl -sL https://packagecloud.io/gpg.key 2> /dev/null | sudo apt-key add - 2>&1 >/dev/null

-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 "deb https://get.docker.io/ubuntu docker main" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
+echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main" | sudo tee /etc/apt/sources.list.d/dokku.list >/dev/null

-sudo apt-get update > /dev/null
+sudo apt-get update -qq
 sudo apt-get install -qq -y linux-image-extra-`uname -r` apt-transport-https
 sudo apt-get install -qq -y dokku
 ```
@@ -21,7 +21,7 @@ In case you want to perform an unattended installation of dokku, this is made po
 You can set any of the below options through the `debconf-set-selections` command, for example to enable vhost-based deployments:

 ```bash
-echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
+sudo echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
 ```

 After setting the desired options, proceed with the installation as described above.
--- a/docs/getting-started/install/vagrant.md
+++ b/docs/getting-started/install/vagrant.md
@@ -30,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.
--- a/docs/home.html
+++ b/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:650px;padding:0}
+      .quickstart-code .title{background-color:#dfdfdf;background-image:linear-gradient(top,#f7f7f7 0%,#dfdfdf 7%,#ccc 100%);border-bottom:1px solid #111;color:#444;display:block;font-weight:400;font-size:14px;margin:0 20px;padding:3px 0;text-align:center;text-shadow:0 1px 0 rgba(255,255,255,0.5);border-radius:5px 5px 0 0;box-shadow:0 3px 0 rgba(0,0,0,0.5)}
+      .quickstart-code .shell{background-color:#171717;font-family:Menlo,Consolas,"Courier New",Courier,"Liberation Mono",monospace;margin:0 20px;padding:20px;text-shadow:none;border-radius:0 0 5px 5px;box-shadow:0 5px 30px rgba(0,0,0,0.3)}
+      .quickstart-code .line{display:block;margin:0;padding:0}
+      .quickstart-code .line span{display:inline-block}
+      .quickstart-code .path{color:#2a8fbd;user-select:none}
+      .quickstart-code .prompt{color:#f90;user-select:none}
+      .quickstart-code .command{color:#ffc}
+      .marketing .col-lg-4{margin-bottom:20px;text-align:center}
+      .marketing .col-lg-4 p{margin-right:10px;margin-left:10px}
+      .featurette-divider{margin:20px 0}
+      .featurette-heading{font-weight:400;line-height:1;letter-spacing:-1px}
+      .featurette-heading .text-muted{font-weight:300}
+      @media (min-width: 768px) {
+        .quickstart-code{font-size:14px;line-height:22px}
+        .featurette-heading{font-size:50px}
+      }
+      @media (min-width: 992px) {
+        .featurette-heading{margin-top:120px}
+      }
+    </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.github.com/progrium/dokku/v0.3.26/bootstrap.sh</span>
+          </p>
+          <p class="line">
+            <span class="path">~</span>
+            <span class="prompt">$</span>
+            <span class="command">sudo DOKKU_TAG=v0.3.26 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>
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,40 +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.github.com/progrium/dokku/v0.3.26/bootstrap.sh</span>
+      </p>
+      <p class="line">
+        <span class="path">~</span>
+        <span class="prompt">$</span>
+        <span class="command">sudo DOKKU_TAG=v0.3.26 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)
- [Container Options](http://progrium.viewdocs.io/dokku/docker-options)
+  <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)
- [Test Suite](http://progrium.viewdocs.io/dokku/development/testing)
-
-## 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>
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -3,8 +3,10 @@
 ## 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

@@ -12,10 +14,11 @@ To install the latest stable version of dokku, you can run the following bootstr

 ```shell
 # installs dokku via apt-get
-wget https://raw.github.com/progrium/dokku/v0.3.19/bootstrap.sh
-sudo DOKKU_TAG=v0.3.19 bash bootstrap.sh
+wget https://raw.github.com/progrium/dokku/v0.3.26/bootstrap.sh
+sudo DOKKU_TAG=v0.3.26 bash bootstrap.sh

-# Go to your server's IP and follow the web installer
+# By default, this will do cli-based setup, though you may *also*
+# go to your server's IP and follow the web installer
 ```

 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:
--- a/docs/nginx.md
+++ b/docs/nginx.md
@@ -8,9 +8,17 @@ Dokku provides easy TLS/SPDY support out of the box. This can be done app-by-app

 ### 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

@@ -45,11 +53,15 @@ This archive should is expanded via `tar xvf`. It should contain `server.crt` an

 ## Customizing the nginx configuration

-> New as of 0.3.10
+> New as of 0.3.17.

-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 {
@@ -77,7 +89,7 @@ server {
 }
 ```

-The above is a sample http configuration that adds an `X-Served-By` header to requests. The template file **must** be owned by the user `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:

@@ -85,6 +97,21 @@ A few tips for custom nginx templates:
 - 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

 Applications typically have the following structure for their hostname:
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -16,9 +16,6 @@ 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).
@@ -49,7 +46,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
@@ -82,6 +78,10 @@ Note: The following plugins have been supplied by our community and may not have
 [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

 ### Datastores

@@ -93,7 +93,6 @@ Note: The following plugins have been supplied by our community and may not have
 | [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 |
@@ -104,9 +103,7 @@ Note: The following plugins have been supplied by our community and may not have

 | 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 |
@@ -125,12 +122,11 @@ Note: The following plugins have been supplied by our community and may not have
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [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][]         |                       |
+| [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin)                                           | [Aomitayo][]          |                       |
 | [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][]          |                       |

 [dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709

@@ -139,11 +135,11 @@ 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][]          |                       |
+| [Forego](https://github.com/iskandar/dokku-forego)                                                | [iskandar][]          | Compatible with 0.2.x |
+| [Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)                       | [sehrope][]           | Works with dokku @ [c77cbf1][] - no 0.2.0 compatibility |
+| [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       |                       |
 | [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 |
-| [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       |                       |

 [c77cbf1]: https://github.com/progrium/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
 [28de3ec]: https://github.com/progrium/dokku/commit/28de3ecaa3231a223f83fd8d03f373308673bc40
@@ -156,29 +152,22 @@ Note: The following plugins have been supplied by our community and may not have
 | [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [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][]          |                       |
-| [Events Logger](https://github.com/alessio/dokku-events)                                          | [alessio][]           | dokku >= v0.3.13      |
 | [git rev-parse HEAD in env](https://github.com/cjblomqvist/dokku-git-rev)                         | [cjblomqvist][]       | Compatible with 0.3.0 |
 | [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | dokku >= v0.3.14      |
+| [HTTP Auth](https://github.com/Flink/dokku-http-auth)                                             | [Flink][]             |                       |
 | [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][]  |
+| [Maintenance mode](https://github.com/Flink/dokku-maintenance)                                    | [Flink][]             |                       |
 | [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][]             |                       |
+| [App Configfiles](https://github.com/alexkruegger/dokku-app-configfiles)                             | [alexkruegger][]            | Compatible with 0.3.17+ |

-[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)

@@ -190,24 +179,25 @@ 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][]             |                       |
+| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          |                       |
 | [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 volumes](https://github.com/Flink/dokku-docker-auto-volumes)                         | [Flink][]             | 0.3.17+, auto-persist docker volumes |
 | [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][]          |                       |
-| [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][]             |                       |
 | [Logspout](https://github.com/michaelshobbs/dokku-logspout)                                       | [michaelshobbs][]     |                       |
+| [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         |                       |
+| [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            |                       |
+| [Rails logs](https://github.com/Flink/dokku-rails-logs)                                           | [Flink][]             |                       |
+| [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][]             |                       |
+| [User ACL](https://github.com/mlebkowski/dokku-acl)                                               | [Maciej Łebkowski][]  |                       |
+| [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      |                       |
+| [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.

@@ -220,11 +210,20 @@ The following plugins have been removed as their functionality is now in Dokku C
 | [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) |
 | [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains 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
--- a/docs/process-management.md
+++ b/docs/process-management.md
@@ -20,19 +20,22 @@ ps:stop <app>                                   Stop app container(s)

 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 we will only start the web process. However, if you wanted 2 job processors running simultaneously, you can modify this behavior in a few ways.

-## Include a DOKKU_SCALE file in your repo
+### DOKKU_SCALE file

-Dokku expects this file to contain one line for every process defined in your Procfile. Example:
+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.

-## Use the ps:scale command. Example:
 ```
 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.


--- a/docs/template.html
+++ b/docs/template.html
@@ -1,105 +1,116 @@
-<!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=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(gplaypattern.png);padding:45px 0;text-align:center}
+      .blurb p{font-size:17px;font-weight:300;margin:18px 0;text-align:center}
+      .quickstart-code{display:block;font-size:12px;line-height:1.3em;margin:45px auto;max-width:650px;padding:0}
+      .quickstart-code .title{background-color:#dfdfdf;background-image:linear-gradient(top,#f7f7f7 0%,#dfdfdf 7%,#ccc 100%);border-bottom:1px solid #111;color:#444;display:block;font-weight:400;font-size:14px;margin:0 20px;padding:3px 0;text-align:center;text-shadow:0 1px 0 rgba(255,255,255,0.5);border-radius:5px 5px 0 0;box-shadow:0 3px 0 rgba(0,0,0,0.5)}
+      .quickstart-code .shell{background-color:#171717;font-family:Menlo,Consolas,"Courier New",Courier,"Liberation Mono",monospace;margin:0 20px;padding:20px;text-shadow:none;border-radius:0 0 5px 5px;box-shadow:0 5px 30px rgba(0,0,0,0.3)}
+      .quickstart-code .line{display:block;margin:0;padding:0}
+      .quickstart-code .line span{display:inline-block}
+      .quickstart-code .path{color:#2a8fbd;user-select:none}
+      .quickstart-code .prompt{color:#f90;user-select:none}
+      .quickstart-code .command{color:#ffc}
+      .marketing .col-lg-4{margin-bottom:20px;text-align:center}
+      .marketing .col-lg-4 p{margin-right:10px;margin-left:10px}
+      .featurette-divider{margin:20px 0}
+      .featurette-heading{font-weight:400;line-height:1;letter-spacing:-1px}
+      .featurette-heading .text-muted{font-weight:300}
+      @media (min-width: 768px) {
+        .quickstart-code{font-size:14px;line-height:22px}
+        .featurette-heading{font-size:50px}
+      }
+      @media (min-width: 992px) {
+        .featurette-heading{margin-top:120px}
+      }
+    </style>
+  </head>
+  <body>
+    <div class="header">
+      <div class="container">
+        <h1 class="heading">Dokku</h1>
+      </div>
+    </div>
+
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-xs-4 col-md-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">Application Deployment</a>
+            <a href="http://progrium.viewdocs.io/dokku/configuration-management" class="list-group-item">Configuration management</a>
+            <a href="http://progrium.viewdocs.io/dokku/process-management" class="list-group-item">Process management</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/remote-commands" class="list-group-item">Running Remote commands</a>
+            <a href="http://progrium.viewdocs.io/dokku/docker-options" class="list-group-item">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/pluginhooks" class="list-group-item">Pluginhooks</a>
+            <a href="http://progrium.viewdocs.io/dokku/development/testing" class="list-group-item">Test Suite</a>
+            <a href="http://progrium.viewdocs.io/dokku/development/release-process" class="list-group-item">Release Process</a>
+          </div>
+        </div>
+        <div class="col-xs-8 col-md-10">
+          {{CONTENT}}
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+      <footer>
+        <p class="pull-right"><a href="#">Back to top</a></p>
+        <p>&copy; 2013 Dokku</p>
+      </footer>
+    </div>
    <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) {
+      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>
--- a/docs/troubleshooting.md
+++ b/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:__
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -37,26 +37,26 @@ All changes will take effect upon next application deployment. To trigger a rebu
 dokku ps:rebuildall
 ```

-## Buildstep image
+## Herokuish image

-If dokku was installed via a debian package, you can upgrade buildstep via the following command:
+If dokku was installed via a debian package, you can upgrade herokuish via the following command:

 ```shell
-sudo apt-get install buildstep
+sudo apt-get install Herokush
 ```

 For unattended upgrades, you may run the following command:

 ```shell
-sudo apt-get install -qq -y buildstep
+sudo apt-get install -qq -y herokuish
 ```

-In some cases, it may be desirable to run a specific version of buildstep. To install/upgrade buildstep from source, run the following commands:
+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/progrium/buildstep.git
-cd buildstep
+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
 ```
--- a/89
+++ b/89
@@ -3,13 +3,16 @@ 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 PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
 export DOKKU_VALID_EXIT=0

+export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
+export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
+
 source "$PLUGIN_PATH/common/functions"

 [[ -f $DOKKU_ROOT/dokkurc ]] && source $DOKKU_ROOT/dokkurc
@@ -63,17 +66,21 @@ case "$1" in
    ;;

  deploy)
+    [[ -z $2 ]] && dokku_log_fail "Please specify an app to deploy"
    APP="$2"; IMAGE="dokku/$APP"
+    verify_app_name "$APP"
+
    pluginhook pre-deploy $APP

-    is_image_buildstep_based "$IMAGE" && DOKKU_BUILDSTEP=true
+    is_image_herokuish_based "$IMAGE" && DOKKU_HEROKUISH=true
    DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
-    oldids=$(get_container_ids $APP)
+    oldids=$(get_app_container_ids $APP)

    while read line || [ -n "$line" ]
    do
-      PROC_TYPE=${line%%=*}
-      PROC_COUNT=${line#*=}
+      TRIM=${line%#*}
+      PROC_TYPE=${TRIM%%=*}
+      PROC_COUNT=${TRIM#*=}
      CONTAINER_INDEX=1

      while [[ $CONTAINER_INDEX -le $PROC_COUNT ]];do
@@ -88,18 +95,24 @@ case "$1" in
        DOCKER_ARGS+=$(: | pluginhook docker-args-deploy $APP)
        BIND_EXTERNAL=$(pluginhook bind-external-ip $APP)

-        [[ -n "$DOKKU_BUILDSTEP" ]] && START_CMD="/start $PROC_TYPE"
-        [[ -z "$DOKKU_BUILDSTEP" ]] && DOKKU_DOCKERFILE_PORT=$(dokku config:get $APP DOKKU_DOCKERFILE_PORT || true)
+        [[ -n "$DOKKU_HEROKUISH" ]] && START_CMD="/start $PROC_TYPE"

-        if [[ "$BIND_EXTERNAL" = "false" ]] && [[ "$PROC_TYPE" == "web" ]];then
+        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}
-          id=$(docker run -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
-          ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $id)
-        elif [[ "$BIND_EXTERNAL" = "true" ]] && [[ "$PROC_TYPE" == "web" ]];then
-          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
-        elif [[ "$PROC_TYPE" != "web" ]];then
+          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

@@ -110,11 +123,23 @@ case "$1" in
          kill -9 $$
        }

+        DOKKU_APP_SKIP_ALL_CHECKS=$(dokku config:get $APP DOKKU_SKIP_ALL_CHECKS || true)
+        DOKKU_APP_SKIP_DEFAULT_CHECKS=$(dokku config:get $APP DOKKU_SKIP_DEFAULT_CHECKS || true)
+        DOKKU_GLOBAL_SKIP_ALL_CHECKS=$(dokku config:get --global DOKKU_SKIP_ALL_CHECKS || true)
+        DOKKU_GLOBAL_SKIP_DEFAULT_CHECKS=$(dokku config:get --global DOKKU_SKIP_DEFAULT_CHECKS || true)
+
+        DOKKU_SKIP_ALL_CHECKS=${DOKKU_APP_SKIP_ALL_CHECKS:="$DOKKU_GLOBAL_SKIP_ALL_CHECKS"}
+        DOKKU_SKIP_DEFAULT_CHECKS=${DOKKU_APP_SKIP_DEFAULT_CHECKS:="$DOKKU_GLOBAL_SKIP_DEFAULT_CHECKS"}
+
        # 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 $id $PROC_TYPE $port $ipaddr
-        trap -        INT TERM EXIT
+        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"
+          pluginhook 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"
@@ -133,9 +158,10 @@ case "$1" in
      else
        CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1))
      fi
-      find $DOKKU_ROOT/$APP -maxdepth 1 -name "CONTAINER.$PROC_TYPE.*" | sort -t . -k 4 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
-      find $DOKKU_ROOT/$APP -maxdepth 1 -name "IP.$PROC_TYPE.*" | sort -t . -k 4 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
-      find $DOKKU_ROOT/$APP -maxdepth 1 -name "PORT.$PROC_TYPE.*" | sort -t . -k 4 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
+      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"
@@ -143,6 +169,13 @@ case "$1" in

    # kill the old container
    if [[ -n "$oldids" ]]; then
+
+      if [[ -z "$DOKKU_WAIT_TO_RETIRE" ]];then
+        DOKKU_APP_DOKKU_WAIT_TO_RETIRE=$(dokku config:get $APP DOKKU_WAIT_TO_RETIRE || true)
+        DOKKU_GLOBAL_DOKKU_WAIT_TO_RETIRE=$(dokku config:get --global DOKKU_WAIT_TO_RETIRE || true)
+        DOKKU_WAIT_TO_RETIRE=${DOKKU_APP_DOKKU_WAIT_TO_RETIRE:="$DOKKU_GLOBAL_DOKKU_WAIT_TO_RETIRE"}
+      fi
+
      # Let the old container finish processing requests, before terminating it
      WAIT="${DOKKU_WAIT_TO_RETIRE:-60}"
      dokku_log_info1 "Shutting down old containers in $WAIT seconds"
@@ -167,7 +200,7 @@ case "$1" in
  cleanup)
    # delete all non-running container
    # shellcheck disable=SC2046
-    docker rm $(docker ps -a -f 'status=exited' -q) &> /dev/null &
+    docker rm $(docker ps -a -f 'status=exited' -q) &> /dev/null || true
    # delete unused images
    # shellcheck disable=SC2046
    docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null &
@@ -200,11 +233,11 @@ 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 | pluginhook commands help | sort | column -c2 -t -s,
+    help, Print the list of commands
+    plugins, Print active plugins
+    plugins-install, Install active plugins
+    plugins-update, Update active plugins
 EOF
    ;;

--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -11,35 +11,37 @@ case "$1" in
    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
+        # *DEPRECATED* in v0.3.15: `pluginhook pre-build` will be removed in future releases
        pluginhook pre-build "$APP"
+        # *DEPRECATED* in v0.3.22: `pluginhook pre-build-buildstep` will be removed in future releases
        pluginhook pre-build-buildstep "$APP"
+        pluginhook 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)
+        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
+        # *DEPRECATED* in v0.3.15: `pluginhook post-build` will be removed in future releases
        pluginhook post-build "$APP"
+        # *DEPRECATED* in v0.3.22: `pluginhook post-build-buildstep` will be removed in future releases
        pluginhook post-build-buildstep "$APP"
+        pluginhook post-build-buildpack "$APP"
        ;;

      dockerfile)
        # extract first port from Dockerfile
-        DOCKERFILE_PORT=$(grep EXPOSE Dockerfile | head -1 | awk '{ print $2 }' || true)
+        DOCKERFILE_PORT=$(get_dockerfile_exposed_port Dockerfile)
        [[ -n "$DOCKERFILE_PORT" ]] && dokku config:set-norestart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT
-
-        # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
        pluginhook pre-build-dockerfile "$APP"

        [[ "$DOKKU_DOCKERFILE_CACHE_BUILD" == "false" ]] && DOKKU_DOCKER_BUILD_OPTS="$DOKKU_DOCKER_BUILD_OPTS --no-cache"
@@ -57,10 +59,12 @@ case "$1" in
  release)
    APP="$2"; IMAGE="dokku/$APP"; IMAGE_SOURCE_TYPE="$3"
    case "$IMAGE_SOURCE_TYPE" in
-      buildstep)
-        # *DEPRECATED* in v0.4.0: `pluginhook pre-release` will be removed in future releases
+      herokuish)
+        # *DEPRECATED* in v0.3.15: `pluginhook pre-release` will be removed in future releases
        pluginhook pre-release "$APP"
+        # *DEPRECATED* in v0.3.22: `pluginhook pre-release-buildstep` will be removed in future releases
        pluginhook pre-release-buildstep "$APP"
+        pluginhook pre-release-buildpack "$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")
          test "$(docker wait $id)" -eq 0
@@ -71,13 +75,14 @@ case "$1" in
          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
+        # *DEPRECATED* in v0.3.15: `pluginhook post-release` will be removed in future releases
        pluginhook post-release "$APP"
+        # *DEPRECATED* in v0.3.22: `pluginhook post-release-buildstep` will be removed in future releases
        pluginhook post-release-buildstep "$APP"
+        pluginhook post-release-buildpack "$APP"
        ;;

      dockerfile)
-        # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
        pluginhook pre-release-dockerfile "$APP"
        pluginhook post-release-dockerfile "$APP"
        ;;
@@ -117,13 +122,13 @@ case "$1" in

    for dokku_app in $dokku_apps; do
      APP=$(basename $dokku_app)
-      DOKKU_APP_CIDS=$(get_container_ids $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 $2 }')
+          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
@@ -138,7 +143,7 @@ case "$1" in
    APP="$2";

    if (is_deployed $APP); then
-      CONTAINER_IDS=( $(get_container_ids $APP) )
+      CONTAINER_IDS=( $(get_app_container_ids $APP) )
      LAST_CONTAINER_ID=${CONTAINER_IDS[${#CONTAINER_IDS[@]} - 1]}

      if [[ $3 == "-t" ]]; then
@@ -170,7 +175,7 @@ case "$1" in
    DOCKER_ARGS+=$(: | pluginhook docker-args-run $APP)
    [[ $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 "$@"
    ;;
@@ -180,6 +185,8 @@ case "$1" in
    verify_app_name "$2"
    APP="$2";

+    [[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source "$DOKKU_ROOT/$APP/ENV"
+
    if [[ -s "$DOKKU_ROOT/$APP/URLS" ]]; then
      case "$1" in
        url)
@@ -198,7 +205,7 @@ case "$1" in
      SCHEME="https"
    fi

-    if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
+    if [[ -f "$DOKKU_ROOT/VHOST" ]] && [[ "$NO_VHOST" != "1" ]]; then
      echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")"
    else
      for PORT_FILE in $DOKKU_ROOT/$APP/PORT.*; do
@@ -216,12 +223,12 @@ case "$1" in

  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
+    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
 EOF
    ;;

--- a/plugins/20_events/backup-check
+++ b/plugins/20_events/backup-check
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/backup-export
+++ b/plugins/20_events/backup-export
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/backup-import
+++ b/plugins/20_events/backup-import
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/bind-external-ip
+++ b/plugins/20_events/bind-external-ip
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/check-deploy
+++ b/plugins/20_events/check-deploy
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/commands
+++ b/plugins/20_events/commands
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$(dirname $0)/../common/functions"
+
+PLUGIN_DIR="$(dirname $0)"
+
+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)
+    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
+
--- a/plugins/20_events/dependencies
+++ b/plugins/20_events/dependencies
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/docker-args-build
+++ b/plugins/20_events/docker-args-build
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/docker-args-deploy
+++ b/plugins/20_events/docker-args-deploy
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/docker-args-run
+++ b/plugins/20_events/docker-args-run
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/git-post-pull
+++ b/plugins/20_events/git-post-pull
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/git-pre-pull
+++ b/plugins/20_events/git-pre-pull
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/hook
+++ b/plugins/20_events/hook
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$(dirname $0)/../common/functions"
+
+[[ ! "$DOKKU_EVENTS" ]] || dokku_log_pluginhook_call "$(basename $0)" "$@"
--- a/plugins/20_events/install
+++ b/plugins/20_events/install
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$(dirname $0)/../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_pluginhook_call "$(basename $0)" "$@"
+
+exit 0
--- a/plugins/20_events/nginx-hostname
+++ b/plugins/20_events/nginx-hostname
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/nginx-pre-reload
+++ b/plugins/20_events/nginx-pre-reload
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/post-build-buildstep
+++ b/plugins/20_events/post-build-buildstep
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/post-build-dockerfile
+++ b/plugins/20_events/post-build-dockerfile
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/post-delete
+++ b/plugins/20_events/post-delete
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/post-deploy
+++ b/plugins/20_events/post-deploy
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/post-domains-update
+++ b/plugins/20_events/post-domains-update
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/post-release-buildstep
+++ b/plugins/20_events/post-release-buildstep
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/post-release-dockerfile
+++ b/plugins/20_events/post-release-dockerfile
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/pre-build-buildstep
+++ b/plugins/20_events/pre-build-buildstep
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/pre-build-dockerfile
+++ b/plugins/20_events/pre-build-dockerfile
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/pre-delete
+++ b/plugins/20_events/pre-delete
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/pre-deploy
+++ b/plugins/20_events/pre-deploy
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/pre-release-buildstep
+++ b/plugins/20_events/pre-release-buildstep
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/pre-release-dockerfile
+++ b/plugins/20_events/pre-release-dockerfile
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/receive-app
+++ b/plugins/20_events/receive-app
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/receive-branch
+++ b/plugins/20_events/receive-branch
@@ -0,0 +1 @@
+hook
--- a/plugins/20_events/update
+++ b/plugins/20_events/update
@@ -0,0 +1 @@
+hook
--- a/plugins/apps/commands
+++ b/plugins/apps/commands
@@ -40,7 +40,7 @@ case "$1" in
    echo "Destroying $APP (including all add-ons)"

    pluginhook pre-delete $APP
-    DOKKU_APP_CIDS=$(get_container_ids $APP)
+    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
@@ -55,9 +55,9 @@ case "$1" in

  help | apps:help)
    cat && cat<<EOF
-    apps                                            List your apps
-    apps:create <app>                               Create a new app
-    apps:destroy <app>                              Permanently destroy an app
+    apps, List your apps
+    apps:create <app>, Create a new app
+    apps:destroy <app>, Permanently destroy an app
 EOF
    ;;

--- a/plugins/backup/commands
+++ b/plugins/backup/commands
@@ -87,8 +87,8 @@ case "$1" in

  help | backup:help)
    cat && cat<<EOF
-    backup:export [file]                            Export dokku configuration files
-    backup:import [file]                            Import dokku configuration files
+    backup:export [file], Export dokku configuration files
+    backup:import [file], Import dokku configuration files
 EOF
    ;;

--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -45,7 +45,7 @@ if [[ -z "$DOKKU_APP_LISTEN_IP" ]] && [[ -f "$DOKKU_ROOT/$APP/IP" ]]; then
  DOKKU_APP_LISTEN_IP=$(< "$DOKKU_ROOT/$APP/IP")
 fi
 if [[ -z "$DOKKU_APP_CONTAINER_ID" ]]; then
-  DOKKU_APP_CIDS=( $(get_container_ids $APP) )
+  DOKKU_APP_CIDS=( $(get_app_container_ids $APP) )
  DOKKU_APP_CONTAINER_ID=${DOKKU_APP_CIDS[0]}
 fi

@@ -79,6 +79,10 @@ cleanup() {
 trap cleanup EXIT

 if [[ ! -s "${TMPDIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]]; then
+  if [[ "$DOKKU_SKIP_DEFAULT_CHECKS" = "true" ]]; then
+    dokku_log_verbose "Skipping default check..."
+    exit 0
+  fi
  dokku_log_verbose "For more efficient zero downtime deployments, create a file CHECKS."
  dokku_log_verbose "See http://progrium.viewdocs.io/dokku/checks-examples.md for examples"
  dokku_log_verbose "CHECKS file not found in container: Running simple container check..."
@@ -87,11 +91,11 @@ if [[ ! -s "${TMPDIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]];

  # simple default check to see if the container stuck around
  # for more thorough checks, create a CHECKS file
-  DOKKU_DEFAULT_WAIT=10
-  dokku_log_info1 "Waiting for $DOKKU_DEFAULT_WAIT seconds ..."
-  sleep $DOKKU_DEFAULT_WAIT
+  DOKKU_DEFAULT_CHECKS_WAIT="${DOKKU_DEFAULT_CHECKS_WAIT:-10}"
+  dokku_log_info1 "Waiting for $DOKKU_DEFAULT_CHECKS_WAIT seconds ..."
+  sleep $DOKKU_DEFAULT_CHECKS_WAIT

-  docker ps -q --no-trunc | grep -q "$DOKKU_APP_CONTAINER_ID" || dokku_log_fail "App container failed to start!!"
+  ! (is_container_running $DOKKU_APP_CONTAINER_ID) && dokku_log_fail "App container failed to start!!"
  dokku_log_info1 "Default container check successful!" && exit 0
 fi

@@ -125,6 +129,11 @@ do
  # --location   Follow redirects
  CURL_OPTIONS="-q --compressed --fail --location --max-time $TIMEOUT"

+  # Set X-Forwarded-Proto header if TLS is enabled.
+  SSL="$DOKKU_ROOT/$APP/tls"; WILDCARD_SSL="$DOKKU_ROOT/tls"
+  if [[ -e "$SSL/server.crt" && -e "$SSL/server.key" ]] || [[ -e "$WILDCARD_SSL/server.crt" && -e "$WILDCARD_SSL/server.key" ]]; then
+    CURL_OPTIONS+=" -H X-Forwarded-Proto:https"
+  fi

  exec < "$FILENAME"
  while read CHECK_URL EXPECTED ; do
@@ -133,7 +142,7 @@ do
    [[ -z "$CHECK_URL" || "$CHECK_URL" =~ ^\# ]] && continue
    # Ignore if it's not a URL in a supported format
    # shellcheck disable=SC1001
-    ! [[ "$CHECK_URL" =~ ^(http(s)?:)?\/.+ ]] && continue
+    ! [[ "$CHECK_URL" =~ ^(http(s)?:)?\/.* ]] && continue

    if [[ "$CHECK_URL" =~ ^https?: ]] ; then
      URL_PROTOCOL=${CHECK_URL%:*}
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -90,6 +90,17 @@ dokku_log_fail() {
  exit 1
 }

+dokku_log_event() {
+  logger -t dokku -i -- "$@"
+}
+
+dokku_log_pluginhook_call() {
+  local l_hook
+
+  l_hook="$1" ; shift
+  dokku_log_event "INVOKED: ${l_hook}( $@ )"
+}
+
 dokku_container_log_verbose_quiet() {
  CID=$1;
  shift
@@ -120,10 +131,10 @@ verify_image() {
  fi
 }

-is_image_buildstep_based() {
+is_image_herokuish_based() {
  # circleci can't support --rm as they run lxc in lxc
  [[ ! -f "/home/ubuntu/.circlerc" ]] && local DOCKER_ARGS="--rm"
-  docker run --entrypoint="/bin/bash" $DOCKER_ARGS "$@" -c "[[ -f /exec ]]"
+  docker run --entrypoint="/bin/sh" $DOCKER_ARGS "$@" -c "test -f /exec"
 }

 is_number() {
@@ -167,16 +178,7 @@ copy_from_image() {
  fi
 }

-is_deployed() {
-  APP="$1"
-  if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]] || [[ $(ls $DOKKU_ROOT/$APP/CONTAINER.* &> /dev/null; echo $?) -eq 0 ]];then
-    return 0
-  else
-    return 1
-  fi
-}
-
-get_container_ids() {
+get_app_container_ids() {
  APP="$1"
  verify_app_name $APP
  [[ -f $DOKKU_ROOT/$APP/CONTAINER ]] && DOKKU_CIDS+=$(< $DOKKU_ROOT/$APP/CONTAINER)
@@ -190,3 +192,56 @@ get_container_ids() {
  shopt -u nullglob
  echo $DOKKU_CIDS
 }
+
+get_dockerfile_exposed_port() {
+  local DOCKERFILE_PORT=$(grep "^EXPOSE \+[[:digit:]]\+\(\/tcp\)\? *$" $1 | head -1 | sed 's/EXPOSE \+\([[:digit:]]\+\)\(\/tcp\)\?.*/\1/' || true)
+  echo "$DOCKERFILE_PORT"
+}
+
+get_app_running_container_ids() {
+  local APP=$1
+  verify_app_name $APP
+
+  ! (is_deployed $APP) && dokku_log_fail "App $APP has not been deployed"
+  local CIDS=$(get_app_container_ids $APP)
+
+  for CID in $CIDS;do
+    local APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" || true)
+    [[ "$APP_CONTAINER_STATUS" == "true" ]] && local APP_RUNNING_CONTAINER_IDS+="$CID "
+  done
+
+  echo "$APP_RUNNING_CONTAINER_IDS"
+}
+
+is_deployed() {
+  APP="$1"
+  if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]] || [[ $(ls $DOKKU_ROOT/$APP/CONTAINER.* &> /dev/null; echo $?) -eq 0 ]];then
+    return 0
+  else
+    return 1
+  fi
+}
+
+is_container_running () {
+  local CID=$1
+  local CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" || true)
+
+  if [[ "$CONTAINER_STATUS" == "true" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+is_app_running() {
+  local APP="$1"
+  verify_app_name $APP
+
+  local APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids $APP)
+
+  if [[ -n "$APP_RUNNING_CONTAINER_IDS" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
--- a/plugins/config/commands
+++ b/plugins/config/commands
@@ -2,8 +2,6 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$(dirname $0)/../common/functions"

-ENV_FILE="$DOKKU_ROOT/$2/ENV"
-ENV_FILE_TEMP="$DOKKU_ROOT/$2/ENV.tmp"
 config_create () {
  [ -f $ENV_FILE ] || {
    touch $ENV_FILE
@@ -24,7 +22,7 @@ config_styled_hash () {

  while read -r word; do
    KEY=$(echo $word | cut -d"=" -f1)
-    VALUE=$(echo $word | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//")
+    VALUE=$(echo $word | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//" -e "s/\$$//g")

    num_zeros=$((${#longest} - ${#KEY}))
    zeros=" "
@@ -38,7 +36,9 @@ config_styled_hash () {

 config_write() {
  ENV_TEMP="$1"
-  echo -e "$ENV_TEMP" | sed '/^$/d' | sort > $ENV_FILE_TEMP
+  ENV_FILE_TEMP="${ENV_FILE}.tmp"
+
+  echo "$ENV_TEMP" | sed '/^$/d' | sort > $ENV_FILE_TEMP
  if ! cmp -s $ENV_FILE $ENV_FILE_TEMP; then
    cp -f $ENV_FILE_TEMP $ENV_FILE
    chmod 600 $ENV_FILE
@@ -46,14 +46,43 @@ config_write() {
  rm -f $ENV_FILE_TEMP
 }

+parse_config_args() {
+  case "$2" in
+    --global)
+      ENV_FILE="$DOKKU_ROOT/ENV"
+      DOKKU_CONFIG_TYPE="global"
+      DOKKU_CONFIG_RESTART=false
+      ;;
+    --no-restart)
+      APP="$3"
+      ENV_FILE="$DOKKU_ROOT/$APP/ENV"
+      DOKKU_CONFIG_RESTART=false
+      DOKKU_CONFIG_TYPE="app"
+      set -- "${@:1:1}" "${@:3}"
+  esac
+
+  APP=${APP:="$2"}
+  ENV_FILE=${ENV_FILE:="$DOKKU_ROOT/$APP/ENV"}
+  DOKKU_CONFIG_TYPE=${DOKKU_CONFIG_TYPE:="app"}
+  DOKKU_CONFIG_RESTART=${DOKKU_CONFIG_RESTART:=true}
+
+  if [[ "$DOKKU_CONFIG_TYPE" = "app" ]]; then
+    if [[ -z $APP ]]; then
+      echo "Please specify an app to run the command on" >&2 && exit 1
+    else
+      verify_app_name "$2"
+    fi
+  fi
+  export APP ENV_FILE DOKKU_CONFIG_TYPE DOKKU_CONFIG_RESTART
+}
+
 case "$1" in
  config)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2"
-
+    parse_config_args "$@"
    config_create
-    [[ ! -s $ENV_FILE ]] && echo "$APP has no config vars" && exit 1
+
+    [[ "$APP" ]] && DOKKU_CONFIG_TYPE=$APP
+    [[ ! -s $ENV_FILE ]] && echo "no config vars for $DOKKU_CONFIG_TYPE" && exit 1

    VARS=$(grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" $ENV_FILE | cut -d" " -f2-)

@@ -64,14 +93,13 @@ case "$1" in
      fi
    done

-    dokku_log_info2_quiet "$APP config vars"
+
+    dokku_log_info2_quiet "$DOKKU_CONFIG_TYPE config vars"
    config_styled_hash "$VARS"
    ;;

  config:get)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2"
+    parse_config_args "$@"

    if [[ -z $3 ]]; then
      echo "Usage: dokku config:get APP KEY"
@@ -90,26 +118,8 @@ case "$1" in
    ;;

  config:set)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2"
-
-    if [[ -z "${*:3}" ]]; then
-      echo "Usage: dokku config:set APP KEY1=VALUE1 [KEY2=VALUE2 ...]"
-      echo "Must specify KEY and VALUE to set."
-      exit 1
-    fi
-
-    shift 2
-    dokku config:set-norestart $APP "$@"
-    dokku_log_info1 "Restarting app $APP"
-    dokku ps:restart $APP
-   ;;
-
-  config:set-norestart)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2"
+    parse_config_args "$@"
+    [[ "$2" = "--no-restart" ]] && set -- "${@:1:1}" "${@:3}"

    if [[ -z "${*:3}" ]]; then
      echo "Usage: dokku config:set APP KEY1=VALUE1 [KEY2=VALUE2 ...]"
@@ -137,8 +147,9 @@ case "$1" in

      if [[ $KEY =~ [a-zA-Z_][a-zA-Z0-9_]* ]]; then
        RESTART_APP=true
-        ENV_TEMP=$(echo -e "${ENV_TEMP}" | sed "/^export $KEY=/ d")
-        ENV_TEMP="${ENV_TEMP}\nexport $KEY='$VALUE'"
+        ENV_TEMP=$(echo "${ENV_TEMP}" | sed "/^export $KEY=/ d")
+        ENV_TEMP="${ENV_TEMP}
+export $KEY='$VALUE'"
        ENV_ADD=$(echo -e "${ENV_ADD}" | sed "/^$KEY=/ d")
        ENV_ADD="${ENV_ADD}$
 ${var}"
@@ -152,29 +163,16 @@ ${var}"

      config_write "$ENV_TEMP"
    fi
+
+    if [[ "$DOKKU_CONFIG_RESTART" == "true" ]]; then
+      dokku_log_info1 "Restarting app $APP"
+      dokku ps:restart $APP
+    fi
    ;;

  config:unset)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2"
-
-    if [[ -z $3 ]]; then
-      echo "Usage: dokku config:unset APP KEY1 [KEY2 ...]"
-      echo "Must specify KEY to unset."
-      exit 1
-    fi
-
-    shift 2
-    dokku config:unset-norestart $APP "$@"
-    dokku_log_info1 "Restarting app $APP"
-    dokku ps:restart $APP
-  ;;
-
-  config:unset-norestart)
-    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-    APP="$2"
+    parse_config_args "$@"
+    [[ "$2" = "--no-restart" ]] && set -- "${@:1:1}" "${@:3}"

    if [[ -z $3 ]]; then
      echo "Usage: dokku config:unset APP KEY1 [KEY2 ...]"
@@ -192,14 +190,31 @@ ${var}"

      config_write "$ENV_TEMP"
    done
+
+    if [[ "$DOKKU_CONFIG_RESTART" == "true" ]]; then
+      dokku_log_info1 "Restarting app $APP"
+      dokku ps:restart $APP
+    fi
+    ;;
+
+  config:set-norestart)
+    dokku_log_info2 "$1 is deprecated as of v0.3.22"
+    shift 1
+    dokku config:set --no-restart "$@"
+    ;;
+
+  config:unset-norestart)
+    dokku_log_info2 "$1 is deprecated as of v0.3.22"
+    shift 1
+    dokku config:unset --no-restart "$@"
    ;;

  help | config:help)
    cat && cat<<EOF
-    config <app>                                    Display the config vars for an app
-    config:get <app> KEY                            Display a config value for an app
-    config:set <app> KEY1=VALUE1 [KEY2=VALUE2 ...]  Set one or more config vars
-    config:unset <app> KEY1 [KEY2 ...]              Unset one or more config vars
+    config (<app>|--global), Display all global or app-specific config vars
+    config:get (<app>|--global) KEY, Display a global or app-specific config value
+    config:set (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...], Set one or more config vars
+    config:unset (<app>|--global) KEY1 [KEY2 ...], Unset one or more config vars
 EOF
    ;;

--- a/plugins/config/docker-args-deploy
+++ b/plugins/config/docker-args-deploy
@@ -5,7 +5,7 @@ source "$(dirname $0)/../common/functions"
 STDIN=$(cat); APP="$1"; IMAGE="dokku/$APP"
 DOCKERFILE_ENV_FILE="$DOKKU_ROOT/$APP/DOCKERFILE_ENV_FILE"

-if ! is_image_buildstep_based "$IMAGE"; then
+if ! is_image_herokuish_based "$IMAGE"; then
  > "$DOCKERFILE_ENV_FILE"
  [[ -f "$DOKKU_ROOT/ENV" ]] && sed -e "s:^export ::g" -e "s:=':=:g" -e "s:'$::g" "$DOKKU_ROOT/ENV" > "$DOCKERFILE_ENV_FILE"
  [[ -f "$DOKKU_ROOT/$APP/ENV" ]] && sed -e "s:^export ::g" -e "s:=':=:g" -e "s:'$::g" "$DOKKU_ROOT/$APP/ENV" >> "$DOCKERFILE_ENV_FILE"
--- a/plugins/docker-options/commands
+++ b/plugins/docker-options/commands
@@ -141,10 +141,10 @@ case "$1" in
  # Display usage help
  help)
    cat && cat<<EOF
-    docker-options <app>                            Display apps docker options for all phases
-    docker-options <app> <phase(s)>                 Display apps docker options for phase (comma seperated phase list)
-    docker-options:add <app> <phase(s)> OPTION      Add docker option to app for phase (comma seperated phase list)
-    docker-options:remove <app> <phase(s)> OPTION   Remove docker option from app for phase (comma seperated phase list)
+    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)
 EOF
  ;;

--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -133,10 +133,10 @@ case "$1" in

  help | domains:help)
    cat && cat<<EOF
-    domains <app>                                   List custom domains for app
-    domains:add <app> DOMAIN                        Add a custom domain to app
-    domains:clear <app>                             Clear all custom domains for app
-    domains:remove <app> DOMAIN                     Remove a custom domain from app
+    domains <app>, List custom domains for app
+    domains:add <app> DOMAIN, Add a custom domain to app
+    domains:clear <app>, Clear all custom domains for app
+    domains:remove <app> DOMAIN, Remove a custom domain from app
 EOF
    ;;

--- a/plugins/git/commands
+++ b/plugins/git/commands
@@ -23,7 +23,7 @@ git_build_app_repo() {
  if [[ -f Dockerfile ]] && [[ "$([[ -f .env ]] && grep -q BUILDPACK_URL .env; echo $?)" != "0" ]] && [[ ! -f ".buildpacks" ]]; then
    dokku receive "$APP" "dockerfile" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/"
  else
-    dokku receive "$APP" "buildstep" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/"
+    dokku receive "$APP" "herokuish" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/"
  fi
 }

@@ -37,10 +37,14 @@ case "$1" in
      # if block if you wish to run it for others as well.
      if [[ $refname = "refs/heads/master" ]] ; then
        # broken out into pluginhook so we might support other methods to receive an app
-        pluginhook receive-app $APP $newrev
+        pluginhook -p receive-app $APP $newrev
      else
-        echo $'\e[1G\e[K'"-----> WARNING: deploy did not complete, you must push to master."
-        echo $'\e[1G\e[K'"-----> for example, try 'git push <dokku> ${refname/refs\/heads\/}:master'"
+        if test -f "$PLUGIN_PATH"/enabled/*/receive-branch; then
+          pluginhook receive-branch $APP $newrev $refname
+        else
+          echo $'\e[1G\e[K'"-----> WARNING: deploy did not complete, you must push to master."
+          echo $'\e[1G\e[K'"-----> for example, try 'git push <dokku> ${refname/refs\/heads\/}:master'"
+        fi
      fi
    done
    ;;
--- a/plugins/git/receive-app
+++ b/plugins/git/receive-app
@@ -4,4 +4,9 @@ source "$(dirname $0)/../common/functions"

 APP="$1"; REV="$2"

-dokku git-build $APP $REV
+# Don't trigger git build if there is no git repository.
+if [ ! -d "$DOKKU_ROOT/$APP/refs" ]; then
+  cat
+else
+  dokku git-build $APP $REV
+fi
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -49,6 +49,9 @@ case "$1" in
      shopt -u nullglob
    fi

+    DOKKU_APP_CIDS=($(get_app_container_ids $APP))
+    docker cp "${DOKKU_APP_CIDS[0]}:/app/nginx.conf.template" "$DOKKU_ROOT/$APP/" 2> /dev/null || true
+
    [[ -f "$DOKKU_ROOT/ENV" ]] && source $DOKKU_ROOT/ENV
    [[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV
    [[ -f "$APP_NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$APP_NGINX_TEMPLATE" && NGINX_CUSTOM_TEMPLATE="true" && dokku_log_info1 'Overriding default nginx.conf with detected nginx.conf.template'
@@ -133,6 +136,10 @@ EOF
        dokku_log_info1 "VHOST support disabled, deleting $APP/VHOST"
        rm "$DOKKU_ROOT/$APP/VHOST"
      fi
+      if [[ -f "$DOKKU_ROOT/$APP/URLS" ]]; then
+        dokku_log_info1 "VHOST support disabled, deleting $APP/URLS"
+        rm "$DOKKU_ROOT/$APP/URLS"
+      fi
      if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
        dokku_log_info1 "VHOST support disabled, deleting nginx.conf"
        rm "$DOKKU_ROOT/$APP/nginx.conf"
@@ -167,8 +174,8 @@ EOF

  help | nginx:help)
    cat && cat<<EOF
-    nginx:import-ssl <app>                          Imports a tarball from stdin; should contain server.crt and server.key
-    nginx:build-config <app>                        (Re)builds nginx config for given app
+    nginx:import-ssl <app>, Imports a tarball from stdin; should contain server.crt and server.key
+    nginx:build-config <app>, (Re)builds nginx config for given app
 EOF
    ;;

--- a/plugins/nginx-vhosts/post-deploy
+++ b/plugins/nginx-vhosts/post-deploy
@@ -3,12 +3,14 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$(dirname $0)/../common/functions"

 APP="$1"
-NO_VHOST=$(dokku config:get $APP NO_VHOST || true)
+if [[ -f "$DOKKU_ROOT/$APP/IP.web.1" ]] && [[ -f "$DOKKU_ROOT/$APP/PORT.web.1" ]]; then
+  NO_VHOST=$(dokku config:get $APP NO_VHOST || true)

-if [[ -n "$NO_VHOST" ]]; then
-  dokku_log_info1 "NO_VHOST config detected"
-elif [[ ! -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
-  dokku domains:setup $APP
+  if [[ -n "$NO_VHOST" ]]; then
+    dokku_log_info1 "NO_VHOST config detected"
+  elif [[ ! -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
+    dokku domains:setup $APP
+  fi
+
+  dokku nginx:build-config $APP
 fi
-
-dokku nginx:build-config $APP
--- a/plugins/nginx-vhosts/templates/nginx.conf.template
+++ b/plugins/nginx-vhosts/templates/nginx.conf.template
@@ -6,6 +6,14 @@ server {
  error_log   /var/log/nginx/${APP}-error.log;

  location    / {
+
+    gzip on;
+    gzip_min_length  1100;
+    gzip_buffers  4 32k;
+    gzip_types    text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml  application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
+    gzip_vary on;
+    gzip_comp_level  6;
+
    proxy_pass  http://$APP;
    proxy_http_version 1.1;
    proxy_set_header Upgrade \$http_upgrade;
--- a/plugins/nginx-vhosts/templates/nginx.ssl.conf.template
+++ b/plugins/nginx-vhosts/templates/nginx.ssl.conf.template
@@ -2,6 +2,8 @@ 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;
  return 301 https://\$host\$request_uri;
 }

@@ -9,11 +11,21 @@ server {
  listen      [::]:443 ssl spdy;
  listen      443 ssl spdy;
  server_name $SSL_SERVER_NAME;
+  access_log  /var/log/nginx/${APP}-access.log;
+  error_log   /var/log/nginx/${APP}-error.log;
 $SSL_DIRECTIVES

  keepalive_timeout   70;
  add_header          Alternate-Protocol  443:npn-spdy/2;
  location    / {
+
+    gzip on;
+    gzip_min_length  1100;
+    gzip_buffers  4 32k;
+    gzip_types    text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml  application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
+    gzip_vary on;
+    gzip_comp_level  6;
+
    proxy_pass  http://$APP;
    proxy_http_version 1.1;
    proxy_set_header Upgrade \$http_upgrade;
--- a/plugins/ps/commands
+++ b/plugins/ps/commands
@@ -8,22 +8,20 @@ case "$1" in
    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
    verify_app_name "$2"

-    APP="$2"; CONTAINER_IDS=$(get_container_ids $APP)
+    APP="$2"; CONTAINER_IDS=$(get_app_container_ids $APP)
    ! (is_deployed $APP) && echo "App $APP has not been deployed" && exit 0

    for CID in $CONTAINER_IDS; do
-      docker exec -ti "$CID" /bin/bash -c "ps auxwww"
+      docker exec -ti "$CID" /bin/sh -c "ps auxwww"
    done
  ;;

  ps:start)
    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    verify_app_name "$2"
-
-    APP="$2"; CONTAINER_IDS=( $(get_container_ids $APP) )
+    verify_app_name "$2"; APP="$2"
    ! (is_deployed $APP) && echo "App $APP has not been deployed" && exit 0

-    if [[ "$(docker ps -q --no-trunc| grep -q ${CONTAINER_IDS[0]}; echo $?)" != "0" ]]; then
+    if ! (is_app_running $APP); then
      release_and_deploy $APP
    else
      echo "App $APP already running"
@@ -34,15 +32,13 @@ case "$1" in
    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
    verify_app_name "$2"

-    APP="$2"; CONTAINER_IDS=$(get_container_ids $APP)
+    APP="$2"; CONTAINER_IDS=$(get_app_container_ids $APP)
    ! (is_deployed $APP) && echo "App $APP has not been deployed" && exit 0

-    CONTAINER_IDS_EGREP_PATTERN=$(echo $CONTAINER_IDS | xargs | sed -e "s: :|:g")
-    if [[ "$(docker ps -q --no-trunc| egrep -q $CONTAINER_IDS_EGREP_PATTERN; echo $?)" = "0" ]]; then
+    DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids $APP)
+    if [[ -n "$DOKKU_APP_RUNNING_CONTAINER_IDS" ]]; then
      echo "Stopping $APP ..."
-      for CID in $CONTAINER_IDS;do
-        docker stop $CID > /dev/null
-      done
+      docker stop $DOKKU_APP_RUNNING_CONTAINER_IDS > /dev/null || true
    else
      echo "App $APP already stopped"
    fi
@@ -53,7 +49,7 @@ case "$1" in
    verify_app_name "$2"
    APP="$2"

-    pluginhook receive-app $APP
+    pluginhook -p receive-app $APP
  ;;

  ps:rebuildall)
@@ -105,14 +101,14 @@ case "$1" in

  help | ps:help)
    cat && cat<<EOF
-    ps <app>                                        List processes running in 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:rebuild <app>                                Rebuild an app
-    ps:rebuildall                                   Rebuild all apps
-    ps:restart <app>                                Restart app container(s)
-    ps:restartall                                   Restart all deployed app containers
+    ps <app>, List processes running in app container(s)
+    ps:scale <app> <proc>=<count> [<proc>=<count>], Set how many instances of a given process to run
+    ps:start <app>, Start app container(s)
+    ps:stop <app>, Stop app container(s)
+    ps:rebuild <app>, Rebuild an app
+    ps:rebuildall, Rebuild all apps
+    ps:restart <app>, Restart app container(s)
+    ps:restartall, Restart all deployed app containers
 EOF
    ;;

--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -7,8 +7,8 @@ release_and_deploy() {
  local APP="$1"; local IMAGE="dokku/$APP"

  if verify_image "$IMAGE"; then
-    if is_image_buildstep_based "$IMAGE"; then
-      IMAGE_SOURCE_TYPE="buildstep"
+    if is_image_herokuish_based "$IMAGE"; then
+      IMAGE_SOURCE_TYPE="herokuish"
    else
      IMAGE_SOURCE_TYPE="dockerfile"
    fi
@@ -23,18 +23,26 @@ release_and_deploy() {
  fi
 }

+print_dokku_scale_file(){
+  local APP="$1"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
+  while read line || [ -n "$line" ]
+  do
+    dokku_log_info2_quiet "$line"
+  done < "$DOKKU_SCALE_FILE"
+}
+
 generate_scale_file() {
  local APP="$1"; local IMAGE="dokku/$APP"; local DOKKU_SCALE_FILE="$DOKKU_ROOT/$APP/DOKKU_SCALE"
  copy_from_image "$IMAGE" "/app/DOKKU_SCALE" "$DOKKU_ROOT/$APP" 2>/dev/null || true
  if [[ ! -f $DOKKU_SCALE_FILE ]]; then
-    dokku_log_info1_quiet "DOKKU_SCALE not found in app image. Defaulting to a single web process"
+    dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Defaulting to a single web process"
    echo "web=1" >> $DOKKU_SCALE_FILE

    dokku_log_info1_quiet "New DOKKU_SCALE file generated"
-    while read line || [ -n "$line" ]
-    do
-      dokku_log_info2_quiet "$line"
-    done < "$DOKKU_SCALE_FILE"
+
+  else
+    dokku_log_info1_quiet "DOKKU_SCALE file found"
+    print_dokku_scale_file $APP
  fi
 }

--- a/plugins/shell/commands
+++ b/plugins/shell/commands
@@ -48,7 +48,7 @@ case "$1" in

  help | shell:help)
    cat && cat<<EOF
-    shell                                           Spawn dokku shell
+    shell, Spawn dokku shell
 EOF
    ;;

--- a/tests.mk
+++ b/tests.mk
@@ -75,6 +75,10 @@ else
 	@$(QUIET) ./tests/ci/unit_test_runner.sh $$UNIT_TEST_BATCH
 endif

+deploy-test-checks-root:
+	@echo deploying checks-root app...
+	cd tests && ./test_deploy ./apps/checks-root dokku.me '' true
+
 deploy-test-clojure:
 	@echo deploying config app...
 	cd tests && ./test_deploy ./apps/clojure dokku.me
@@ -115,6 +119,10 @@ deploy-test-nodejs-express-noprocfile:
 	@echo deploying nodejs-express app with no Procfile...
 	cd tests && ./test_deploy ./apps/nodejs-express-noprocfile dokku.me

+deploy-test-nodejs-worker:
+	@echo deploying nodejs-worker app...
+	cd tests && ./test_deploy ./apps/nodejs-worker dokku.me
+
 deploy-test-php:
 	@echo deploying php app...
 	cd tests && ./test_deploy ./apps/php dokku.me
@@ -137,6 +145,7 @@ deploy-test-static:

 deploy-tests:
 	@echo running deploy tests...
+	@$(QUIET) $(MAKE) deploy-test-checks-root
 	@$(QUIET) $(MAKE) deploy-test-config
 	@$(QUIET) $(MAKE) deploy-test-clojure
 	@$(QUIET) $(MAKE) deploy-test-dockerfile
@@ -147,6 +156,7 @@ deploy-tests:
 	@$(QUIET) $(MAKE) deploy-test-multi
 	@$(QUIET) $(MAKE) deploy-test-nodejs-express
 	@$(QUIET) $(MAKE) deploy-test-nodejs-express-noprocfile
+	@$(QUIET) $(MAKE) deploy-test-nodejs-worker
 	@$(QUIET) $(MAKE) deploy-test-php
 	@$(QUIET) $(MAKE) deploy-test-python-flask
 	@$(QUIET) $(MAKE) deploy-test-scala
--- a/tests/apps/checks-root/CHECKS
+++ b/tests/apps/checks-root/CHECKS
@@ -0,0 +1,2 @@
+ATTEMPTS=2
+/
--- a/tests/apps/checks-root/index.js
+++ b/tests/apps/checks-root/index.js
@@ -0,0 +1,11 @@
+var express = require('express');
+var app = express();
+
+app.get('/', function(req, res) {
+  res.sendStatus(404);
+});
+
+var port = process.env.PORT || 5000;
+app.listen(port, function() {
+  console.log('Listening on port ' + port);
+});
--- a/tests/apps/checks-root/package.json
+++ b/tests/apps/checks-root/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "node-example",
+  "version": "0.0.1",
+  "dependencies": {
+    "express": "4.x"
+  },
+  "engines": {
+    "node": "0.12.x",
+    "npm": "2.x"
+  },
+  "scripts": {
+    "start": "node index.js"
+  }
+}
--- a/tests/apps/config/DOKKU_SCALE
+++ b/tests/apps/config/DOKKU_SCALE
@@ -0,0 +1,2 @@
+# test comment
+web=1
--- a/tests/apps/dockerfile/Dockerfile
+++ b/tests/apps/dockerfile/Dockerfile
@@ -2,7 +2,9 @@ FROM ubuntu:trusty
 ENV LC_ALL C
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
-EXPOSE 3000
+EXPOSE 3001/udp
+EXPOSE  3000/tcp
+EXPOSE 3003

 RUN apt-get install -y software-properties-common && add-apt-repository ppa:chris-lea/node.js && apt-get update
 RUN apt-get install -y build-essential curl postgresql-client-9.3 nodejs git
--- a/tests/apps/multi/README.md
+++ b/tests/apps/multi/README.md
@@ -1,3 +1,3 @@
-This is a sample application to test heroku buildpack multi for integrating with buildstep: https://github.com/progrium/buildstep/pull/75
+This is a sample application to test heroku buildpack multi for integrating with herokuish: https://github.com/gliderlabs/herokuish

 I am choosing to use the python, nodejs, and ruby buildpacks to create a very simple flask app that performs a bower install and a simple grunt task using compass.
--- a/tests/apps/nodejs-worker/DOKKU_SCALE
+++ b/tests/apps/nodejs-worker/DOKKU_SCALE
@@ -0,0 +1,2 @@
+web=0
+worker=1
--- a/tests/apps/nodejs-worker/Procfile
+++ b/tests/apps/nodejs-worker/Procfile
@@ -0,0 +1 @@
+worker: node worker.js
--- a/tests/apps/nodejs-worker/check_deploy
+++ b/tests/apps/nodejs-worker/check_deploy
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+set -e; output="$(pgrep -f "node worker.js" | wc -l)"; echo "$output"; test "$output" == "1"
--- a/tests/apps/nodejs-worker/package.json
+++ b/tests/apps/nodejs-worker/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "node-example",
+  "version": "0.0.1",
+  "engines": {
+    "node": "0.10.x",
+    "npm": "2.7.x"
+  }
+}
--- a/tests/apps/nodejs-worker/worker.js
+++ b/tests/apps/nodejs-worker/worker.js
@@ -0,0 +1,6 @@
+function worker() {
+  console.log('sleeping for 60 seconds');
+  setTimeout(worker, 60 * 1000);
+}
+
+worker();
--- a/tests/ci/parallel_runner.sh
+++ b/tests/ci/parallel_runner.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash

+set -eo pipefail
+
 MODE="$1"; MODE=${MODE:="testing"}

 setup_circle() {
-  MAKE_ENV="CI=true"
-  [[ "$1" == "buildstack" ]] && MAKE_ENV+=" BUILD_STACK=true "
-  echo "setting up with MAKE_ENV: $MAKE_ENV"
+  echo "=====> setup_circle on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
  sudo -E CI=true make -e sshcommand
  # need to add the dokku user to the docker group
  sudo usermod -G docker dokku
@@ -14,33 +14,43 @@ setup_circle() {
  sudo chown -R root:root ~root/.ssh/
  sudo sed --in-place 's:/home/ubuntu:/root:g' ~root/.ssh/config
  ####
-  sudo -E $MAKE_ENV make -e install
+  [[ "$1" == "buildstack" ]] && BUILD_STACK=true make -e stack
+  sudo -E CI=true make -e install
  sudo -E make -e setup-deploy-tests
  make -e ci-dependencies
 }

+if [[ -n "$CIRCLE_NODE_INDEX" ]] && [[ "$MODE" == "setup" ]]; then
+  case "$CIRCLE_NODE_INDEX" in
+      3)
+        setup_circle buildstack
+        exit $?
+        ;;
+      *)
+        setup_circle
+        exit $?
+        ;;
+  esac
+fi
+
 case "$CIRCLE_NODE_INDEX" in
  0)
    echo "=====> make unit-tests (1/2) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
-    [[ "$MODE" == "setup" ]] && setup_circle && exit 0
    sudo -E UNIT_TEST_BATCH=1 make -e unit-tests
    ;;

  1)
    echo "=====> make unit-tests (2/2) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
-    [[ "$MODE" == "setup" ]] && setup_circle && exit 0
    sudo -E UNIT_TEST_BATCH=2 make -e unit-tests
    ;;

  2)
-    echo "=====> make deploy-tests (buildstep release) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
-    [[ "$MODE" == "setup" ]] && setup_circle && exit 0
+    echo "=====> make deploy-tests (herokuish release) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
    sudo -E make -e deploy-tests
    ;;

  3)
-    echo "=====> make deploy-tests (buildstep master) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
-    [[ "$MODE" == "setup" ]] && setup_circle buildstack && exit 0
+    echo "=====> make deploy-tests (herokuish master) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
    sudo -E make -e deploy-tests
    ;;
 esac
--- a/Show More
+++ b/Show More