Release 0.7.1

Upgrade sshcommand to improve ssh-keys:list output

HISTORY.md

@@ -1,5 +1,36 @@
 # History
 
+## 0.7.1
+
+### Bug Fixes
+
+- #2348: @josegonzalez Correct the version in use for ssh-keys
+- #2369: @u2mejc Fix ssh-keys:add permission error
+- #2377: @ebeigarts Do not use http_proxy env variables for CHECKS
+- #2360: @xadh00m Allow hyphen in TLD
+- #2387: @michaelshobbs Silence find warnings under Ubuntu 16.04
+- #2390: @josegonzalez Actually stop the dokku-installer service
+
+### New Features
+
+- #2358: @josegonzalez Guard against poodle vulnerability by default
+- #2385: @michaelshobbs Actually merge dokku-app-user into core
+
+### Documentation
+
+- #2337: @josegonzalez Update deprecated plugins list
+- #2352: @miguelcobain Fix typos in plugin-triggers docs
+- #2353: @miguelcobain Add a note about making plugins executable
+- #2345: @johnfraney Update list of officially supported distributions
+- #2354: @josegonzalez Dockerfile deploys do not support mounted volumes
+- #2371: @michaelshobbs Moved some plugin repos to michaelshobbs
+- #2381: @michaelshobbs Fail rest of bats file on first test failure
+- #2382: @alexgleason Fix typo "exampple" to "example"
+- #2386: @josegonzalez Add a migration guide for 0.7.0
+- #2388: @josegonzalez Add documentation for proxy ports scheme handling
+- #2389: @josegonzalez Add plugin management documentation
+
+
 ## 0.7.0
 
 Another great minor release! There are no known backwards incompatibilities with this release, though the following may be of interest to our users:

Makefile

@@ -1,6 +1,6 @@
 DOKKU_VERSION = master
 
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.5.0/sshcommand
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.6.0/sshcommand
 PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz
 SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git

README.md

@@ -7,14 +7,14 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.
 
 ## Requirements
 
-- A fresh VM running Ubuntu `14.04 x64`
+- A fresh VM running `Debian 8.2 x64`, `Ubuntu 14.04 x64`, or `Ubuntu 16.04 x64`
 
 ## Installing
 
 To install the latest stable release, you can run the following commands as a user that has access to `sudo`:
 
-    wget https://raw.githubusercontent.com/dokku/dokku/v0.7.0/bootstrap.sh
-    sudo DOKKU_TAG=v0.7.0 bash bootstrap.sh
+    wget https://raw.githubusercontent.com/dokku/dokku/v0.7.1/bootstrap.sh
+    sudo DOKKU_TAG=v0.7.1 bash bootstrap.sh
 
 ### Upgrading
 

SPONSORS.md

@@ -1,3 +1,5 @@
 [Deis](http://deis.io)
 
 [DigitalOcean](https://www.digitalocean.com/)
+
+[Melvin Lammerts](http://dokku.net)

contrib/dokku-installer.py

@@ -9,7 +9,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.7.0'
+VERSION = 'v0.7.1'
 
 hostname = ''
 try:
@@ -155,7 +155,7 @@ class DeleteInstallerThread(object):
         except:
             pass
 
-        command = "rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && stop dokku-installer"
+        command = "rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && (stop dokku-installer || systemctl stop dokku-installer.service)"
         try:
             subprocess.call(command, shell=True)
         except:

deb.mk

@@ -4,7 +4,7 @@ HEROKUISH_VERSION ?= 0.3.18
 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_DESCRIPTION = 'Docker powered PaaS that helps you build and manage the lifecycle of applications'
 DOKKU_REPO_NAME ?= dokku/dokku
 DOKKU_ARCHITECTURE = amd64
 
@@ -26,7 +26,7 @@ Simplifies running a single command over SSH, and
 manages authorized keys (ACL) and users in order to do so.
 endef
 SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
-SSHCOMMAND_VERSION ?= 0.5.0
+SSHCOMMAND_VERSION ?= 0.6.0
 SSHCOMMAND_ARCHITECTURE = amd64
 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
 SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v$(SSHCOMMAND_VERSION)/sshcommand

debian/control

@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.7.0
+Version: 0.7.1
 Section: web
 Priority: optional
 Architecture: amd64

docs/advanced-usage/persistent-storage.md

@@ -66,11 +66,24 @@ Your app may have services that are running in memory and need to be backed up l
 By default, dokku will only bind storage mounts during the deploy and run phases. Under certain conditions, one might want to bind a storage mount during the build phase. This can be accomplished by using the `docker-options` plugin directly.
 
 ```shell
-dokku docker-options:add <app> "-v /tmp/python-test:/opt/test"
+dokku docker-options:add <app> build "-v /tmp/python-test:/opt/test"
 ```
 
-NOTE: **This can cause data loss** if you bind a mount under `/app` in buildpack apps as herokuish will attempt to remove the original app path during the build phase.
+You cannot use mounted volumes during the build phase of a Dockerfile deploy. This is because Docker does not support volumes when executing `docker build`.
+
+> Note: **This can cause data loss** if you bind a mount under `/app` in buildpack apps as herokuish will attempt to remove the original app path during the build phase.
 
 ## Docker-Options Note
 
-The storage plugins is compatible with storage mounts created with the docker-options. The storage plugin will only list mounts from the deploy phase.
+The storage plugin is compatible with storage mounts created with the docker-options. The storage plugin will only list mounts from the deploy phase.
+
+
+> New as of 0.7.1
+
+## Application User and Persistent Storage file ownership (buildpack apps only)
+
+By default, dokku will execute your buildpack application processes as the `herokuishuser` user. You may override this by setting the `DOKKU_APP_USER` config variable.
+
+> NOTE: this user must exist in your herokuish image.
+
+Additionally, dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`.

docs/advanced-usage/plugin-management.md

@@ -0,0 +1,126 @@
+# Plugin Management
+
+> New as of 0.4.0
+
+```
+plugin                                   # Print active plugins
+plugin:disable <name>                    # Disable an installed plugin (third-party only)
+plugin:enable <name>                     # Enable a previously disabled plugin
+plugin:install [--core|git-url [--committish tag|branch|commit|--name custom-plugin-name]]           # Optionally download git-url (with custom tag/committish) & run install trigger for active plugins (or only core ones)
+plugin:install-dependencies [--core]     # Run install-dependencies trigger for active plugins (or only core ones)
+plugin:uninstall <name>                  # Uninstall a plugin (third-party only)
+plugin:update [name [committish]]        # Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
+```
+
+```shell
+# for 0.3.x
+cd /var/lib/dokku/plugins
+git clone <git url>
+dokku plugins-install
+```
+
+> These commands require `root` permissions as the `install` and `install-dependencies` plugin triggers may utilize commands such as `apt-get`. For non-core plugins, please inspect those plugins before running the following command as `root` user.
+
+## Usage
+
+You can list all installed plugins using the `plugin` command:
+
+```shell
+dokku plugin
+```
+
+```
+plugn: dev
+  00_dokku-standard    0.7.1 enabled    dokku core standard plugin
+  20_events            0.7.1 enabled    dokku core events logging plugin
+  apps                 0.7.1 enabled    dokku core apps plugin
+  build-env            0.7.1 enabled    dokku core build-env plugin
+  certs                0.7.1 enabled    dokku core certificate management plugin
+  checks               0.7.1 enabled    dokku core checks plugin
+  common               0.7.1 enabled    dokku core common plugin
+  config               0.7.1 enabled    dokku core config plugin
+  docker-options       0.7.1 enabled    dokku core docker-options plugin
+  domains              0.7.1 enabled    dokku core domains plugin
+  enter                0.7.1 enabled    dokku core enter plugin
+  git                  0.7.1 enabled    dokku core git plugin
+  logs                 0.7.1 enabled    dokku core logs plugin
+  named-containers     0.7.1 enabled    dokku core named containers plugin
+  nginx-vhosts         0.7.1 enabled    dokku core nginx-vhosts plugin
+  plugin               0.7.1 enabled    dokku core plugin plugin
+  proxy                0.7.1 enabled    dokku core proxy plugin
+  ps                   0.7.1 enabled    dokku core ps plugin
+  repo                 0.7.1 enabled    dokku core repo plugin
+  shell                0.7.1 enabled    dokku core shell plugin
+  ssh-keys             0.7.1 enabled    dokku core ssh-keys plugin
+  storage              0.7.1 enabled    dokku core storage plugin
+  tags                 0.7.1 enabled    dokku core tags plugin
+  tar                  0.7.1 enabled    dokku core tar plugin
+```
+
+Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
+
+```shell
+dokku plugin:install https://github.com/dokku/dokku-postgres.git
+```
+
+```
+-----> Cloning plugin repo https://github.com/dokku/dokku-postgres.git to /var/lib/dokku/plugins/available/postgres
+Cloning into 'postgres'...
+remote: Counting objects: 646, done.
+remote: Total 646 (delta 0), reused 0 (delta 0), pack-reused 646
+Receiving objects: 100% (646/646), 134.24 KiB | 0 bytes/s, done.
+Resolving deltas: 100% (406/406), done.
+Checking connectivity... done.
+-----> Plugin postgres enabled
+-----> Migrating zero downtime env variables to 0.5.x. The following variables have been deprecated
+=====> DOKKU_SKIP_ALL_CHECKS DOKKU_SKIP_DEFAULT_CHECKS
+=====> Please use dokku checks:[disable|enable] <app> to control zero downtime functionality
+=====> Migration complete
+=====>
+-----> Migrating zero downtime env variables to 0.6.x. The following variables will be migrated
+=====> DOKKU_CHECKS_ENABLED -> DOKKU_CHECKS_SKIPPED
+=====> Migration complete
+=====>
+Adding user dokku to group adm
+Starting nginx (via systemctl): nginx.service.
+```
+
+You can also uninstall a third-party plugin using the `plugin:uninstall` command:
+
+```shell
+dokku plugin:uninstall postgres
+```
+
+```
+-----> Plugin postgres uninstalled
+```
+
+Enabling or disabling a plugin can also be useful in cases where you are debugging whether a third-party plugin is causing issues in your Dokku installation:
+
+```shell
+
+```shell
+dokku plugin:disable postgres
+```
+
+```
+-----> Plugin postgres disabled
+```
+
+```shell
+dokku plugin:enable postgres
+```
+
+```
+-----> Plugin postgres enabled
+```
+
+Finally, you can update an installed third-party plugin. This should be done after any upgrades of Dokku as there may be changes in the internal api that require an update of how the plugin interfaces with Dokku.
+
+```shell
+dokku plugin:update postgres
+```
+
+```
+Plugin (postgres) updated
+```

docs/advanced-usage/proxy-management.md

@@ -139,4 +139,22 @@ dokku proxy:ports-remove node-js-app http:80:5000
 
 By default, buildpack apps and dockerfile apps **without** explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on port `80` (and additionally a listener on 443 if ssl is enabled) that will proxy to the application container on port `5000`. Dockerfile apps **with** explicitly exposed ports will be configured with a listener on each exposed port and will proxy to that same port of the deployed application container.
 
-> NOTE: This default behavior **will not** be automatically changed on subsequent pushes and must be manipulated with the `proxy:ports-*` syntax detailed above.
+> Note: This default behavior **will not** be automatically changed on subsequent pushes and must be manipulated with the `proxy:ports-*` syntax detailed above.
+
+## Proxy Port Scheme
+
+The proxy port scheme is as follows:
+
+- `SCHEME:HOST_PORT:CONTAINER_PORT`
+
+The scheme metadata can be used by proxy implementations in order to properly handle proxying of requests. For example, the built-in `nginx-vhosts` proxy implementation supports both the `http` and `https` schemes.
+
+Developers of proxy implementations are encouraged to use whatever schemes make the most sense, and ignore configurations which they do not support. For instance, a `udp` proxy implementation can safely ignore `http` and `https` port mappings.
+
+To change the proxy implementation in use for an application, use the `proxy:set` command:
+
+```shell
+# no validation will be performed against
+# the specified proxy implementation
+dokku proxy:set node-js-app nginx
+```

docs/appendices/0.7.0-migration-guide.md

@@ -0,0 +1,13 @@
+# 0.7.0 Migration Guide
+
+## Persistent Storage
+
+We should now properly handle file ownership for mounted directories. This was enhanced in 0.7.1. See the [persistent storage documentation](/dokku/advanced-usage/persistent-storage/) for more details.
+
+## Restart Policies
+
+If you previously managed container restart policies via docker-options, these can now be managed natively via the built-in `ps` plugin. There is no migration necessary. See the [restart policy documentation](/dokku/deployment/process-management/#restart-policies) for more details.
+
+## SSH Keys
+
+Dokku now has an `ssh-keys` plugin that can be used to manage ssh keys for the `dokku` user on the host operating system. See the [user management documentation](/dokku/deployment/user-management/) for more details.

docs/assets/favicons/browserconfig.xml

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

docs/assets/favicons/manifest.json

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

docs/assets/style.css

@@ -36,13 +36,13 @@ h1 {
   background-repeat: no-repeat;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/dokku.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }

docs/assets/versions.json

@@ -1 +1 @@
-{ "max-versions": [ "0.3.26", "0.4.14", "0.5.8", "0.6.5", "0.7.0" ] }
+{ "max-versions": [ "0.3.26", "0.4.14", "0.5.8", "0.6.5", "0.7.1" ] }

docs/community/plugins.md

@@ -12,17 +12,7 @@ Let's take a quick look at the current dokku nginx plugin that's shipped with do
 
 ## Installing a plugin
 
-```shell
-# This command requires `root` permissions as the `install` and `install-dependencies`
-# plugin triggers may utilize commands such as `apt-get`. For non-core plugins, please
-# inspect those plugins before running the following command as `root` user.
-sudo dokku plugin:install <git_url> [--committish tag/branch/commit|--name custom-plugin-name]
-
-# previous versions (0.3.x and below) of dokku require a manual process to install plugins
-cd /var/lib/dokku/plugins
-git clone <git url>
-dokku plugins-install
-```
+[See the plugin management documentation](/dokku/advanced-usage/plugin-management/).
 
 ## Creating your own plugin
 
@@ -74,6 +64,7 @@ Note: The following plugins have been supplied by our community and may not have
 [cef]: https://github.com/cef
 [cjblomqvist]: https://github.com/cjblomqvist
 [crisward]: https://github.com/crisward
+[cu12]: https://github.com/cu12
 [darkpixel]: https://github.com/darkpixel
 [dokku]: https://github.com/dokku
 [dyson]: https://github.com/dyson
@@ -187,7 +178,6 @@ Note: The following plugins have been supplied by our community and may not have
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [App name as env](https://github.com/cjblomqvist/dokku-app-name-env)                              | [cjblomqvist][]       | 0.3.x                 |
-| [App User](https://github.com/expa/dokku-app-user)                                                | [michaelshobbs][]     | 0.4.0+                |
 | [Dokku Clone](https://github.com/crisward/dokku-clone)                                            | [crisward][]          | 0.4.0+                |
 | [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [heichblatt][]        |                       |
 | [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
@@ -203,11 +193,9 @@ Note: The following plugins have been supplied by our community and may not have
 | [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           |                       |
 | [Nuke Containers](https://github.com/heichblatt/dokku-nuke)                                       | [heichblatt][]        |                       |
 | [Open App Ports](https://github.com/heichblatt/dokku-ports)                                       | [heichblatt][]        |                       |
-| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | 0.4.0+                |
-| [Proctype Filter](https://github.com/expa/dokku-proctype-filter)                                  | [michaelshobbs][]     | 0.4.0+                |
+| [Proctype Filter](https://github.com/michaelshobbs/dokku-proctype-filter)                         | [michaelshobbs][]     | 0.4.0+                |
 | [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>3</sup>            | [cedricziel][]        | 0.3.x                 |
 | [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>4</sup>                   | [cedricziel][]        | 0.3.x                 |
-| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | 0.3.x                 |
 
 [217d00a]: https://github.com/dokku/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
 
@@ -258,6 +246,7 @@ The following plugins have been removed as their functionality is now in Dokku C
 
 | Plugin                                                                                            | Author                | In Dokku Since                  |
 | ------------------------------------------------------------------------------------------------- | --------------------- | ------------------------------- |
+| [App User](https://github.com/michaelshobbs/dokku-app-user)                                       | [michaelshobbs][]     | v0.7.1 (herokuish 0.3.18)       |
 | [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) |
@@ -269,12 +258,14 @@ The following plugins have been removed as their functionality is now in Dokku C
 | [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin) |
 | [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)        |
 | [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin) |
+| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     | v0.5.0 (deployment tasks)        |
 | [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)        |
+| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | v0.5.0 (storage 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)

docs/configuration/nginx.md

@@ -81,7 +81,7 @@ upstream {{ .APP }} {
 {{ .SSL_SERVER_NAME }}              List of SSL VHOSTS
 ```
 
-> NOTE: Application config variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
+> Note: Application config variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
 
 
 ### Example HTTP to HTTPS Custom Template

docs/deployment/methods/dockerfiles.md

@@ -17,7 +17,7 @@ To use a dockerfiles for deployment, commit a valid `Dockerfile` to the root of
 
 Dokku will extract all tcp ports exposed using the `EXPOSE` directive (one port per line) and setup nginx to proxy the same port numbers to listen publicly. If you would like to change the exposed port, you should do so within your `Dockerfile` and app.
 
-> NOTE: Nginx does not support proxying UDP. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`
+> Note: Nginx does not support proxying UDP. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`
 
 If you do not explicitly `EXPOSE` a port in your `Dockerfile`, dokku will configure the nginx proxy to listen on port 80 (and 443 for TLS) and forward traffic to your app listening on port 5000 inside the container. Just like buildpack apps, you can also use the `$PORT` environment variable in your app to maintain portability.
 

docs/deployment/methods/images.md

@@ -11,7 +11,7 @@ tags:deploy <app> <tag>                        # Deploy tagged app image
 tags:destroy <app> <tag>                       # Remove app image tag
 ```
 
-For exampple, you can list all tags for a given application:
+For example, you can list all tags for a given application:
 
 ```shell
 dokku tags node-js-app

docs/development/plugin-creation.md

@@ -119,6 +119,7 @@ version = "0.1.0"
 
 A few notes:
 
+- Don't forget to `chmod +x` your executable files.
 - 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. Also, the command syntax will need to separated by `, ` in order to maintain columnar output alignment.

docs/development/plugin-triggers.md

@@ -497,7 +497,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 verify_app_name "$APP"
 
-dokku_log_info1" Installing $CONTAINER_PACKAGE..."
+dokku_log_info1 "Installing $CONTAINER_PACKAGE..."
 
 CMD="cat > gm && \
   dpkg -s CONTAINER_PACKAGE > /dev/null 2>&1 || \
@@ -654,7 +654,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 verify_app_name "$APP"
 
-dokku_log_info1" Installing GraphicsMagick..."
+dokku_log_info1 "Installing GraphicsMagick..."
 
 CMD="cat > gm && \
   dpkg -s graphicsmagick > /dev/null 2>&1 || \

docs/development/release-process.md

@@ -66,7 +66,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.7.0-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.7.1-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'

docs/getting-started/installation.md

@@ -21,8 +21,8 @@ To install the latest stable version of dokku, you can run the following shell c
 
 ```shell
 # for debian systems, installs dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.7.0/bootstrap.sh
-sudo DOKKU_TAG=v0.7.0 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.7.1/bootstrap.sh
+sudo DOKKU_TAG=v0.7.1 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.

docs/getting-started/upgrading.md

@@ -6,9 +6,18 @@ If your version of dokku is pre 0.3.0 (check with `dokku version`), we recommend
 
 Before upgrading, check the migration guides to get comfortable with new features and prepare your deployment to be upgraded.
 
+### 0.5 Migration Guide
+
 - [0.5 Migration Guide](/dokku/appendices/0.5.0-migration-guide/)
+
+### 0.6 Migration Guide
+
 - [0.6 Migration Guide](/dokku/appendices/0.6.0-migration-guide/)
 
+### 0.7 Migration Guide
+
+- [0.7 Migration Guide](/dokku/appendices/0.7.0-migration-guide/)
+
 ## Upgrade Instructions
 
 If dokku was installed via `apt-get install dokku` or `bootstrap.sh` (most common), upgrade with:

docs/home.html

@@ -7,33 +7,33 @@
     <!-- 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">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat:400.7.1" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
     </style>
@@ -72,7 +72,7 @@
       <div class="container">
         <div class="row">
           <h2>The smallest PaaS implementation you've ever seen</h2>
-          <p>Docker powered mini-Heroku in around 200 lines of Bash</p>
+          <p>Dokku helps you build and manage the lifecycle of applications</p>
           <div class="blurb-buttons">
             <a class="btn btn-lg btn-warning" href="/{{NAME}}/getting-started/installation/">View Documentation</a>
           </div>
@@ -95,12 +95,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.7.0/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.7.1/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.7.0 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.7.1 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>

docs/template.html

@@ -10,26 +10,26 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:400:sans-serif|Open+Sans:400:sans-serif" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Dokku">
     <meta name="application-name" content="Dokku">
     <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/favicons/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
 
     <script>
@@ -43,7 +43,7 @@
     </script>
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.0/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.7.1/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
     <style>
@@ -223,6 +223,7 @@
             <a href="/{{NAME}}/advanced-usage/docker-options/" class="list-group-item">Docker Container Options</a>
             <a href="/{{NAME}}/advanced-usage/event-logs/" class="list-group-item">Event Logs</a>
             <a href="/{{NAME}}/advanced-usage/persistent-storage/" class="list-group-item">Persistent Storage</a>
+            <a href="/{{NAME}}/advanced-usage/plugin-management/" class="list-group-item">Plugin Management</a>
             <a href="/{{NAME}}/advanced-usage/proxy-management/" class="list-group-item">Proxy and Port Management</a>
             <a href="/{{NAME}}/advanced-usage/repository-management/" class="list-group-item">Repository Management</a>
 

dokku

@@ -37,7 +37,7 @@ export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
 export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
 
 export DOKKU_CONTAINER_LABEL=dokku
-export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL --env=USER=herokuishuser"
+export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL"
 
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
@@ -56,14 +56,14 @@ if [[ "${args[0]}" =~ ^--.* ]]; then
 fi
 ! has_tty && DOKKU_QUIET_OUTPUT=1
 
-if [[ $(id -un) != "dokku" ]] && [[ ! $1 =~ plugin:* ]]; then
+if [[ $(id -un) != "dokku" ]] && [[ ! $1 =~ plugin:* ]] && [[ ! $1 == "ssh-keys:add" ]]; then
   export SSH_USER=$(id -un)
   sudo -u dokku -E -H "$0" "$@"
   exit $?
 fi
 
-if [[ $(id -un) != "root" && $1 =~ ^plugin:.* ]]; then
-  dokku_log_fail "plugin:* commands must be run as root"
+if [[ $(id -un) != "root" && $1 =~ ^plugin:.* ]] || [[ $(id -un) != "root" && $1 == "ssh-keys:add" ]]; then
+  dokku_log_fail "This command must be run as root"
 fi
 
 if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then

plugins/00_dokku-standard/docker-args-build

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+
+app_user_docker_args() {
+  local APP="$1"
+  local STDIN
+  local DOKKU_APP_TYPE
+  local DOKKU_APP_USER
+
+  STDIN=$(cat)
+  DOKKU_APP_TYPE=$(config_get "$APP" DOKKU_APP_TYPE || true)
+  DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true)
+  DOKKU_APP_USER=${DOKKU_APP_USER:="herokuishuser"}
+
+  if [[ "$DOKKU_APP_TYPE" == "herokuish" ]]; then
+    local docker_args="$STDIN --env=USER=${DOKKU_APP_USER}"
+  else
+    local docker_args="$STDIN"
+  fi
+
+  echo -n "$docker_args"
+}
+
+app_user_docker_args "$@"

plugins/00_dokku-standard/docker-args-deploy

@@ -0,0 +1 @@
+docker-args-build

plugins/00_dokku-standard/docker-args-run

@@ -0,0 +1 @@
+docker-args-build

plugins/00_dokku-standard/plugin.toml

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

plugins/00_dokku-standard/post-deploy

@@ -16,7 +16,7 @@ cleanup_container_state() {
   declare desc="core post-deploy state cleanup"
   local trigger="post-deploy cleanup_container_state"
   local APP="$1"; local PROCTYPES="$(egrep -v "^#" "$DOKKU_ROOT/$APP/DOKKU_SCALE" | awk -F '=' '{ print $1 }' | xargs)"
-  local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" | sort -t . -k 3 -n | xargs)"
+  local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" 2>/dev/null | sort -t . -k 3 -n | xargs)"
 
   local CONTAINER_FILE
   for CONTAINER_FILE in $CONTAINER_FILES; do

plugins/00_dokku-standard/pre-deploy

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/config/functions"
 source "$PLUGIN_CORE_AVAILABLE_PATH/00_dokku-standard/exec-app-json-scripts"
 
 exec_app_json_scripts() {
@@ -12,4 +13,28 @@ exec_app_json_scripts() {
   execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
 }
 
+app_user_pre_deploy_trigger() {
+  local desc="app user pre-deploy trigger"
+  local APP="$1"; local IMAGE_TAG="$2"; local IMAGE; local DOCKER_ARGS
+  local DOKKU_APP_TYPE DOKKU_APP_USER APP_PATHS CONTAINER_PATHS
+
+  IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
+
+  DOKKU_APP_TYPE=$(config_get "$APP" DOKKU_APP_TYPE || true)
+  DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true)
+  DOKKU_APP_USER=${DOKKU_APP_USER:="herokuishuser"}
+  APP_PATHS=$(dokku --quiet storage:list "$APP" || true)
+
+  if [[ -n "$APP_PATHS" ]]; then
+    CONTAINER_PATHS=$(echo "$APP_PATHS" | awk -F ':' '{ print $2 }' | xargs)
+    DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" | xargs)
+  fi
+
+  if [[ "$DOKKU_APP_TYPE" == "herokuish" ]] && [[ -n "$CONTAINER_PATHS" ]]; then
+    # shellcheck disable=SC2086
+    docker run $DOKKU_GLOBAL_RUN_ARGS $DOCKER_ARGS $IMAGE /bin/bash -c "find $CONTAINER_PATHS -not -user $DOKKU_APP_USER -print0 | xargs -0 -r chown -R $DOKKU_APP_USER" || true
+  fi
+}
+
 exec_app_json_scripts "$@"
+app_user_pre_deploy_trigger "$@"

plugins/20_events/plugin.toml

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

plugins/20_events/subcommands/list

@@ -8,7 +8,7 @@ events_list_cmd() {
   local PLUGIN_DIR="$(dirname "$0")/.."
 
   if [[ "$DOKKU_EVENTS" ]]; then
-    local logged="$(find "$PLUGIN_DIR" -type l -printf '%f ' | sort)"
+    local logged="$(find "$PLUGIN_DIR" -type l -printf '%f ' 2>/dev/null | sort)"
     dokku_col_log_info2_quiet "Events currently logged"
 
     local hook

plugins/apps/plugin.toml

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

plugins/build-env/plugin.toml

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

plugins/certs/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/checks/check-deploy

@@ -148,11 +148,12 @@ checks_check_deploy() {
     sleep "$WAIT"
 
 
-    # -q           do not use .curlrc (must come first)
+    # -q           Do not use .curlrc (must come first)
     # --compressed Test compression handled correctly
     # --fail       Fail on server errors (4xx, 5xx)
     # --location   Follow redirects
-    local CURL_OPTIONS="-q --compressed --fail --location --max-time $TIMEOUT"
+    # --noproxy    Do not use http_proxy env variable
+    local CURL_OPTIONS="-q --compressed --fail --location --noproxy $DOKKU_APP_LISTEN_IP --max-time $TIMEOUT"
 
     # Set X-Forwarded-Proto header if TLS is enabled.
     local SSL="$DOKKU_ROOT/$APP/tls"

plugins/checks/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/common/functions

@@ -12,7 +12,7 @@ has_tty() {
 
 dokku_apps() {
   declare desc="prints list of all local apps"
-  local INSTALLED_APPS=$(find "$DOKKU_ROOT" -follow -maxdepth 1 -mindepth 1 -type d ! -name 'tls' ! -name '.*' -printf "%f\n" | sort) || (dokku_log_fail "You haven't deployed any applications yet")
+  local INSTALLED_APPS=$(find "$DOKKU_ROOT" -follow -maxdepth 1 -mindepth 1 -type d ! -name 'tls' ! -name '.*' -printf "%f\n" 2>/dev/null | sort) || (dokku_log_fail "You haven't deployed any applications yet")
   [[ $INSTALLED_APPS ]] && echo "$INSTALLED_APPS"
 }
 
@@ -341,7 +341,7 @@ get_app_running_container_types() {
 
   ! (is_deployed "$APP") && dokku_log_fail "App $APP has not been deployed"
 
-  CONTAINER_TYPES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -print0 | xargs -0)"
+  CONTAINER_TYPES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -print0 2>/dev/null | xargs -0)"
   if [[ -n "$CONTAINER_TYPES" ]]; then
     CONTAINER_TYPES="${CONTAINER_TYPES//$DOKKU_ROOT\/$APP\//}"
     CONTAINER_TYPES="$(tr " " $'\n' <<< "$CONTAINER_TYPES" | awk -F. '{ print $2 }' | sort | uniq | xargs)"
@@ -1065,7 +1065,7 @@ strip_inline_comments() {
 
 is_valid_hostname() {
   declare desc="return 0 if argument is a valid hostname; else return 1"
-  local hostname_string="${1,,}"; local hostname_regex='^(([a-z0-9\*](-?[a-z0-9])*)\.)*[a-z0-9\*](-?[a-z0-9])+\.[a-z]{2,}$'
+  local hostname_string="${1,,}"; local hostname_regex='^([a-z0-9\*-]+\.)*[a-z0-9\*-]+$'
   if [[ $hostname_string =~ $hostname_regex ]]; then
     return 0
   else

plugins/common/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/config/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/docker-options/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/domains/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/enter/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/git/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/logs/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/named-containers/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core named containers plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/nginx-vhosts/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/nginx-vhosts/templates/nginx.conf.sigil

@@ -47,6 +47,7 @@ server {
 
   ssl_certificate     {{ $.APP_SSL_PATH }}/server.crt;
   ssl_certificate_key {{ $.APP_SSL_PATH }}/server.key;
+  ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 
   keepalive_timeout   70;
   {{ if eq $.SPDY_SUPPORTED "true" }}add_header          Alternate-Protocol  {{ $.NGINX_SSL_PORT }}:npn-spdy/2;{{ end }}

plugins/plugin/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/proxy/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/ps/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/repo/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/shell/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/ssh-keys/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.6.4"
+version = "0.7.1"
 [plugin.config]

plugins/ssh-keys/user-auth

@@ -3,11 +3,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 check_ssh_keys_user() {
-  declare desc="check user running ssh-keys"
+  declare desc="check user passed by user-auth for ssh-keys plugin"
   local SSH_USER=$1 SSH_NAME=$2
   [[ "$SSH_USER" == "root" || "$SSH_NAME" == *admin* ]] || dokku_log_fail "You must be root, or a dokku admin, to execute this command"
 }
 
-if [[ "$3" == ssh-keys* ]]; then
+if [[ "$3" =~ (ssh-keys:add|ssh-keys:remove) ]]; then
   check_ssh_keys_user "$@"
 fi

plugins/storage/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/tags/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

plugins/tar/plugin.toml

@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.7.0"
+version = "0.7.1"
 [plugin.config]

tests/unit/10_apps.bats

@@ -2,6 +2,14 @@
 
 load test_helper
 
+setup () {
+  global_setup
+}
+
+teardown () {
+  global_teardown
+}
+
 @test "(apps) apps:create" {
   run dokku apps:create $TEST_APP
   echo "output: "$output

tests/unit/10_certs.bats

@@ -15,6 +15,7 @@ teardown_local_tls() {
 }
 
 setup() {
+  global_setup
   create_app
   setup_local_tls
 }
@@ -22,6 +23,7 @@ setup() {
 teardown() {
   destroy_app
   teardown_local_tls
+  global_teardown
 }
 
 @test "(certs) certs:add" {

tests/unit/10_checks.bats

@@ -7,11 +7,13 @@ load test_helper
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(checks) checks" {

tests/unit/10_ps-dockerfile.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 # @test "(ps) dockerfile" {

tests/unit/10_ps-general.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(ps:scale) procfile commands extraction" {

tests/unit/10_ps-herokuish.bats

@@ -3,12 +3,14 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
   destroy_app 0 "$MYAPP" || true
+  global_teardown
 }
 
 @test "(ps) herokuish" {

tests/unit/10_repo.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   deploy_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(repo) repo:gc, repo:purge-cache" {

tests/unit/10_tar.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 deploy_app_tar() {

tests/unit/20_build-env.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(build-env) special characters" {

tests/unit/20_config.bats

@@ -3,6 +3,7 @@
 load test_helper
 
 setup() {
+  global_setup
   [[ -f ${DOKKU_ROOT}/ENV ]] && mv -f ${DOKKU_ROOT}/ENV ${DOKKU_ROOT}/ENV.bak
   sudo -H -u dokku /bin/bash -c "echo 'export global_test=true' > ${DOKKU_ROOT}/ENV"
   create_app
@@ -14,6 +15,7 @@ teardown() {
   if [[ -f ${DOKKU_ROOT}/ENV.bak ]];then
     mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
   fi
+  global_teardown
 }
 
 @test "(config) config:set --global" {

tests/unit/20_docker-options.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(docker-options) docker-options:add (all phases)" {

tests/unit/20_domains.bats

@@ -3,6 +3,7 @@
 load test_helper
 
 setup() {
+  global_setup
   [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
   [[ -f "$DOKKU_ROOT/HOSTNAME" ]] && cp -fp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/HOSTNAME.bak"
   create_app
@@ -12,6 +13,7 @@ teardown() {
   destroy_app
   [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
   [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME" && chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
+  global_teardown
 }
 
 @test "(domains) domains" {
@@ -35,6 +37,10 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
+  run dokku domains:add $TEST_APP a--domain.with--hyphens
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
 }
 
 @test "(domains) domains:add (multiple)" {

tests/unit/20_nginx-vhosts_1.bats

@@ -4,6 +4,7 @@ load test_helper
 source "$PLUGIN_CORE_AVAILABLE_PATH/config/functions"
 
 setup() {
+  global_setup
   [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
   [[ -f "$DOKKU_ROOT/HOSTNAME" ]] && cp -fp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/HOSTNAME.bak"
 }
@@ -12,6 +13,7 @@ teardown() {
   destroy_app
   [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
   [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME" && chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
+  global_teardown
 }
 
 @test "(nginx-vhosts) nginx:build-config (domains:disable/enable)" {

tests/unit/20_storage.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(storage) storage:mount, storage:list, storage:umount" {

tests/unit/30_client.bats

@@ -3,6 +3,7 @@
 load test_helper
 
 setup() {
+  global_setup
   export DOKKU_HOST=dokku.me
   create_app
 }
@@ -10,6 +11,7 @@ setup() {
 teardown() {
   destroy_app
   unset DOKKU_HOST
+  global_teardown
 }
 
 @test "(client) unconfigured DOKKU_HOST" {

tests/unit/30_core_1.bats

@@ -3,6 +3,7 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
   DOCKERFILE="$BATS_TMPDIR/Dockerfile"
 }
@@ -12,6 +13,7 @@ teardown() {
   destroy_app
   dokku config:unset --global DOKKU_RM_CONTAINER
   rm -f "$DOCKERFILE"
+  global_teardown
 }
 
 assert_urls() {

tests/unit/30_events.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(events) check conffiles" {

tests/unit/30_ssh_keys.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   create_key
 }
 
 teardown() {
   destroy_key
+  global_teardown
 }
 
 @test "(ssh-keys) ssh-keys:add, ssh-keys:list, ssh-keys:remove" {

tests/unit/40_core_2.bats

@@ -3,12 +3,14 @@
 load test_helper
 
 setup() {
+  global_setup
   create_app
 }
 
 teardown() {
   rm -rf /home/dokku/$TEST_APP/tls
   destroy_app
+  global_teardown
 }
 
 assert_urls() {

tests/unit/40_nginx-vhosts_2.bats

@@ -4,6 +4,7 @@ load test_helper
 source "$PLUGIN_CORE_AVAILABLE_PATH/config/functions"
 
 setup() {
+  global_setup
   [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
   [[ -f "$DOKKU_ROOT/HOSTNAME" ]] && cp -fp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/HOSTNAME.bak"
   create_app
@@ -13,6 +14,7 @@ teardown() {
   destroy_app 0 $TEST_APP
   [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
   [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME" && chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
+  global_teardown
 }
 
 assert_access_log() {

tests/unit/40_plugin.bats

@@ -4,12 +4,17 @@ load test_helper
 TEST_PLUGIN_NAME=smoke-test-plugin
 TEST_PLUGIN_GIT_REPO=https://github.com/dokku/${TEST_PLUGIN_NAME}.git
 
+setup() {
+  global_setup
+}
+
 remove_test_plugin() {
   rm -rf $PLUGIN_ENABLED_PATH/$TEST_PLUGIN_NAME $PLUGIN_AVAILABLE_PATH/$TEST_PLUGIN_NAME
 }
 
 teardown() {
   remove_test_plugin || true
+  global_teardown
 }
 
 @test "(plugin) plugin:install, plugin:disable, plugin:update plugin:uninstall" {

tests/unit/40_proxy.bats

@@ -3,6 +3,7 @@
 load test_helper
 
 setup() {
+  global_setup
   [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -fp "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
   [[ -f "$DOKKU_ROOT/HOSTNAME" ]] && cp -fp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/HOSTNAME.bak"
   create_app
@@ -12,6 +13,7 @@ teardown() {
   destroy_app 0 $TEST_APP
   [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
   [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME" && chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
+  global_teardown
 }
 
 assert_nonssl_domain() {

tests/unit/40_tags.bats

@@ -3,11 +3,13 @@
 load test_helper
 
 setup() {
+  global_setup
   deploy_app
 }
 
 teardown() {
   destroy_app
+  global_teardown
 }
 
 @test "(tags) tags:create, tags, tags:destroy" {

tests/unit/test_helper.bash

@@ -11,6 +11,17 @@ PLUGIN_CORE_AVAILABLE_PATH=${PLUGIN_CORE_AVAILABLE_PATH:="$PLUGIN_CORE_PATH/avai
 CUSTOM_TEMPLATE_SSL_DOMAIN=customssltemplate.dokku.me
 UUID=$(tr -dc 'a-z0-9' < /dev/urandom | fold -w 32 | head -n 1)
 TEST_APP="rdmtestapp-${UUID}"
+SKIPPED_TEST_ERR_MSG="previous test failed! skipping remaining tests..."
+
+# global setup() and teardown()
+# skips remaining tests on first failure
+global_setup() {
+  [[ ! -f "${BATS_PARENT_TMPNAME}.skip" ]] || skip "$SKIPPED_TEST_ERR_MSG"
+}
+
+global_teardown() {
+  [[ -n "$BATS_TEST_COMPLETED" ]] || touch "${BATS_PARENT_TMPNAME}.skip"
+}
 
 # test functions
 flunk() {