Release 0.4.10

Merge pull request #1837 from dokku/mh-add-some-deploy-tests
add back some deploy tests that test dokku functionality
2016-01-07 01:14:09 -05:00 · 2016-01-06 21:27:50 -08:00 · 2016-01-06 20:53:08 -08:00 · 2016-01-06 16:51:04 -05:00 · 2016-01-06 13:34:09 -05:00 · 2016-01-06 08:11:50 -08:00
78 changed files with 1272 additions and 656 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ Dokku loves to welcome your contributions. There are several ways to help out:
 * Write test cases for open bug issues
 * Write patches for open bug/feature issues, preferably with test cases
  included
-* Contribute to the [documentation](http://progrium.viewdocs.io/dokku/)
+* Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)

 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.
@@ -41,7 +41,7 @@ encounter an issue. We always appreciate a well-written, thorough bug report,
 and will thank you for it!

 Sometimes dokku is missing a feature you need. In some cases, those features can
-be found in pre-existing [plugins](http://progrium.viewdocs.io/dokku/plugins/),
+be found in pre-existing [plugins](http://dokku.viewdocs.io/dokku/plugins/),
 and we encourage our users to create and contribute such packages. From time to
 time, we will also pull plugins into the dokku core when the task they solve is
 a common one for our users.
@@ -58,7 +58,7 @@ etc). Please include:
 * The output of `free -m`
 * The output of `docker version`.
 * The output of `docker -D info`.
-* The output of `docker run -ti gliderlabs/herokuish:latest herokuish version`
+* The output of `docker run --rm -ti gliderlabs/herokuish:latest herokuish version`
 * The output of `dokku version`.
 * The output of `dokku plugin`.

@@ -186,7 +186,7 @@ To run the shellcheck sniffs for Dokku coding standards:
    make ci-dependencies
    make lint

-The [testing docs](http://progrium.viewdocs.io/dokku/development/testing/)
+The [testing docs](http://dokku.viewdocs.io/dokku/development/testing/)
 contains installation info for bats and shellcheck.

 # Additional Resources
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,112 @@
 # History

+## 0.4.10
+
+This release is mostly a bugfix release, though we have a few important changes:
+
+- `dokku plugin:update` can now be used to update a specific plugin. Previously, this could potentially result in an error a user would have to manually resolve.
+- We have started labeling all dokku-managed containers. In a future minor release, triggering a `dokku cleanup` will remove *only* exited containers that are managed by dokku. This change allows users to start containers outside of dokku and be assured that dokku would not inadvertently remove them.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1818: @josegonzalez Fix pre-receive git-hook in apps:rename
+- #1819: @andrewsomething Write out /home/dokku/HOSTNAME as specified by the web installer.
+- #1823: @josegonzalez Fix output formatting of dokku apps
+- #1827: @michaelshobbs Use docker 1.9.0 on circleci
+- #1834: @jvanbaarsen Make sure we ignore hidden files in the SSL cert check
+- #1835: @josegonzalez Add support to herokuish for more versions of docker-engine
+- #1837: @michaelshobbs Add back some deploy tests that test dokku functionality
+
+### New Features
+
+- #1826: @michaelshobbs Implement plugn update
+- #1829: @michaelshobbs Implement dokku report command
+- #1828: @michaelshobbs Label all dokku-managed containers
+
+### Documentation
+
+- #1822: --no-restart option after config:set not before
+
+## 0.4.9
+
+This release is significant for two reasons:
+
+- A bugfix for git submodule support that was broken in 0.4.7
+- Improved and tested support for modern variants of Ubuntu/Debian. This should also improve support for docker-based deployments of dokku, as well as potential support for the upcoming Ubuntu 16.04 release.
+
+Thanks to all the contributors who helped with this release!
+
+### Bug Fixes
+
+- #1810: @josegonzalez Fix debian packaging for usage inside of docker containers
+- #1814: @blackxored Add support for new method of extracting container IP
+- #1807: @josegonzalez Allow updating submodules at any revision
+
+### New Features
+
+- #1812: @josegonzalez Fully-tested debian packaging for modern Ubuntu/Debian distributions
+
+### Documentation
+
+- #1811: @josegonzalez Add dokku haproxy to plugins
+
+## 0.4.8
+
+If upgrading to 0.4.8, please note that we have tightened the application naming schema, per docker requirements. Upgrade your dokku installation to 0.4.7 first to take advantage of the `dokku apps:rename` command if you are having issues with the new requirement.
+
+### Bug Fixes
+
+- #1804: @josegonzalez Fix deprecated version constraint usage in debian control file
+- #1798: @michaelshobbs Ensure app name begins with lowercase alphanumeric character
+- #1808: @josegonzalez Fix path to dokku-installer
+
+### New Features
+
+- #1801: @josegonzalez Allow setting DOKKU_LIB_ROOT env var to modify the lib path on install
+- #1803: @michaelshobbs update plugn download url and version
+
+### Documentation
+
+- #1809: @josegonzalez Remove non-zero downtime version of letsencrypt plugin
+
+## 0.4.7
+
+A few notable new features:
+
+- The new `dokku apps:rename` command. It does not update linked containers, but is useful in many other cases.
+- Updated git clone methodology to be more performant for large repositories.
+- Moved the dokku-installer from Ruby to Python, allowing us to drop Ruby as a dependency. Python comes with the linux standard base, and should therefore be accessible on more systems.
+
+### Bug Fixes
+
+- #1776: @t-8ch Fix docker version constraints on jessie systems
+- #1777: @michaelshobbs Format test labels
+- #1782: @michaelshobbs make docker cp work on circleci
+- #1788: @michaelshobbs Updates for moving of dokku sshcommand and plugn repos
+- #1791: @michaelshobbs Don't run app deploy tests and spread out unit tests to 4 containers
+- #1793: @michaelshobbs Filter out Procfile comments
+
+### New Features
+
+- #1670: @zachfeldman Add apps:rename
+- #1771: @jvanbaarsen Make plugin hooks send out more information
+- #1778: @mmerickel Optimize git clone for large repositories
+- #1781: @jvanbaarsen Add post config update hook
+- #1789: @lvillani Make it possible to skip a deploy
+- #1790: @michaelshobbs Use pgup/pgdown for history shortcut in dev env
+- #1794: @josegonzalez Replace dokku-installer.rb with dokku-installer.py
+- #1797: @michaelshobbs Ensure we run plugin commands as root
+- #1799: @josegonzalez Add support for tutum-agent as docker alternative
+- #1800: @josegonzalez Respect DOKKU_ROOT in debian/postint
+
+### Documentation
+
+- #1779: @sseemayer Add link to new zero-downtime Let's Encrypt Plugin to docs
+- #1780: @jvanbaarsen Add documentation for the new domain plugin hooks
+- #1784: @duboff Tiny fix in SSL documentation
+
 ## 0.4.6

 This is mostly a documentation change. A few notable changes:
@@ -12,32 +119,32 @@ Thanks to all the contributors who helped with this release!

 ### Bug Fixes

- #1775: @Flink Match complete container name in named-containers plugin
- #1767: @jvanbaarsen Remove shebang from config/functions
- #1745: @beverku Change herokuish to recommended package
+- #1717: @josegonzalez Avoid using the PPA for ubuntu versions 15.10 and higher
 - #1727: @louisbl Enable dokku-redeploy systemd service.
 - #1732: @michaelshobbs do not chown file that doesn't exist
- #1717: @josegonzalez Avoid using the PPA for ubuntu versions 15.10 and higher
+- #1745: @beverku Change herokuish to recommended package
+- #1767: @jvanbaarsen Remove shebang from config/functions
+- #1775: @Flink Match complete container name in named-containers plugin

 ### New Features

- #1735: @michaelshobbs use ps:restore on instance boot
 - #1718: @josegonzalez Add post-create hook
+- #1735: @michaelshobbs use ps:restore on instance boot

 ### Documentation

- #1761: @josegonzalez Fix link to docker-options documentation
- #1757: @josegonzalez Add DigitalOcean as a sponsor
- #1754: @josegonzalez Update all links to dokku repo
- #1753: @hhff Add .ca-bundle information to SSL docs
- #1752: @byrnedo Moved dokku-nats into official plugins section
- #1748: @byrnedo Added unofficial Nats plugin to plugins.md
- #1751: @josegonzalez Use flat-square style on image badges
- #1750: @jlachowski New graphite & statsd plugin with grafana frontend added
- #1747: @josegonzalez Add Lets Encrypt plugin
- #1739: @michaelshobbs clarify location of nginx.conf.template in app repo
- #1723: @josegonzalez Add herokuish version to desired debugging info
 - #1720: @josegonzalez Add memory usage output as desired data for reporting issues
+- #1723: @josegonzalez Add herokuish version to desired debugging info
+- #1739: @michaelshobbs clarify location of nginx.conf.template in app repo
+- #1747: @josegonzalez Add Lets Encrypt plugin
+- #1748: @byrnedo Added unofficial Nats plugin to plugins.md
+- #1750: @jlachowski New graphite & statsd plugin with grafana frontend added
+- #1751: @josegonzalez Use flat-square style on image badges
+- #1752: @byrnedo Moved dokku-nats into official plugins section
+- #1753: @hhff Add .ca-bundle information to SSL docs
+- #1754: @josegonzalez Update all links to dokku repo
+- #1757: @josegonzalez Add DigitalOcean as a sponsor
+- #1761: @josegonzalez Fix link to docker-options documentation

 ## 0.4.5

@@ -52,6 +159,7 @@ Thanks to all the contributors who helped with this release!

 - #1666: @michaelshobbs Revert dokku group changes and add dokku user to adm group
 - #1667: @u2mejc Fix dokku certs:add file input bug
+- #1682: @michaelshobbs Aet nullglob when looking for PORT files
 - #1684: @u2mejc Cause certs:remove to return non zero on error
 - #1690: @u2mejc Fix "App tls has not been deployed" error
 - #1696: @michaelshobbs chown plugins paths to dokku:dokku
@@ -66,7 +174,6 @@ Thanks to all the contributors who helped with this release!
 - #1709: @michaelshobbs Fix Must specify DOMAIN error over ssh
 - #1712: @michaelshobbs filter incompatible docker option when building dockerfile vs herokuish apps
 - #1715: @michaelshobbs use patched static buildpack in test
- @1682: @michaelshobbs Aet nullglob when looking for PORT files

 ### New Features

@@ -243,9 +350,9 @@ One new feature is colorized logging output, which should make it easier to debu

 This is our first minor release in almost a year. Many new features and removals have occurred, so here is a neat summary:

- Plugins are now triggered via `plugn`. Notably, you'll need add a `plugin.toml` to describe the plugin as well as use `plugn trigger` instead of `pluginhook` to trigger plugin callbacks. Please see the [plugin creation documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation/) for more details.
- A few new official plugins have been added to the core, including [image tagging](http://progrium.viewdocs.io/dokku/application-deployment/), [certificate management](http://progrium.viewdocs.io/dokku/deployment/ssl-configuration/), a tar-based deploy solution, and much more. Check out the *New Features* section for more details.
- We've removed a few deprecated plugin callbacks. Please see the [plugin triggers documentation](http://progrium.viewdocs.io/dokku/development/plugin-triggers/) to see what is available.
+- Plugins are now triggered via `plugn`. Notably, you'll need add a `plugin.toml` to describe the plugin as well as use `plugn trigger` instead of `pluginhook` to trigger plugin callbacks. Please see the [plugin creation documentation](http://dokku.viewdocs.io/dokku/development/plugin-creation/) for more details.
+- A few new official plugins have been added to the core, including [image tagging](http://dokku.viewdocs.io/dokku/application-deployment/), [certificate management](http://dokku.viewdocs.io/dokku/deployment/ssl-configuration/), a tar-based deploy solution, and much more. Check out the *New Features* section for more details.
+- We've removed a few deprecated plugin callbacks. Please see the [plugin triggers documentation](http://dokku.viewdocs.io/dokku/development/plugin-triggers/) to see what is available.
 - [Official datastorage plugins](https://github.com/dokku) have been created for the most commonly used datastores. If you previously used/maintained a community contributed plugin, please check these out. We'll be adding more official plugins as time goes on.

 Thanks to the *many* contributors for making this release our best release so far, and special thanks to both @michaelshobbs and @Flink for pushing along the `0.4.0` release!
@@ -354,7 +461,7 @@ This release is a bugfix release covering dokku packaging.

 ## 0.3.23

-This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://progrium.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!
+This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://dokku.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!

 ### Bug Fixes

--- a/16
+++ b/16
@@ -1,7 +1,7 @@
 DOKKU_VERSION = master

-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/progrium/sshcommand/master/sshcommand
-PLUGN_URL ?= https://github.com/dokku/dokku/releases/download/v0.4.0/plugn_0.2.0_linux_x86_64.tgz
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/master/sshcommand
+PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
 PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
 DOKKU_LIB_ROOT ?= /var/lib/dokku
@@ -38,7 +38,6 @@ package_cloud:
 	package_cloud push dokku/dokku/ubuntu/trusty herokuish*.deb
 	package_cloud push dokku/dokku/ubuntu/trusty sshcommand*.deb
 	package_cloud push dokku/dokku/ubuntu/trusty plugn*.deb
-	package_cloud push dokku/dokku/ubuntu/trusty rubygem*.deb
 	package_cloud push dokku/dokku/ubuntu/trusty dokku*.deb

 packer:
@@ -72,10 +71,10 @@ version:
 	git describe --tags > ~dokku/VERSION  2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION

 plugin-dependencies: plugn
-	dokku plugin:install-dependencies --core
+	sudo -E dokku plugin:install-dependencies --core

 plugins: plugn docker
-	dokku plugin:install --core
+	sudo -E dokku plugin:install --core

 dependencies: apt-update sshcommand plugn docker help2man man-db
 	$(MAKE) -e stack
@@ -140,12 +139,7 @@ count:
 	@find tests -type f -not -name .DS_Store | xargs cat | sed 's/^$$//g' | wc -l

 dokku-installer:
-	apt-get install -qq -y ruby
-	test -f /var/lib/dokku/.dokku-installer-created || gem install rack -v 1.5.2 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || gem install rack-protection -v 1.5.3 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || gem install sinatra -v 1.4.5 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || gem install tilt -v 1.4.1 --no-rdoc --no-ri
-	test -f /var/lib/dokku/.dokku-installer-created || ruby contrib/dokku-installer.rb onboot
+	test -f /var/lib/dokku/.dokku-installer-created || python contrib/dokku-installer.py onboot
 	test -f /var/lib/dokku/.dokku-installer-created || service dokku-installer start
 	test -f /var/lib/dokku/.dokku-installer-created || service nginx reload
 	test -f /var/lib/dokku/.dokku-installer-created || touch /var/lib/dokku/.dokku-installer-created
--- a/README.md
+++ b/README.md
@@ -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.githubusercontent.com/dokku/dokku/v0.4.6/bootstrap.sh
-    sudo DOKKU_TAG=v0.4.6 bash bootstrap.sh
+    wget https://raw.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh
+    sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh

 ### Upgrading

--- a/8
+++ b/8
@@ -40,6 +40,14 @@ Vagrant::configure("2") do |config|
    vm.vm.network :private_network, ip: DOKKU_IP
    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
    vm.vm.provision :shell, :inline => "cd /root/dokku && make dokku-installer"
+    vm.vm.provision :shell do |s|
+      s.inline = <<-EOT
+        echo '"\e[5~": history-search-backward' > /root/.inputrc
+        echo '"\e[6~": history-search-forward' >> /root/.inputrc
+        echo 'set show-all-if-ambiguous on' >> /root/.inputrc
+        echo 'set completion-ignore-case on' >> /root/.inputrc
+      EOT
+    end
  end

  # For windows users. Sharing folder from windows creates problem with sym links and so, sync the repo instead from GOS.
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -20,7 +20,7 @@ export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/dokku/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 ."
+  echo "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
  exit 1
 fi

@@ -29,6 +29,7 @@ hostname -f > /dev/null 2>&1 || {
  exit 1
 }

+echo "--> Ensuring we have the proper dependencies"
 apt-get update -qq > /dev/null
 [[ $(lsb_release -sr) == "12.04" ]] && apt-get install -qq -y python-software-properties

@@ -53,7 +54,7 @@ dokku_install_package() {
  echo "--> Installing docker"
  if uname -r | grep -q linode; then
    echo "--> NOTE: Using Linode? Docker might complain about missing AUFS support."
-    echo "    See http://progrium.viewdocs.io/dokku/getting-started/install/linode/"
+    echo "    See http://dokku.viewdocs.io/dokku/getting-started/install/linode/"
    echo "    Installation will continue in 10 seconds."
    sleep 10
  fi
@@ -90,14 +91,16 @@ elif [[ -n $DOKKU_TAG ]]; then
  elif [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
    export DOKKU_CHECKOUT="$DOKKU_SEMVER"
    dokku_install_package
-    dokku plugin:install-dependencies --core
+    echo "--> Running post-install dependency installation"
+    sudo -E dokku plugin:install-dependencies --core
  else
    export DOKKU_CHECKOUT="$DOKKU_TAG"
    dokku_install_source
  fi
 else
  dokku_install_package
-  dokku plugin:install-dependencies --core
+  echo "--> Running post-install dependency installation"
+  sudo -E dokku plugin:install-dependencies --core
 fi

 }
--- a/circle.yml
+++ b/circle.yml
@@ -1,4 +1,8 @@
 machine:
+  pre:
+    - echo 'DOCKER_OPTS="-s btrfs -e lxc -D --userland-proxy=false"' | sudo tee -a /etc/default/docker
+    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci-cp-workaround'
+    - sudo chmod 0755 /usr/bin/docker
  services:
    - docker
 dependencies:
@@ -10,4 +14,4 @@ dependencies:
    - sudo -E make -e lint
 test:
  override:
-    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 1800 }
+    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 3600 }
--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -0,0 +1,220 @@
+#!/usr/bin/env python2.7
+
+import cgi
+import json
+import os
+import SimpleHTTPServer
+import SocketServer
+import subprocess
+import sys
+import threading
+
+VERSION = 'v0.4.10'
+
+hostname = ''
+try:
+    command = "bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || wget -q -O - icanhazip.com'"
+    hostname = subprocess.check_output(command, shell=True)
+    if ':' in hostname:
+        hostname = ''
+except subprocess.CalledProcessError:
+    pass
+
+key_file = os.getenv('KEY_FILE', '/root/.ssh/authorized_keys')
+
+admin_keys = []
+if os.path.isfile(key_file):
+    try:
+        command = "cat {0}".format(key_file)
+        admin_keys = subprocess.check_output(command, shell=True).strip().split("\n")
+    except subprocess.CalledProcessError:
+        pass
+
+
+def check_boot():
+    if 'onboot' not in sys.argv:
+        return
+    init_dir = os.getenv('INIT_DIR', '/etc/init')
+    systemd_dir = os.getenv('SYSTEMD_DIR', '/etc/systemd/system')
+    nginx_dir = os.getenv('NGINX_DIR', '/etc/nginx/conf.d')
+
+    if os.path.exists(init_dir):
+        with open('{0}/dokku-installer.conf'.format(init_dir), 'w') as f:
+            f.write("start on runlevel [2345]\n")
+            f.write("exec {0} selfdestruct\n".format(os.path.abspath(__file__)))
+    if os.path.exists(systemd_dir):
+        with open('{0}/dokku-installer.service'.format(systemd_dir), 'w') as f:
+            f.write("[Unit]\n")
+            f.write("Description=Dokku web-installer\n")
+            f.write("\n")
+            f.write("[Service]\n")
+            f.write("ExecStart={0} selfdestruct\n".format(os.path.abspath(__file__)))
+            f.write("\n")
+            f.write("[Install]\n")
+            f.write("WantedBy=multi-user.target\n")
+            f.write("WantedBy=graphical.target\n")
+    if os.path.exists(nginx_dir):
+        with open('{0}/dokku-installer.conf'.format(nginx_dir), 'w') as f:
+            f.write("upstream dokku-installer { server 127.0.0.1:2000; }\n")
+            f.write("server {\n")
+            f.write("  listen      80;\n")
+            f.write("  location    / {\n")
+            f.write("    proxy_pass  http://dokku-installer;\n")
+            f.write("  }\n")
+            f.write("}\n")
+
+    subprocess.call('rm -f /etc/nginx/sites-enabled/*', shell=True)
+    sys.exit(0)
+
+
+class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+    def do_GET(self):
+        content = PAGE.replace('{VERSION}', VERSION)
+        content = content.replace('{HOSTNAME}', hostname)
+        content = content.replace('{ADMIN_KEYS}', "\n".join(admin_keys))
+        self.send_response(200)
+        self.end_headers()
+        self.wfile.write(content)
+
+    def do_POST(self):
+        if self.path not in ['/setup', '/setup/']:
+            return
+
+        params = cgi.FieldStorage(fp=self.rfile,
+                                  headers=self.headers,
+                                  environ={
+                                      'REQUEST_METHOD': 'POST',
+                                      'CONTENT_TYPE': self.headers['Content-Type']})
+
+        dokku_root = os.getenv('DOKKU_ROOT', '/home/dokku')
+        if 'vhost' in params and params['vhost'].value == 'true':
+            with open('{0}/VHOST'.format(dokku_root), 'w') as f:
+                f.write(params['hostname'].value)
+        else:
+            try:
+                os.remove('{0}/VHOST'.format(dokku_root))
+            except OSError:
+                pass
+        with open('{0}/HOSTNAME'.format(dokku_root), 'w') as f:
+            f.write(params['hostname'].value)
+
+
+        command = ['sshcommand', 'acl-add', 'dokku', 'admin']
+        for key in params['keys'].value.split("\n"):
+            proc = subprocess.Popen(command, stdin=subprocess.PIPE)
+            proc.stdin.write(key)
+            proc.stdin.close()
+            proc.wait()
+
+        if 'selfdestruct' in sys.argv:
+            DeleteInstallerThread()
+
+        self.send_response(200)
+        self.end_headers()
+        self.wfile.write(json.dumps({'status': 'ok'}))
+
+
+class DeleteInstallerThread(object):
+    def __init__(self, interval=1):
+        thread = threading.Thread(target=self.run, args=())
+        thread.daemon = True
+        thread.start()
+
+    def run(self):
+        command = "rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start"
+        try:
+            subprocess.call(command, shell=True)
+        except:
+            pass
+
+        command = "rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && stop dokku-installer"
+        try:
+            subprocess.call(command, shell=True)
+        except:
+            pass
+
+
+def main():
+    check_boot()
+
+    port = int(os.getenv('PORT', 2000))
+    httpd = SocketServer.TCPServer(("", port), GetHandler)
+    print "Listening on 0.0.0.0:{0}, CTRL+C to stop".format(port)
+    httpd.serve_forever()
+
+
+PAGE = """
+<html>
+<head>
+  <title>Dokku Setup</title>
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+</head>
+<body>
+  <div class="container" style="width: 640px;">
+  <form id="form" role="form">
+    <h1>Dokku Setup <small>{VERSION}</small></h1>
+    <div class="form-group">
+      <h3><small style="text-transform: uppercase;">Admin Access</small></h3>
+      <label for="key">Public Key</label><br />
+      <textarea class="form-control" name="keys" rows="7" id="key">{ADMIN_KEYS}</textarea>
+    </div>
+    <div class="form-group">
+      <h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
+      <div class="form-group">
+        <label for="hostname">Hostname</label>
+        <input class="form-control" type="text" id="hostname" name="hostname" value="{HOSTNAME}" />
+      </div>
+      <div class="checkbox">
+        <label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
+      </div>
+      <p>Your app URLs will look like:</p>
+      <pre id="example">http://hostname:port</pre>
+    </div>
+    <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
+  </form>
+  </div>
+  <div id="error-output"></div>
+  <script>
+    function setup() {
+      if ($.trim($("#key").val()) == "") {
+        alert("Your admin public key cannot be blank.")
+        return
+      }
+      if ($.trim($("#hostname").val()) == "") {
+        alert("Your hostname cannot be blank.")
+        return
+      }
+      data = $("#form").serialize()
+      $("input,textarea,button").prop("disabled", true);
+      $.post('/setup', data)
+        .done(function() {
+          $("#result").html("Success!")
+          window.location.href = "http://progrium.viewdocs.io/dokku/application-deployment";
+        })
+        .fail(function(data) {
+          $("#result").html("Something went wrong...")
+          $("#error-output").html(data.responseText)
+        });
+    }
+    function update() {
+      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
+        alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
+        $("#vhost").prop('checked', false);
+      }
+      if ($("#vhost").is(':checked')) {
+        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
+      } else {
+        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
+      }
+    }
+    $("#vhost").change(update);
+    $("#hostname").change(update);
+    update();
+  </script>
+</body>
+</html>
+"""
+
+if __name__ == "__main__":
+    main()
--- a/contrib/dokku-installer.rb
+++ b/contrib/dokku-installer.rb
@@ -1,136 +0,0 @@
-#!/usr/bin/env ruby
-require "sinatra"
-require "open3"
-
-if ARGV[0] == "onboot"
-  File.open("/etc/init/dokku-installer.conf", "w") do |f|
-    f.puts "start on runlevel [2345]"
-    f.puts "exec #{File.absolute_path(__FILE__)} selfdestruct"
-  end if File.directory?("/etc/init")
-  File.open("/etc/systemd/system/dokku-installer.service", "w") do |f|
-    f.puts "[Unit]"
-    f.puts "Description=Dokku web-installer"
-    f.puts ""
-    f.puts "[Service]"
-    f.puts "ExecStart=#{File.absolute_path(__FILE__)} selfdestruct"
-    f.puts ""
-    f.puts "[Install]"
-    f.puts "WantedBy=multi-user.target"
-    f.puts "WantedBy=graphical.target"
-  end if File.directory?("/etc/systemd/system")
-  File.open("/etc/nginx/conf.d/dokku-installer.conf", "w") do |f|
-    f.puts "upstream dokku-installer { server 127.0.0.1:2000; }"
-    f.puts "server {"
-      f.puts "  listen      80;"
-      f.puts "  location    / {"
-      f.puts "    proxy_pass  http://dokku-installer;"
-      f.puts "  }"
-    f.puts "}"
-  end
-  `rm -f /etc/nginx/sites-enabled/*`
-  puts "Installed Upstart service and default Nginx virtualhost for installer to run on boot."
-  exit
-end
-
-version   = "v0.4.6"
-dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
-admin_keys  = `cat /root/.ssh/authorized_keys`.split("\n")
-hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || wget -q -O - icanhazip.com'`.strip
-template  = DATA.read
-
-set :port, 2000
-set :environment, :production
-disable :protection
-
-get "/" do
-  ERB.new(template).result binding
-end
-
-post "/setup" do
-  if params[:vhost] == "true"
-    File.open("#{dokku_root}/VHOST", "w") {|f| f.write params[:hostname] }
-  else
-    `rm #{dokku_root}/VHOST`
-  end
-  File.open("#{dokku_root}/HOSTNAME", "w") {|f| f.write params[:hostname] }
-  keys = params[:keys].split("\n")
-  keys.each do |k|
-    Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => k)
-  end
-  Thread.new {
-    `rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start`
-    `rm -f /etc/init/dokku-installer.conf /etc/systemd/system/dokku-installer.service && stop dokku-installer`
-  }.run if ARGV[0] == "selfdestruct"
-end
-
-__END__
-<html>
-<head>
-  <title>Dokku Setup</title>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-</head>
-<body>
-  <div class="container" style="width: 640px;">
-  <form id="form" role="form">
-    <h1>Dokku Setup <small><%= version %></small></h1>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Admin Access</small></h3>
-      <label for="key">Public Key</label><br />
-      <textarea class="form-control" name="keys" rows="7" id="key"><% admin_keys.each do |key| %><%= key + "\n" %><% end %></textarea>
-    </div>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
-      <div class="form-group">
-        <label for="hostname">Hostname</label>
-        <input class="form-control" type="text" id="hostname" name="hostname" value="<%= hostname %>" />
-      </div>
-      <div class="checkbox">
-        <label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
-      </div>
-      <p>Your app URLs will look like:</p>
-      <pre id="example">http://hostname:port</pre>
-    </div>
-    <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
-  </form>
-  </div>
-  <div id="error-output"></div>
-  <script>
-    function setup() {
-      if ($.trim($("#key").val()) == "") {
-        alert("Your admin public key cannot be blank.")
-        return
-      }
-      if ($.trim($("#hostname").val()) == "") {
-        alert("Your hostname cannot be blank.")
-        return
-      }
-      data = $("#form").serialize()
-      $("input,textarea,button").prop("disabled", true);
-      $.post('/setup', data)
-        .done(function() {
-          $("#result").html("Success!")
-          window.location.href = "http://progrium.viewdocs.io/dokku/application-deployment";
-        })
-        .fail(function(data) {
-          $("#result").html("Something went wrong...")
-          $("#error-output").html(data.responseText)
-        });
-    }
-    function update() {
-      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
-        alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
-        $("#vhost").prop('checked', false);
-      }
-      if ($("#vhost").is(':checked')) {
-        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
-      } else {
-        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
-      }
-    }
-    $("#vhost").change(update);
-    $("#hostname").change(update);
-    update();
-  </script>
-</body>
-</html>
--- a/deb.mk
+++ b/deb.mk
@@ -1,6 +1,6 @@
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.3.5
+HEROKUISH_VERSION ?= 0.3.8
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb

@@ -9,24 +9,22 @@ DOKKU_REPO_NAME ?= dokku/dokku
 DOKKU_ARCHITECTURE = amd64

 PLUGN_DESCRIPTION = 'Hook system that lets users extend your application with plugins'
-PLUGN_REPO_NAME ?= progrium/plugn
-PLUGN_VERSION ?= 0.2.0
+PLUGN_REPO_NAME ?= dokku/plugn
+PLUGN_VERSION ?= 0.2.1
 PLUGN_ARCHITECTURE = amd64
 PLUGN_PACKAGE_NAME = plugn_$(PLUGN_VERSION)_$(PLUGN_ARCHITECTURE).deb

 SSHCOMMAND_DESCRIPTION = 'Turn SSH into a thin client specifically for your app'
-SSHCOMMAND_REPO_NAME ?= progrium/sshcommand
+SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
 SSHCOMMAND_VERSION ?= 0.1.0
 SSHCOMMAND_ARCHITECTURE = amd64
 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb

-GEM_ARCHITECTURE = amd64
-
 GOROOT = /usr/lib/go
 GOBIN = /usr/bin/go
 GOPATH = /home/vagrant/gocode

-.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-gems deb-plugn deb-setup deb-sshcommand
+.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-plugn deb-setup deb-sshcommand

 install-from-deb:
 	echo "--> Initial apt-get update"
@@ -42,7 +40,7 @@ install-from-deb:
 	sudo apt-get update -qq > /dev/null
 	sudo apt-get install dokku

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

@@ -77,7 +75,7 @@ deb-herokuish: deb-setup
 	cp -rf /tmp/tmp/herokuish /tmp/build/var/lib/herokuish

 	echo "-> Creating $(HEROKUISH_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine | docker-engine-cs' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' .
+	sudo fpm -t deb -s dir -C /tmp/build -n herokuish -v $(HEROKUISH_VERSION) -a $(HEROKUISH_ARCHITECTURE) -p $(HEROKUISH_PACKAGE_NAME) --deb-pre-depends 'docker-engine-cs | docker-engine | lxc-docker (>= 1.6.1) | docker.io (>= 1.6.1) | tutum-agent' --deb-pre-depends sudo --after-install /tmp/tmp/post-install --url "https://github.com/$(HEROKUISH_REPO_NAME)" --description $(HEROKUISH_DESCRIPTION) --license 'MIT License' .
 	mv *.deb /tmp

 deb-dokku: deb-setup
@@ -87,16 +85,19 @@ deb-dokku: deb-setup
 	cp -r debian /tmp/build/DEBIAN
 	mkdir -p /tmp/build/usr/local/bin
 	mkdir -p /tmp/build/var/lib/dokku/core-plugins/available
-	mkdir -p /tmp/build/usr/local/share/man/man1
-	mkdir -p /tmp/build/usr/local/share/dokku/contrib
+	mkdir -p /tmp/build/usr/share/man/man1
+	mkdir -p /tmp/build/usr/share/dokku/contrib
+	mkdir -p /tmp/build/usr/share/doc/dokku

 	cp dokku /tmp/build/usr/local/bin
+	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
 	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
 	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
 	$(MAKE) help2man
 	$(MAKE) addman
-	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/local/share/man/man1/dokku.1
-	cp contrib/dokku-installer.rb /tmp/build/usr/local/share/dokku/contrib
+	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
+	gzip -9 /tmp/build/usr/share/man/man1/dokku.1
+	cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
 	git describe --tags > /tmp/build/var/lib/dokku/VERSION
 	cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
 	git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
@@ -104,18 +105,6 @@ deb-dokku: deb-setup
 	dpkg-deb --build /tmp/build "/vagrant/dokku_`cat /tmp/build/var/lib/dokku/STABLE_VERSION`_$(DOKKU_ARCHITECTURE).deb"
 	mv *.deb /tmp

-deb-gems: deb-setup
-	rm -rf /tmp/tmp /tmp/build rubygem-*.deb
-	mkdir -p /tmp/tmp /tmp/build
-
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp rack -v 1.5.2 > /dev/null
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp rack-protection -v 1.5.3 > /dev/null
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp sinatra -v 1.4.5 > /dev/null
-	gem install --quiet --no-verbose --no-ri --no-rdoc --install-dir /tmp/tmp tilt -v 1.4.1 > /dev/null
-
-	find /tmp/tmp/cache -name '*.gem' | xargs -rn1 fpm -d ruby -d ruby --prefix /var/lib/gems/1.9.1 -s gem -t deb -a $(GEM_ARCHITECTURE)
-	mv *.deb /tmp
-
 deb-plugn: deb-setup
 	rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME)
 	mkdir -p /tmp/tmp /tmp/build
@@ -129,10 +118,10 @@ deb-plugn: deb-setup
 	sudo apt-get clean
 	sudo apt-get update -qq > /dev/null
 	sudo apt-get install -qq -y git golang mercurial > /dev/null 2>&1
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && go get github.com/progrium/plugn
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && make deps
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && rm plugn && go build -o plugn
-	mv /home/vagrant/gocode/src/github.com/progrium/plugn/plugn /tmp/build/usr/local/bin/plugn
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && go get github.com/dokku/plugn
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/dokku/plugn && make deps
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/dokku/plugn && rm plugn && go build -o plugn
+	mv /home/vagrant/gocode/src/github.com/dokku/plugn/plugn /tmp/build/usr/local/bin/plugn

 	echo "-> Creating $(PLUGN_PACKAGE_NAME)"
 	sudo fpm -t deb -s dir -C /tmp/build -n plugn -v $(PLUGN_VERSION) -a $(PLUGN_ARCHITECTURE) -p $(PLUGN_PACKAGE_NAME) --url "https://github.com/$(PLUGN_REPO_NAME)" --description $(PLUGN_DESCRIPTION) --license 'MIT License' .
--- a/debian/conffiles
+++ b/debian/conffiles
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,11 @@
 Package: dokku
-Version: 0.4.6
+Version: 0.4.10
 Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, gcc, man-db, sshcommand, docker-engine-cs | docker-engine | lxc-docker (>= 1.6.2) | docker.io (>= 1.6.2), software-properties-common, python-software-properties
+Depends: locales, git, make, curl, gcc, man-db, sshcommand, docker-engine-cs | docker-engine | lxc-docker (>= 1.6.1) | docker.io (>= 1.6.1) | tutum-agent, software-properties-common, python-software-properties
 Recommends: herokuish
-Pre-Depends: nginx (>= 1.4.6), dnsutils, apparmor, cgroupfs-mount | cgroup-lite, plugn, sudo, ruby, ruby-dev, rubygem-rack , rubygem-rack-protection, rubygem-sinatra, rubygem-tilt
+Pre-Depends: nginx (>= 1.4.6), dnsutils, apparmor, cgroupfs-mount | cgroup-lite, plugn, sudo, python2.7, debconf
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
-Description: Docker powered mini-Heroku in around 100 lines of Bash
+Description: Docker-powered PaaS that helps build and manage the lifecycle of applications
+
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,9 +1,10 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -eo pipefail; [[ $TRACE ]] && set -x

 . /usr/share/debconf/confmodule

 readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
+readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"

 case "$1" in
  abort-upgrade|abort-remove|abort-deconfigure)
@@ -17,44 +18,58 @@ case "$1" in
    egrep -i "^docker" /etc/group || groupadd docker
    usermod -aG docker dokku

-    # setup plugin directories
+    echo "Setting up plugin directories"
    # should be replaced by `plugn init`
-    mkdir -p /var/lib/dokku/core-plugins/available /var/lib/dokku/plugins/available
-    mkdir -p /var/lib/dokku/core-plugins/enabled /var/lib/dokku/plugins/enabled
-    touch /var/lib/dokku/core-plugins/config.toml /var/lib/dokku/plugins/config.toml
+    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/available ${DOKKU_LIB_ROOT}/plugins/available
+    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/enabled ${DOKKU_LIB_ROOT}/plugins/enabled
+    touch ${DOKKU_LIB_ROOT}/core-plugins/config.toml ${DOKKU_LIB_ROOT}/plugins/config.toml

-    # migrate old plugins
-    find /var/lib/dokku/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    echo "Migrating old plugins"
+    find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
      if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
        continue
-      elif [ -f /var/lib/dokku/plugins/$plugin/.core ]; then
-        rm -rf /var/lib/dokku/plugins/$plugin
-      elif [ ! -d /var/lib/dokku/plugins/available/$plugin ]; then
-        mv /var/lib/dokku/plugins/$plugin /var/lib/dokku/plugins/available;
+      elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
+        rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
+      elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available;
      fi
    done

-    # enable all core plugins
-    find /var/lib/dokku/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
-      if [ ! -d /var/lib/dokku/plugins/available/$plugin ]; then
-        ln -s /var/lib/dokku/core-plugins/available/$plugin /var/lib/dokku/plugins/available/$plugin;
-        PLUGIN_PATH=/var/lib/dokku/core-plugins plugn enable $plugin
-        PLUGIN_PATH=/var/lib/dokku/plugins plugn enable $plugin
+    echo "Enabling all core plugins"
+    find ${DOKKU_LIB_ROOT}/core-plugins/available -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+      if [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+        ln -s ${DOKKU_LIB_ROOT}/core-plugins/available/$plugin ${DOKKU_LIB_ROOT}/plugins/available/$plugin;
+        PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn enable $plugin
+        PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn enable $plugin
      fi
    done
-    chown dokku:dokku -R /var/lib/dokku/plugins /var/lib/dokku/core-plugins
+    chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins

+    echo "Install all core plugins"
    dokku plugin:install --core

-    rm -f /home/dokku/VERSION
-    cp /var/lib/dokku/STABLE_VERSION /home/dokku/VERSION
+    rm -f ${DOKKU_ROOT}/VERSION
+    cp ${DOKKU_LIB_ROOT}/STABLE_VERSION ${DOKKU_ROOT}/VERSION

-    if [ -f /etc/init/dokku-installer.conf ] && service dokku-installer status 2> /dev/null | grep waiting; then
-        sudo service dokku-installer start
+    if [[ -f /etc/nginx/conf.d/dokku-installer.conf ]]; then
+      echo "Setting up dokku-installer"
+      /usr/share/dokku/contrib/dokku-installer.py onboot
+
+      if command -v systemctl &>/dev/null; then
+        echo "Enabling dokku-installer"
+        systemctl enable dokku-installer
+      fi
+
+      installer_status="$(service dokku-installer status 2> /dev/null || true)"
+      if echo $installer_status | grep -Eq "(inactive|waiting)" > /dev/null; then
+        echo "Starting dokku-installer"
+        service dokku-installer start || echo "Unable to start dokku-installer"
+      fi
    fi

    db_get "dokku/web_config"
    if [ "$RET" = "true" ]; then
+      db_stop
      exit 0
    fi

@@ -83,4 +98,5 @@ case "$1" in
    ;;
 esac

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

 . /usr/share/debconf/confmodule

@@ -7,14 +7,8 @@ case "$1" in
  install)
    db_get "dokku/web_config"
    if [ "$RET" = "true" ]; then
-      INIT_CONF="/etc/init/dokku-installer.conf"
      NGINX_CONF="/etc/nginx/conf.d/dokku-installer.conf"

-      rm -f $INIT_CONF
-      touch $INIT_CONF
-      echo 'start on runlevel [2345]' >> $INIT_CONF
-      echo 'exec /usr/local/share/dokku/contrib/dokku-installer.rb selfdestruct' >> $INIT_CONF
-
      rm -f $NGINX_CONF
      touch $NGINX_CONF

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

 Template: dokku/vhost_enable
-Description: Use vhost based deployments?
+Description: Enable vhost-based deployments?
 Type: boolean
 Default: false

 Template: dokku/hostname
-Description: Machine's hostname or IP
+Description: Hostname or IP for server:
 Type: string
 Default: dokku.me

 Template: dokku/key_file
-Description: Keyfile for initial user
+Description: Keyfile for initial user:
 Type: string
 Default: /root/.ssh/id_rsa.pub
--- a/docs/application-deployment.md
+++ b/docs/application-deployment.md
@@ -100,6 +100,18 @@ This will prompt you to verify the application's name before destroying it. You
 dokku --force apps:destroy APP
 ```

+### Renaming a deployed app
+
+> New as of 0.4.7
+
+You can rename a deployed app using the `apps:rename` CLI tool:
+
+```shell
+dokku apps:rename OLD_NAME NEW_NAME
+```
+
+This will copy all of your app's contents into a new app directory with the name of your choice, delete your old app, then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved.
+
 ### Adding deploy users

 While it is possible to use password-based authorization to push to Dokku, it is preferable to use key-based authentication for security. You can add your public key to the dokku user's `authorized_keys` file with the following command:
@@ -116,6 +128,14 @@ Dokku only supports deploying from its master branch, so if you'd like to deploy

 You can also support pushing multiple branches using the [receive-branch](/dokku/development/plugin-triggers/#receive-branch) plugin trigger in a custom plugin.

+### Skipping deployment
+
+If you only want to rebuild and tag a container, you can skip the deployment phase by setting `$DOKKU_SKIP_DEPLOY` to `true` by running:
+
+``` shell
+dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
+```
+
 ### Deploying with private git submodules

 Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add github.com (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly.
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
  <msapplication>
    <tile>
-      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-310x150.png"/>
      <TileColor>#da532c</TileColor>
    </tile>
  </msapplication>
--- a/docs/assets/favicons/manifest.json
+++ b/docs/assets/favicons/manifest.json
@@ -2,37 +2,37 @@
    "name": "Dokku",
    "icons": [
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.6\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.6\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.6\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.6\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.6\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.6\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.4.10\/docs\/assets\/favicons\/android-chrome-192x192.png",
            "sizes": "192x192",
            "type": "image\/png",
            "density": "4.0"
--- a/docs/assets/style.css
+++ b/docs/assets/style.css
@@ -25,7 +25,7 @@ h1 {
  padding: 0 0 0 1em;
 }
 .header a {
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/dokku.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/dokku.png);
  color: #fff;
  text-indent: 40px;
  background-position: center left;
@@ -40,7 +40,7 @@ h1 {
 .blurb {
  color: #424242;
  background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/components.md
+++ b/docs/components.md
@@ -2,7 +2,7 @@

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

 Looking to keep codebase as simple and hackable as possible, so try to keep your line count down.
--- a/docs/configuration-management.md
+++ b/docs/configuration-management.md
@@ -30,7 +30,7 @@ dokku config:set node-js-app KEY=\"VAL\ WITH\ SPACES\"
 When setting or unsetting environment variables, you may wish to avoid an application restart. This is useful when developing plugins or when setting multiple environment variables in a scripted manner. To do so, use the `--no-restart` flag:

 ```shell
-dokku --no-restart config:set node-js-app ENV=prod
+dokku config:set --no-restart node-js-app ENV=prod
 ```

 If you wish to have the variables output in an `eval`-compatible form, you can use the `--export` flag:
--- a/docs/deployment/images.md
+++ b/docs/deployment/images.md
@@ -33,7 +33,7 @@ root@dokku:~# dokku tags:deploy node-js-app v0.9.0
 -----> Deploying node-js-app (dokku/node-js-app:v0.9.0)...
 -----> Running pre-flight checks
       For more efficient zero downtime deployments, create a file CHECKS.
-       See http://progrium.viewdocs.io/dokku/checks-examples.md for examples
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
       CHECKS file not found in container: Running simple container check...
 -----> Waiting for 10 seconds ...
 -----> Default container check successful!
--- a/docs/deployment/ssl-configuration.md
+++ b/docs/deployment/ssl-configuration.md
@@ -26,7 +26,7 @@ The `certs:add` command can be used to push a `tar` containing a certificate `.c
 ```shell
 tar cvf cert-key.tar server.crt server.key
 # replace APP with the name of your application
-dokku certs:add < cert-key.tar
+dokku certs:add <app> < cert-key.tar
 ```

 > Note: If your `.crt` file came alongside a `.ca-bundle`, you'll want to concatenate those into a single `.crt` file before adding it to the `.tar`.
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -3,9 +3,9 @@
 If you create your own plugin:

 1. Take a look at the plugins shipped with dokku and hack away!
-2. Check out the [list of triggers](http://progrium.viewdocs.io/dokku/development/plugin-triggers) your plugin can implement.
+2. Check out the [list of triggers](http://dokku.viewdocs.io/dokku/development/plugin-triggers) your plugin can implement.
 3. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
-4. Edit [this page](http://progrium.viewdocs.io/dokku/plugins) and add a link to it.
+4. Edit [this page](http://dokku.viewdocs.io/dokku/plugins) and add a link to it.
 5. Subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases

 ### Sample plugin
@@ -89,4 +89,5 @@ A few notes:
  dokku config:unset --no-restart APP KEY1 [KEY2 ...]
  ```
 - From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](http://progrium.viewdocs.io/dokku/development/plugin-triggers) doc for examples.
+- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](http://dokku.viewdocs.io/dokku/development/plugin-triggers) doc for examples.
+- As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup`. If manually calling `docker run`, include `$DOKKU_GLOBAL_RUN_ARGS`. This will ensure you intermediate containers labeled correctly.
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1,6 +1,6 @@
 # Plugin triggers

-[Plugin triggers](https://github.com/progrium/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing dokku infrastructure. You can use them to modify the output of various dokku commands or override internal configuration.
+[Plugin triggers](https://github.com/dokku/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing dokku infrastructure. You can use them to modify the output of various dokku commands or override internal configuration.

 Plugin triggers are simply scripts that are executed by the system. You can use any language you want, so long as the script:

@@ -263,7 +263,7 @@ CMD="cat > gm && \
  dpkg -s graphicsmagick > /dev/null 2>&1 || \
  (apt-get update && apt-get install -y graphicsmagick && apt-get clean)"

-ID=$(docker run -i -a stdin $IMAGE /bin/bash -c "$CMD")
+ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
 test $(docker wait $ID) -eq 0
 docker commit $ID $IMAGE > /dev/null
 ```
@@ -290,7 +290,7 @@ CMD="cat > gm && \
  dpkg -s CONTAINER_PACKAGE > /dev/null 2>&1 || \
  (apt-get update && apt-get install -y CONTAINER_PACKAGE && apt-get clean)"

-ID=$(docker run -i -a stdin $IMAGE /bin/bash -c "$CMD")
+ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
 test $(docker wait $ID) -eq 0
 docker commit $ID $IMAGE > /dev/null
 ```
@@ -374,7 +374,7 @@ APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 verify_app_name "$APP"

 dokku_log_info1 "Running gulp"
-id=$(docker run -d $IMAGE /bin/bash -c "cd /app && gulp default")
+id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $IMAGE /bin/bash -c "cd /app && gulp default")
 test $(docker wait $id) -eq 0
 docker commit $id $IMAGE > /dev/null
 dokku_log_info1 "Building UI Complete"
@@ -435,7 +435,7 @@ APP="$1"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"; IMAGE=$(get_app_image_name $AP
 verify_app_name "$APP"

 if [[ -d $GULP_CACHE_DIR ]]; then
-  docker run --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+  docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
 fi
 ```

@@ -546,9 +546,9 @@ echo false

 ### `post-domains-update`

- Description: Allows you to run commands once the domain for an application has been updated.
+- Description: Allows you to run commands once the domain for an application has been updated. It also sends in the command that has been used. This can be "add", "clear" or "remove". The third argument will be the optional list of domains
 - Invoked by: `dokku domains:add`, `dokku domains:clear`, `dokku domains:remove`
- Arguments: `$APP`
+- Arguments: `$APP` `action name` `domains`
 - Example:

 ```shell
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -4,7 +4,7 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas

 To propose a release, the following tasks need to be performed:

- The installable version must be changed in the `contrib/dokku-installer.rb` file.
+- The installable version must be changed in the `contrib/dokku-installer.py` file.
 - The installable version must be changed in the `debian/control` file.
 - The installable version must be changed in the `docs/home.html` file
 - The installable version must be changed in the `docs/index.md` file
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -14,7 +14,7 @@ Example apps can be found here:

 ### Executing tests locally

- Setup dokku in a [vagrant vm](http://progrium.viewdocs.io/dokku/getting-started/install/vagrant)
+- Setup dokku in a [vagrant vm](http://dokku.viewdocs.io/dokku/getting-started/install/vagrant)
 - Test setup and execution

  ```shell
@@ -22,15 +22,15 @@ Example apps can be found here:
  $ sudo su -
  $ cd ~/dokku
  $ make ci-dependencies setup-deploy-tests
-  $ make test  # run the entire test suite (linter, bats tests, and app deployment tests)
+  $ make test  # execute the entire test suite (linter, bats tests, and app deployment tests)
  $
-  $ make lint  # linter
-  $ make unit-tests  # bats tests
-  $ make deploy-tests  # app deployment tests
+  $ make lint copyfiles # run linter & update vagrant dokku install from local git clone
+  $ make unit-tests  # execute all bats tests
+  $ make deploy-tests  # execute all app deployment tests
  ```
 - Additionally you may run a specific app deployment tests with a target similar to:

  ```shell
-  make deploy-test-nodejs-express
+  $ make deploy-test-nodejs-express
  ```
 - For a full list of test make targets check out `tests.mk` in the root of the dokku repository.
--- a/docs/getting-started/install/linode.md
+++ b/docs/getting-started/install/linode.md
@@ -36,4 +36,4 @@ __Warning__: These steps will delete *everything* on your Linode.

 9. Lastly, reboot the Linode.

-Once your server comes back online, you'll be running Ubuntu's default kernel. You can now follow Dokku's [normal installation instructions](http://progrium.viewdocs.io/dokku/installation) and `bootstrap.sh` will take care of everything else.
+Once your server comes back online, you'll be running Ubuntu's default kernel. You can now follow Dokku's [normal installation instructions](http://dokku.viewdocs.io/dokku/installation) and `bootstrap.sh` will take care of everything else.
--- a/docs/getting-started/where-to-get-help.md
+++ b/docs/getting-started/where-to-get-help.md
@@ -4,7 +4,7 @@ If you’re stuck, there are a number of places you can get help:

 ## The Official Dokku Website

-[http://progrium.viewdocs.io/dokku](http://progrium.viewdocs.io/dokku)
+[http://dokku.viewdocs.io/dokku](http://dokku.viewdocs.io/dokku)

 The Official Dokku website is always a great place to visit. It features links to oft-used developer tools, community plugins, and guides on using dokku.

--- a/docs/home.html
+++ b/docs/home.html
@@ -10,26 +10,26 @@
    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
    <title>Dokku - The smallest PaaS implementation you've ever seen</title>

-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/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.4.6/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
@@ -87,12 +87,12 @@
          <p class="line">
            <span class="path">~</span>
            <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.6/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path">~</span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.4.6 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>
--- a/docs/index.md
+++ b/docs/index.md
@@ -15,12 +15,12 @@
      <p class="line">
        <span class="path">~</span>
        <span class="prompt">$</span>
-        <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.6/bootstrap.sh</span>
+        <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh</span>
      </p>
      <p class="line">
        <span class="path">~</span>
        <span class="prompt">$</span>
-        <span class="command">sudo DOKKU_TAG=v0.4.6 bash bootstrap.sh</span>
+        <span class="command">sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh</span>
      </p>
      <p class="line">
        <span class="output"># =&gt; Go to your server's IP and follow the web installer</span>
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -19,8 +19,8 @@ To install the latest stable version of dokku, you can run the following shell c

 ```shell
 # installs dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.4.6/bootstrap.sh
-sudo DOKKU_TAG=v0.4.6 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.4.10/bootstrap.sh
+sudo DOKKU_TAG=v0.4.10 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
@@ -33,17 +33,17 @@ Once you save your settings, the web admin will self-terminate and you should be

 For various reasons, certain hosting providers may have other steps that should be preferred to the above. If hosted on any of the following popular hosts, please follow the linked to instructions:

- [Digital Ocean Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/digitalocean)
- [Linode Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/linode/)
- [Microsoft Azure Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/azure/)
+- [Digital Ocean Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/digitalocean)
+- [Linode Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/linode/)
+- [Microsoft Azure Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/azure/)

 As well, you may wish to customize your installation in some other fashion. or experiment with vagrant. The guides below should get you started:

- [Debian Package Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/debian)
- [Vagrant Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/vagrant)
- [Advanced Install Customization](http://progrium.viewdocs.io/dokku/advanced-installation)
+- [Debian Package Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/debian)
+- [Vagrant Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/vagrant)
+- [Advanced Install Customization](http://dokku.viewdocs.io/dokku/advanced-installation)

 ---

 - <sup>[1]: To check whether your system has an fqdn set, run `sudo hostname -f`</sup>
- <sup>[2]: If your system has less than 1GB of memory, you can use ([this workaround](http://progrium.viewdocs.io/dokku/advanced-installation)).</sup>
+- <sup>[2]: If your system has less than 1GB of memory, you can use ([this workaround](http://dokku.viewdocs.io/dokku/advanced-installation)).</sup>
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -1,6 +1,6 @@
 # Plugins

-Dokku itself is built out of plugins and uses [plugn](https://github.com/progrium/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.
+Dokku itself is built out of plugins and uses [plugn](https://github.com/dokku/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.

 Let's take a quick look at the current dokku nginx plugin that's shipped with dokku by default.

@@ -16,7 +16,7 @@ Let's take a quick look at the current dokku nginx plugin that's shipped with do
 # This command requires `root` permissions as the `install` and `install-dependencies`
 # plugin triggers may utilize commands such as `apt-get`. For non-core plugins, please
 # inspect those plugins before running the following command as `root` user.
-sudo dokku plugin:install <git_url>
+sudo dokku plugin:install <git_url> [--committish tag/branch/commit|--name custom-plugin-name]

 # previous versions (0.3.x and below) of dokku require a manual process to install plugins
 cd /var/lib/dokku/plugins
@@ -26,7 +26,7 @@ dokku plugins-install

 ## Creating your own plugin

-[See the full documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation).
+[See the full documentation](http://dokku.viewdocs.io/dokku/development/plugin-creation).

 ## Official Plugins (Beta)

@@ -54,39 +54,48 @@ The following plugins are available and provided by dokku maintainers. Where not

 Note: The following plugins have been supplied by our community and may not have been tested by dokku maintainers.

-[agco-adm]: https://github.com/agco-adm
+[256dpi]: https://github.com/256dpi
+[abossard]: https://github.com/dudagroup
 [ademuk]: https://github.com/ademuk
+[agco-adm]: https://github.com/agco-adm
 [alessio]: https://github.com/alessio
 [alex-sherwin]: https://github.com/alex-sherwin
 [alexanderbeletsky]: https://github.com/alexanderbeletsky
+[alexkruegger]: https://github.com/alexkruegger
 [Aomitayo]: https://github.com/Aomitayo
 [apmorton]: https://github.com/apmorton
+[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
 [blag]: https://github.com/blag
 [cameron-martin]: https://github.com/cameron-martin
 [cedricziel]: https://github.com/cedricziel
 [cef]: https://github.com/cef
 [cjblomqvist]: https://github.com/cjblomqvist
 [darkpixel]: https://github.com/darkpixel
+[dokku]: https://github.com/dokku
 [dyson]: https://github.com/dyson
 [F4-Group]: https://github.com/F4-Group
 [fermuch]: https://github.com/fermuch
 [fgrehm]: https://github.com/fgrehm
+[Flink]: https://github.com/Flink
 [gdi2290]: https://github.com/gdi2290
 [heichblatt]: https://github.com/heichblatt
 [hughfletcher]: https://github.com/hughfletcher
 [ignlg]: https://github.com/ignlg
 [iskandar]: https://github.com/iskandar
+[jagandecapri]: https://github.com/jagandecapri
 [jeffutter]: https://github.com/jeffutter
 [jlachowski]: https://github.com/jlachowski
-[krisrang]: https://github.com/krisrang
 [Kloadut]: https://github.com/Kloadut
+[krisrang]: https://github.com/krisrang
 [luxifer]: https://github.com/luxifer
-[mlebkowski]: https://github.com/mlebkowski
+[Maciej Łebkowski]: https://github.com/mlebkowski
 [matto1990]: https://github.com/matto1990
 [mbriskar]: https://github.com/mbriskar
 [michaelshobbs]: https://github.com/michaelshobbs
 [mikecsh]: https://github.com/mikecsh
 [mikexstudios]: https://github.com/mikexstudios
+[mixxorz]: https://github.com/mixxorz
+[mlebkowski]: https://github.com/mlebkowski
 [motin]: https://github.com/motin
 [musicglue]: https://github.com/musicglue
 [neam]: https://github.com/neam
@@ -96,26 +105,19 @@ Note: The following plugins have been supplied by our community and may not have
 [pauldub]: https://github.com/pauldub
 [pnegahdar]: https://github.com/pnegahdar
 [RaceHub]: https://github.com/racehub
+[ribot]: https://github.com/ribot
 [rlaneve]: https://github.com/rlaneve
 [robv]: https://github.com/robv
 [scottatron]: https://github.com/scottatron
 [sehrope]: https://github.com/sehrope
+[sekjun9878]: https://github.com/sekjun9878
+[sgulseth]: https://github.com/sgulseth
+[sseemayer]: https://github.com/sseemayer
 [statianzo]: https://github.com/statianzo
 [stuartpb]: https://github.com/stuartpb
 [thrashr888]: https://github.com/thrashr888
 [wmluke]: https://github.com/wmluke
 [Zenedith]: https://github.com/Zenedith
-[sekjun9878]: https://github.com/sekjun9878
-[Flink]: https://github.com/Flink
-[ribot]: https://github.com/ribot
-[Benjamin-Dobell]: https://github.com/Benjamin-Dobell
-[jagandecapri]: https://github.com/jagandecapri
-[mixxorz]: https://github.com/mixxorz
-[Maciej Łebkowski]: https://github.com/mlebkowski
-[abossard]: https://github.com/dudagroup
-[alexkruegger]: https://github.com/alexkruegger
-[dokku]: https://github.com/dokku
-[sgulseth]: https://github.com/sgulseth

 ### Datastores

@@ -174,15 +176,16 @@ Note: The following plugins have been supplied by our community and may not have
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [App name as env](https://github.com/cjblomqvist/dokku-app-name-env)                              | [cjblomqvist][]       | 0.3.x                 |
 | [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [heichblatt][]        |                       |
-| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]            | Compatible with 0.3.17+ |
+| [Dokku Copy App Config Files](https://github.com/alexkruegger/dokku-app-configfiles)              | [alexkruegger][]      | Compatible with 0.3.17+ |
 | [Dokku Copy App Config Files](https://github.com/heichblatt/dokku-supply-config)                  | [heichblatt][]        |                       |
 | [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | dokku >= [c77cbf1][]  |
 | [Dokku Registry](https://github.com/agco-adm/dokku-registry)<sup>1</sup>                          | [agco-adm][]          | 0.4.0+                |
 | [git rev-parse HEAD in env](https://github.com/cjblomqvist/dokku-git-rev)                         | [cjblomqvist][]       | 0.4.0+                |
-| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.3.14+                 |
+| [Graduate (Environment Management)](https://github.com/glassechidna/dokku-graduate)               | [Benjamin-Dobell][]   | 0.3.14+               |
+| [Haproxy tcp load balancer](https://github.com/256dpi/dokku-haproxy)                              | [256dpi][]            | 0.4.0+                |
 | [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | 0.4.0+                |
 | [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     | 0.4.0+                |
-| [Lets Encrypt](https://github.com/sgulseth/dokku-letsencrypt)                                     | [sgulseth][]          | 0.4.0+                |
+| [Lets Encrypt](https://github.com/sseemayer/dokku-letsencrypt)                                    | [sseemayer][]         | 0.4.0+                |
 | [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][]        |                       |
@@ -222,7 +225,7 @@ Note: The following plugins have been supplied by our community and may not have
 | [Slack Notifications](https://github.com/ribot/dokku-slack)                                       | [ribot][]             | 0.4.0+                |
 | [User ACL](https://github.com/mlebkowski/dokku-acl)                                               | [Maciej Łebkowski][]  | 0.4.0+                |
 | [Webhooks](https://github.com/nickstenning/dokku-webhooks)                                        | [nickstenning][]      |                       |
-| [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                        | [mbriskar][]      |                       |
+| [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          |                       |
 | [Wordpress](https://github.com/dudagroup/dokku-wordpress-template)                                | [abossard][]          | Dokku dev, mariadb, volume, domains |

 <sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.
@@ -234,18 +237,18 @@ The following plugins have been removed as their functionality is now in Dokku C
 | Plugin                                                                                            | Author                | In Dokku Since                  |
 | ------------------------------------------------------------------------------------------------- | --------------------- | ------------------------------- |
 | [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | v0.3.10 (domains plugin)        |
-| [Debug](https://github.com/heichblatt/dokku-debug)                                                | [heichblatt][]         | v0.3.9 (trace command)          |
+| [Debug](https://github.com/heichblatt/dokku-debug)                                                | [heichblatt][]        | v0.3.9 (trace command)          |
 | [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | v0.3.17 (docker-options plugin) |
 | [Events Logger](https://github.com/alessio/dokku-events)                                          | [alessio][]           | v0.3.21 (events plugin)         |
 | [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | v0.3.17 (docker-options plugin) |
-| [List Containers](https://github.com/heichblatt/dokku-list)                                       | [heichblatt][]         | v0.3.14 (ps plugin              |
+| [List Containers](https://github.com/heichblatt/dokku-list)                                       | [heichblatt][]        | v0.3.14 (ps plugin              |
 | [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | v0.3.17 (docker-options plugin) |
 | [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>1</sup>                    | [wmluke][]            | v0.3.10 (domains plugin)        |
 | [Named-containers](https://github.com/Flink/dokku-named-containers)                               | [Flink][]             | v0.4.2 (named-containers plugin) |
 | [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | v0.3.10 (domains plugin)        |
 | [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | v0.3.17 (docker-options plugin) |
 | [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         | v0.3.0 (zero downtime deploys)  |
-| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]         | v0.3.14 (ps plugin)             |
+| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | v0.3.14 (ps plugin)             |
 | [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)<sup>2</sup>    | [cameron-martin][]    | v0.3.9 (build-env plugin)       |
 | [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>2</sup>               | [musicglue][]         | v0.3.9 (build-env plugin)       |
 | [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>2</sup>                   | [motin][]             | v0.3.9 (build-env plugin)       |
@@ -264,11 +267,11 @@ The following plugins are no longer maintained by their developers.
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [app-url](https://github.com/mikecsh/dokku-app-url)                                               | [mikecsh][]           | Works with 0.2.0      |
-| [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [Flink][]             | 0.4.0+ |
+| [CouchDB (multi containers)](https://github.com/Flink/dokku-couchdb-multi-containers)             | [Flink][]             | 0.4.0+                |
 | [CouchDB](https://github.com/racehub/dokku-couchdb-plugin)                                        | [RaceHub][]           | Compatible with 0.2.0 |
 | [Elasticsearch](https://github.com/robv/dokku-elasticsearch)                                      | [robv][]              | Not compatible with >= 0.3.0 (still uses /home/git) |
 | [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup>                   | [blag][]              | Compatible with 0.2.0 |
-| [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [Flink][]             | 0.4.0+ |
+| [Memcached](https://github.com/Flink/dokku-memcached-plugin)                                      | [Flink][]             | 0.4.0+                |
 | [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin)                   | [jeffutter][]         |                       |
 | [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin)                                       | [hughfletcher][]      |                       |
 | [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin)                                           | [Aomitayo][]          |                       |
--- a/docs/template.html
+++ b/docs/template.html
@@ -10,30 +10,30 @@
    <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.4.6/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/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.4.6/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.4.6/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.rawgit.com/dokku/dokku/v0.4.10/docs/assets/style.css" rel="stylesheet">
    <style>
    </style>
  </head>
@@ -43,7 +43,7 @@
        <div class="row">
          <div class="col-md-offset-2">
            <h1 class="heading navbar-brand">
-              <a href="http://progrium.viewdocs.io/dokku/">Dokku</a>
+              <a href="http://dokku.viewdocs.io/dokku/">Dokku</a>
            </h1>
          </div>
        </div>
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -1,6 +1,6 @@
 # Upgrading

-This document covers upgrades for the 0.3.0 series and up. If upgrading from older versions, we recommend [a fresh install](http://progrium.viewdocs.io/dokku/installation) on a new server.
+This document covers upgrades for the 0.3.0 series and up. If upgrading from older versions, we recommend [a fresh install](http://dokku.viewdocs.io/dokku/installation) on a new server.

 > As of 0.3.18, dokku is installed by default via a debian package. Source-based installations are still available, though not recommended.

--- a/22
+++ b/22
@@ -29,6 +29,9 @@ export DOKKU_VALID_EXIT=0
 export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
 export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}

+export DOKKU_CONTAINER_LABEL=dokku
+export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL"
+
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"

 [[ -f $DOKKU_ROOT/dokkurc ]] && source $DOKKU_ROOT/dokkurc
@@ -49,12 +52,16 @@ if [[ "${args[0]}" =~ ^--.* ]]; then
 fi
 ! has_tty && DOKKU_QUIET_OUTPUT=1

-if [[ $(id -un) != "dokku" && $1 != plugin:*install* && $1 != "plugin:update" ]]; then
+if [[ $(id -un) != "dokku" ]] && [[ ! $1 =~ plugin:* ]]; then
  export SSH_USER=$(id -un)
  sudo -u dokku -E -H $0 "$@"
  exit $?
 fi

+if [[ $(id -un) != "root" && $1 =~ plugin:.* ]]; then
+  dokku_log_fail "plugin:* commands must be run as root"
+fi
+
 if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
  export -n SSH_ORIGINAL_COMMAND
  if [[ $1 =~ config-* ]] || [[ $1 =~ docker-options* ]]; then
@@ -104,6 +111,7 @@ case "$1" in
    DOKKU_DEFAULT_DOCKER_ARGS=$(: | plugn trigger docker-args-deploy $APP $IMAGE_TAG)

    while read -r line || [[ -n "$line" ]]; do
+      [[ "$line" =~ ^#.* ]] && continue
      TRIM=${line%#*}
      PROC_TYPE=${TRIM%%=*}
      PROC_COUNT=${TRIM#*=}
@@ -131,15 +139,19 @@ case "$1" in
        if [[ "$PROC_TYPE" == "web" ]]; then
          port=${DOKKU_DOCKERFILE_PORT:=5000}
          if [[ "$BIND_EXTERNAL" = "true" ]]; then
-            id=$(docker run -d -p $port -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
+            id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -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)
+            id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
+            ipaddr=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $id)
+            # Docker < 1.9 compatibility
+            if [[ -z $ipaddr ]]; then
+              ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $id)
+            fi
          fi
        else
-          id=$(docker run -d $DOCKER_ARGS $IMAGE $START_CMD)
+          id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $DOCKER_ARGS $IMAGE $START_CMD)
        fi

        # if we can't post-deploy successfully, kill new container
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-[[ " build release trace delete ls run url urls version help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
+[[ " build release trace delete ls run url urls report version help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
@@ -17,7 +17,7 @@ case "$1" in

    case "$IMAGE_SOURCE_TYPE" in
      herokuish)
-        id=$(tar -c . | docker run -i -a stdin $DOKKU_IMAGE /bin/bash -c "mkdir -p /app && tar -xC /app")
+        id=$(tar -c . | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $DOKKU_IMAGE /bin/bash -c "mkdir -p /app && tar -xC /app")
        test "$(docker wait $id)" -eq 0
        docker commit $id $IMAGE > /dev/null
        [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR
@@ -25,7 +25,7 @@ case "$1" in

        DOCKER_ARGS=$(: | plugn trigger docker-args-build $APP $IMAGE_SOURCE_TYPE)
        [[ "$DOKKU_TRACE" ]] && DOCKER_ARGS+=" -e TRACE=true "
-        id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
+        id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
        docker attach $id
        test "$(docker wait $id)" -eq 0
        docker commit $id $IMAGE > /dev/null
@@ -60,12 +60,12 @@ case "$1" in
      herokuish)
        plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
        if [[ -n $(config_export global) ]]; then
-          id=$(config_export global | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
+          id=$(config_export global | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh")
          test "$(docker wait $id)" -eq 0
          docker commit $id $IMAGE > /dev/null
        fi
        if [[ -n $(config_export app $APP) ]]; then
-          id=$(config_export app $APP | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
+          id=$(config_export app $APP | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh")
          test "$(docker wait $id)" -eq 0
          docker commit $id $IMAGE > /dev/null
        fi
@@ -144,7 +144,7 @@ case "$1" in
    has_tty && DOKKU_RUN_OPTS+=" -i -t"
    is_image_herokuish_based "$IMAGE" && EXEC_CMD="/exec"

-    docker run $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
+    docker run $DOKKU_GLOBAL_RUN_ARGS $DOKKU_RUN_OPTS $DOCKER_ARGS $IMAGE $EXEC_CMD "$@"
    ;;

  url | urls)
@@ -191,6 +191,21 @@ case "$1" in
    fi
  ;;

+  report)
+    dokku_log_info1 "uname: $(uname -a)"
+    dokku_log_info1 "memory: "
+    free -m
+    dokku_log_info1 "docker version: "
+    docker version
+    dokku_log_info1 "docker daemon info: "
+    docker -D info
+    dokku_log_info1 "herokuish version: "
+    docker run --rm -ti gliderlabs/herokuish:latest herokuish version
+    dokku_log_info1 "dokku version: $(dokku version)"
+    dokku_log_info1 "dokku plugins: "
+    dokku plugin
+    ;;
+
  version)
    cat "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
    ;;
--- a/plugins/00_dokku-standard/install
+++ b/plugins/00_dokku-standard/install
@@ -11,9 +11,8 @@ fi

 # temporary hack for https://github.com/dokku/dokku/issues/82
 # redeploys all apps after a reboot
-case "$DOKKU_DISTRO" in
-  ubuntu)
-    cat<<EOF > /etc/init/dokku-redeploy.conf
+if [[ $(/sbin/init --version 2> /dev/null) =~ upstart ]]; then
+  cat<<EOF > /etc/init/dokku-redeploy.conf
 description "Dokku app redeploy service"

 start on filesystem and started docker
@@ -23,10 +22,10 @@ script
  sudo -i -u dokku /usr/local/bin/dokku ps:restore
 end script
 EOF
-    ;;
+fi

-  debian|opensuse)
-    cat<<EOF > /etc/systemd/system/dokku-redeploy.service
+if [[ $(systemctl 2> /dev/null) =~ -\.mount ]]; then
+  cat<<EOF > /etc/systemd/system/dokku-redeploy.service
 [Unit]
 Description=Dokku app redeploy service
 After=docker.target
@@ -39,9 +38,10 @@ ExecStart=/usr/local/bin/dokku ps:restore
 [Install]
 WantedBy=multi-user.target
 EOF
+  if command -v systemctl &>/dev/null; then
    systemctl enable dokku-redeploy
-    ;;
-esac
+  fi
+fi

 mkdir -p /etc/update-motd.d
 cat<<EOF > /etc/update-motd.d/99-dokku
--- a/plugins/apps/commands
+++ b/plugins/apps/commands
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-[[ " apps apps:create apps:destroy help apps:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
+[[ " apps apps:create apps:rename apps:destroy help apps:help " == *" $1 "* ]] || exit $DOKKU_NOT_IMPLEMENTED_EXIT
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/apps/functions"
@@ -7,13 +7,34 @@ source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 case "$1" in
  apps)
    dokku_log_info2_quiet "My Apps"
-    find $DOKKU_ROOT -follow -maxdepth 1 -type d  \( ! -iname ".*" \)  -not -path $DOKKU_ROOT/tls | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2 | sort
+    for app in $(dokku_apps); do
+      echo "$app"
+    done
    ;;

  apps:create)
    apps_create $2
    ;;

+  apps:rename)
+    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
+    [[ -d "$DOKKU_ROOT/$3" ]] && dokku_log_fail "Name is already taken"
+    OLD_APP="$2"
+    NEW_APP="$3"
+
+    mkdir -p "$DOKKU_ROOT/$NEW_APP"
+    docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$DOKKU_ROOT/$OLD_APP/cache:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
+    rm -rf "$DOKKU_ROOT/$OLD_APP/cache"
+    cp -a "$DOKKU_ROOT/$OLD_APP/." "$DOKKU_ROOT/$NEW_APP"
+    dokku apps:destroy $OLD_APP --force
+    sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/URLS"
+    sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/VHOST"
+    sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
+    dokku ps:rebuild $NEW_APP
+    plugn trigger post-app-rename $OLD_APP $NEW_APP
+    echo "Renaming $OLD_APP to $NEW_APP... done"
+    ;;
+
  apps:destroy)
    [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
    [[ "$2" == "tls" ]] && dokku_log_fail "Unable to destroy tls directory"
@@ -52,6 +73,7 @@ case "$1" in
    apps, List your apps
    apps:create <app>, Create a new app
    apps:destroy <app>, Permanently destroy an app
+    apps:rename <old-app> <new-app>, Rename an app
 EOF
    ;;

--- a/plugins/apps/functions
+++ b/plugins/apps/functions
@@ -4,6 +4,7 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"

 apps_create() {
  [[ -z $1 ]] && dokku_log_fail "Please specify an app to run the command on"
+  [[ ! "$1" =~ ^[a-z].* && ! "$1" =~ ^[0-9].* ]] && dokku_log_fail "App name must begin with lowercase alphanumeric character"
  [[ -d "$DOKKU_ROOT/$1" ]] && dokku_log_fail "Name is already taken"
  local APP="$1"

--- a/plugins/apps/pre-delete
+++ b/plugins/apps/pre-delete
@@ -6,5 +6,5 @@ APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG); CACHE_DIR
 verify_app_name "$APP"

 if [[ -d $CACHE_DIR ]]; then
-  docker run --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+  docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
 fi
--- a/plugins/build-env/pre-build-buildpack
+++ b/plugins/build-env/pre-build-buildpack
@@ -24,12 +24,12 @@ if [[ ! -z "$BUILD_ENV" ]]; then
  dokku_log_info1 "Adding BUILD_ENV to build environment..."
  # create build env files for use in buildpacks like this:
  # https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
-  id=$(echo $BUILD_ENV |sed -e 's@export @@g' -e 's@\\n@ @g' | docker run -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in $(cat); do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \\\"\2\\\" >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
+  id=$(echo $BUILD_ENV |sed -e 's@export @@g' -e 's@\\n@ @g' | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in $(cat); do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \\\"\2\\\" >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
  test "$(docker wait $id)" -eq 0
  docker commit $id $IMAGE > /dev/null

  # create build env for 'old style' buildpacks and dokku plugins
-  id=$(echo -e "$BUILD_ENV" | docker run -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
+  id=$(echo -e "$BUILD_ENV" | docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "cat >> /app/.env")
  test "$(docker wait $id)" -eq 0
  docker commit $id $IMAGE > /dev/null
 fi
--- a/plugins/certs/commands
+++ b/plugins/certs/commands
@@ -39,7 +39,7 @@ certs_set() {
    cd $TEMP_DIR
    tar xvf - <&0

-    CRT_FILE_SEARCH=$(find . -type f -name "*.crt")
+    CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name "*.crt")
    CRT_FILE_COUNT=$(printf "%s" "$CRT_FILE_SEARCH" | grep -c '^')
    if [[ $CRT_FILE_COUNT -lt 1 ]]; then
      dokku_log_fail "Tar archive is missing .crt file"
@@ -49,7 +49,7 @@ certs_set() {
      CRT_FILE=$CRT_FILE_SEARCH
    fi

-    KEY_FILE_SEARCH=$(find . -type f -name "*.key")
+    KEY_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name "*.key")
    KEY_FILE_COUNT=$(printf "%s" "$KEY_FILE_SEARCH" | grep -c '^')
    if [[ $KEY_FILE_COUNT -lt 1 ]]; then
      dokku_log_fail "Tar archive is missing .key file"
--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -85,7 +85,7 @@ if [[ ! -s "${TMPDIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]];
    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 "See http://dokku.viewdocs.io/dokku/checks-examples.md for examples"
  dokku_log_verbose "CHECKS file not found in container: Running simple container check..."

  rm -rf $TMPDIR
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -10,7 +10,7 @@ has_tty() {
 }

 dokku_apps() {
-  local INSTALLED_APPS=$(find $DOKKU_ROOT -maxdepth 1 -mindepth 1 -type d ! -name 'tls' ! -name '.*' -printf "%f\n") || (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" | sort) || (dokku_log_fail "You haven't deployed any applications yet")
  [[ $INSTALLED_APPS ]] && echo $INSTALLED_APPS
 }

@@ -121,6 +121,10 @@ dokku_container_log_verbose_quiet() {
 verify_app_name() {
  local APP="$1"
  [[ ! -n "$APP" ]] && dokku_log_fail "(verify_app_name) APP must not be null"
+  if [[ ! "$APP" =~ ^[a-z].* && ! "$APP" =~ ^[0-9].* ]]; then
+    [[ -d "$DOKKU_ROOT/$APP" ]] && rm -rf "$DOKKU_ROOT/$APP"
+    dokku_log_fail "App name must begin with lowercase alphanumeric character"
+  fi
  [[ ! -d "$DOKKU_ROOT/$APP" ]] && dokku_log_fail "App $APP does not exist"

  return 0
@@ -170,7 +174,7 @@ get_running_image_tag() {
 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/sh" $DOCKER_ARGS "$@" -c "test -f /exec"
+  docker run $DOKKU_GLOBAL_RUN_ARGS --entrypoint="/bin/sh" $DOCKER_ARGS "$@" -c "test -f /exec"
 }

 is_number() {
@@ -207,7 +211,7 @@ copy_from_image() {
  verify_app_name $APP

  if verify_image "$IMAGE"; then
-    CID=$(docker run -d $IMAGE bash)
+    CID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $IMAGE bash)
    docker cp "$CID:$SRC_FILE" "$DST_DIR"
    docker rm -f "$CID" &> /dev/null
  else
@@ -316,12 +320,23 @@ release_and_deploy() {
      IMAGE_SOURCE_TYPE="dockerfile"
    fi

+    DOKKU_APP_SKIP_DEPLOY="$(dokku config:get $APP DOKKU_SKIP_DEPLOY || true)"
+    DOKKU_GLOBAL_SKIP_DEPLOY="$(dokku config:get --global DOKKU_SKIP_DEPLOY || true)"
+
+    DOKKU_SKIP_DEPLOY=${DOKKU_APP_SKIP_DEPLOY:="$DOKKU_GLOBAL_SKIP_DEPLOY"}
+
    dokku_log_info1 "Releasing $APP ($IMAGE)..."
    dokku release "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG"
-    dokku_log_info1 "Deploying $APP ($IMAGE)..."
-    dokku deploy "$APP" "$IMAGE_TAG"
-    dokku_log_info2 "Application deployed:"
-    dokku urls $APP | sed "s/^/       /"
+
+    if [[ "$DOKKU_SKIP_DEPLOY" != "true" ]]; then
+      dokku_log_info1 "Deploying $APP ($IMAGE)..."
+      dokku deploy "$APP" "$IMAGE_TAG"
+      dokku_log_info2 "Application deployed:"
+      dokku urls $APP | sed "s/^/       /"
+    else
+      dokku_log_info1 "Skipping deployment"
+    fi
+
    echo
  fi
 }
--- a/plugins/config/functions
+++ b/plugins/config/functions
@@ -187,6 +187,7 @@ ${var}"
    config_styled_hash "$ENV_ADD" "       "

    config_write "$ENV_TEMP"
+    plugn trigger post-config-update $APP "set" "$@"
  fi

  if [[ "$DOKKU_CONFIG_RESTART" == "true" ]]; then
@@ -218,6 +219,8 @@ config_unset() {
    [[ "$var" == "NO_VHOST" ]] && config_set --no-restart $APP NO_VHOST=0 && DOKKU_CONFIG_RESTART=true
  done

+  plugn trigger post-config-update $APP "unset" "$@"
+
  if [[ "$DOKKU_CONFIG_RESTART" == "true" ]]; then
    dokku_log_info1 "Restarting app $APP"
    dokku ps:restart $APP
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -75,7 +75,7 @@ case "$1" in
    for DOMAIN in "$@"; do
      echo "$DOMAIN" >> "$DOKKU_ROOT/$APP/VHOST"
    done
-    plugn trigger post-domains-update $APP
+    plugn trigger post-domains-update $APP "add" "$@"
    for DOMAIN in "$@"; do
      dokku_log_info1 "Added $DOMAIN to $APP"
    done
@@ -89,7 +89,7 @@ case "$1" in

    rm -f "$DOKKU_ROOT/$APP/VHOST"
    dokku domains:setup $APP
-    plugn trigger post-domains-update $APP
+    plugn trigger post-domains-update $APP "clear"
    dokku_log_info1 "Cleared domains in $APP"

    ;;
@@ -110,7 +110,7 @@ case "$1" in
    for DOMAIN in "$@"; do
      sed -i "/^$DOMAIN$/d" "$DOKKU_ROOT/$APP/VHOST"
    done
-    plugn trigger post-domains-update $APP
+    plugn trigger post-domains-update $APP "remove" "$@"
    for DOMAIN in "$@"; do
      dokku_log_info1 "Removed $DOMAIN from $APP"
    done
--- a/plugins/git/commands
+++ b/plugins/git/commands
@@ -11,15 +11,24 @@ git_build_app_repo() {
  TMP_WORK_DIR=$(mktemp -d)
  trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN

-  # git clone
+
+  # git clone - this method creates a new git repository and adds the primary
+  #             repo as a remote, then does a fetch depth=1 to avoid cloning
+  #             the entire repo
+  TMP_TAG="dokku/$REV"
  chmod 755 $TMP_WORK_DIR
  unset GIT_DIR GIT_WORK_TREE
  pushd $TMP_WORK_DIR > /dev/null
  [[ ! -d "$DOKKU_ROOT/$APP" ]] && apps_create $APP
-  git clone -q "$DOKKU_ROOT/$APP" "$TMP_WORK_DIR" &> /dev/null
+  GIT_DIR="$DOKKU_ROOT/$APP" git tag -d "$TMP_TAG" &> /dev/null || true
+  GIT_DIR="$DOKKU_ROOT/$APP" git tag "$TMP_TAG" "$REV" &> /dev/null
+  git init &> /dev/null
  git config advice.detachedHead false
-  git checkout "$REV" &> /dev/null
+  git remote add origin "$DOKKU_ROOT/$APP" &> /dev/null
+  git fetch --depth=1 origin "refs/tags/$TMP_TAG" &> /dev/null
+  git reset --hard FETCH_HEAD &> /dev/null
  git submodule update --init --recursive &> /dev/null
+  GIT_DIR="$DOKKU_ROOT/$APP" git tag -d "$TMP_TAG" &> /dev/null || true
  find -name .git -prune -exec rm -rf {} \; > /dev/null

  if [[ -f Dockerfile ]] && [[ "$([[ -f .env ]] && grep -q BUILDPACK_URL .env; echo $?)" != "0" ]] && [[ ! -f ".buildpacks" ]]; then
--- a/plugins/plugin/commands
+++ b/plugins/plugin/commands
@@ -16,8 +16,8 @@ case "$1" in
        PLUGIN_PATH="$PLUGIN_CORE_PATH" plugn trigger install
        ;;
      https:*|git:*|ssh:*)
-        PLUGIN_GIT_URL="$2"
-        download_and_enable_plugin "$PLUGIN_GIT_URL" "$3"
+        shift
+        download_and_enable_plugin "$@"
        plugn trigger install
        ;;
      *)
@@ -34,16 +34,12 @@ case "$1" in
    ;;

  plugin:update)
-    case "$2" in
-      https:*|git:*)
-        PLUGIN_GIT_URL="$2"
-        download_and_enable_plugin "$PLUGIN_GIT_URL" "$3"
-        plugn trigger update
-        ;;
-      *)
-        plugn trigger update
-        ;;
-    esac
+    if [[ -n "$2" ]]; then
+      PLUGIN="$2"
+      PLUGIN_COMMITTISH="$3"
+      plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
+    fi
+    plugn trigger update
    ;;

  plugin:disable)
@@ -67,9 +63,9 @@ case "$1" in
  help | plugin:help)
    cat<<EOF
    plugin, Print active plugins
-    plugin:install [--core|git-url], Optionally download git-url & run install trigger for active plugins (or only core ones)
+    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:update [git-url], Optionally download git-url & run update trigger for active plugins
+    plugin:update [name [committish]], Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
    plugin:enable <name>, Enable a previously disabled plugin
    plugin:disable <name>, Disable an installed plugin (third-party only)
    plugin:uninstall <name>, Uninstall a plugin (third-party only)
--- a/plugins/plugin/functions
+++ b/plugins/plugin/functions
@@ -27,18 +27,44 @@ download_plugin() {

 download_and_enable_plugin() {
  local PLUGIN_GIT_URL="$1"
-  local CUSTOM_NAME="$2"
+  shift
+  while getopts ":-:" opt "$@"; do
+    case "$opt" in
+      -)
+        case "$OPTARG" in
+          committish)
+            val="${!OPTIND}"; OPTIND=$(( OPTIND + 1 ))
+            local PLUGIN_COMMITTISH="$val"
+            ;;
+          name)
+            val="${!OPTIND}"; OPTIND=$(( OPTIND + 1 ))
+            local CUSTOM_NAME="$val"
+            ;;
+        esac
+        ;;
+    esac
+  done
  local PLUGIN_NAME=${CUSTOM_NAME:-$(plugin_name "$PLUGIN_GIT_URL")}
  dokku_log_info1_quiet "Cloning plugin repo $PLUGIN_GIT_URL to $PLUGIN_AVAILABLE_PATH/$PLUGIN_NAME"
  download_plugin "$PLUGIN_GIT_URL" "$PLUGIN_NAME"
  enable_plugin "$PLUGIN_NAME"
+  if [[ -n "$PLUGIN_COMMITTISH" ]];then
+    update_plugin "$PLUGIN_NAME" "$PLUGIN_COMMITTISH"
+  fi
+}
+
+update_plugin() {
+  local PLUGIN="$1"
+  local PLUGIN_COMMITTISH="$2"
+  [[ ! -e $PLUGIN_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Plugin ($PLUGIN) is not currently installed"
+  plugn update "$@"
 }

 uninstall_plugin() {
-  local PLUGIN_NAME="$1"
+  local PLUGIN="$1"
  [[ -e $PLUGIN_CORE_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Cannot uninstall a core plugin"
-  [[ ! -e $PLUGIN_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Plugin does not exist"
-  plugn uninstall $PLUGIN_NAME
+  [[ ! -e $PLUGIN_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Plugin ($PLUGIN) is not currently installed"
+  plugn uninstall $PLUGIN
  dokku_log_info1_quiet "Plugin $PLUGIN uninstalled"
 }

--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -26,11 +26,11 @@ generate_scale_file() {
      echo "web=1" >> $DOKKU_SCALE_FILE
    else
      while read -r line || [[ -n "$line" ]]; do
-        [[ -z "$line" ]] && continue
+        [[ "$line" =~ ^#.* ]] && continue
        NAME=${line%%:*}
        NUM_PROCS=0
        [[ "$NAME" == "web" ]] && NUM_PROCS=1
-        echo "$NAME=$NUM_PROCS" >> $DOKKU_SCALE_FILE
+        [[ -n "$NAME" ]] && echo "$NAME=$NUM_PROCS" >> $DOKKU_SCALE_FILE
      done < "$PROCFILE"
    fi
    dokku_log_info1_quiet "New DOKKU_SCALE file generated"
--- a/tests/apps/multi/Gemfile
+++ b/tests/apps/multi/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"

-ruby '1.9.3'
+ruby '2.2.4'

 gem 'compass', ">= 1.0.1"
 gem 'sass-globbing'
--- a/tests/apps/nodejs-express/Procfile
+++ b/tests/apps/nodejs-express/Procfile
@@ -1,3 +1,52 @@
+###############################
+#         DEVELOPMENT         #
+###############################
+
+# Procfile for development using the new threaded worker (scheduler, twitter stream and delayed job)
 cron: node worker.js
 web: node web.js
 worker: node worker.js
+
+
+# Old version with separate processes (use this if you have issues with the threaded version)
+# web: bundle exec rails server
+# schedule: bundle exec rails runner bin/schedule.rb
+# twitter: bundle exec rails runner bin/twitter_stream.rb
+# dj: bundle exec script/delayed_job run
+
+###############################
+#         PRODUCTION          #
+###############################
+
+# You need to copy or link config/unicorn.rb.example to config/unicorn.rb for both production versions.
+# Have a look at the deployment guides, if you want to set up huginn on your server:
+# https://github.com/cantino/huginn/doc
+
+# Using the threaded worker (consumes less RAM but can run slower)
+# web: bundle exec unicorn -c config/unicorn.rb
+# jobs: bundle exec rails runner bin/threaded.rb
+
+# Old version with separate processes (use this if you have issues with the threaded version)
+# web: bundle exec unicorn -c config/unicorn.rb
+# schedule: bundle exec rails runner bin/schedule.rb
+# twitter: bundle exec rails runner bin/twitter_stream.rb
+# dj: bundle exec script/delayed_job run
+
+###############################
+# Multiple DelayedJob workers #
+###############################
+# Per default Huginn can just run one agent at a time. Using a lot of agents or calling slow
+# external services frequently might require more DelayedJob workers (an indicator for this is
+# a backlog in your 'Job Management' page).
+# Every uncommented line starts an additional DelayedJob worker. This works for development, production
+# and for the threaded and separate worker processes. Keep in mind one worker needs about 300MB of RAM.
+#
+#dj2: bundle exec script/delayed_job -i 2 run
+#dj3: bundle exec script/delayed_job -i 3 run
+#dj4: bundle exec script/delayed_job -i 4 run
+#dj5: bundle exec script/delayed_job -i 5 run
+#dj6: bundle exec script/delayed_job -i 6 run
+#dj7: bundle exec script/delayed_job -i 7 run
+#dj8: bundle exec script/delayed_job -i 8 run
+#dj9: bundle exec script/delayed_job -i 9 run
+#dj10: bundle exec script/delayed_job -i 10 run
--- a/tests/ci/parallel_runner.sh
+++ b/tests/ci/parallel_runner.sh
@@ -4,6 +4,7 @@ set -eo pipefail

 MODE="$1"; MODE=${MODE:="testing"}

+# shellcheck disable=SC2120
 setup_circle() {
  echo "=====> setup_circle on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
  sudo -E CI=true make -e sshcommand
@@ -18,39 +19,45 @@ setup_circle() {
  sudo -E CI=true make -e install
  sudo -E make -e setup-deploy-tests
  make -e ci-dependencies
+  docker version
 }

 if [[ -n "$CIRCLE_NODE_INDEX" ]] && [[ "$MODE" == "setup" ]]; then
-  case "$CIRCLE_NODE_INDEX" in
-      3)
-        setup_circle buildstack
-        exit $?
-        ;;
-      *)
-        setup_circle
-        exit $?
-        ;;
-  esac
+  # shellcheck disable=SC2119
+  setup_circle
+  exit $?
+  # 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"
+    echo "=====> make unit-tests (1/4) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
    sudo -E UNIT_TEST_BATCH=1 make -e unit-tests
    ;;

  1)
-    echo "=====> make unit-tests (2/2) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
+    echo "=====> make unit-tests (2/4) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
    sudo -E UNIT_TEST_BATCH=2 make -e unit-tests
    ;;

  2)
-    echo "=====> make deploy-tests (herokuish release) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
-    sudo -E make -e deploy-tests
+    echo "=====> make unit-tests (3/4) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
+    sudo -E UNIT_TEST_BATCH=3 make -e unit-tests
+    echo "=====> make deploy tests"
+    sudo -E make -e deploy-test-checks-root deploy-test-config deploy-test-multi
    ;;

  3)
-    echo "=====> make deploy-tests (herokuish master) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
-    sudo -E make -e deploy-tests
+    echo "=====> make unit-tests (4/4) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
+    sudo -E UNIT_TEST_BATCH=4 make -e unit-tests
    ;;
 esac
--- a/tests/ci/unit_test_runner.sh
+++ b/tests/ci/unit_test_runner.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 is_number() {
-  local NUMBER=$1; local NUM_RE='^[0-9]+$'
+  local NUMBER=$1; local NUM_RE='^[1-4]+$'
  if [[ $NUMBER =~ $NUM_RE ]]; then
    return 0
  else
@@ -10,28 +10,13 @@ is_number() {
 }

 usage() {
-  echo "usage: $0 1|2"
+  echo "usage: $0 1|2|3|4"
  exit 0
 }

 BATCH_NUM="$1"
 is_number $BATCH_NUM || usage

-TESTS=($(find "$(dirname $0)"/../unit -maxdepth 1 -name "*.bats"))
-HALF_TESTS=$(( ${#TESTS[@]} / 2 ))
-FIRST_HALF=("${TESTS[@]:0:${HALF_TESTS}}")
-LAST_HALF=("${TESTS[@]:${HALF_TESTS}:${#TESTS[@]}}")
-
-case "$BATCH_NUM" in
-  1)
-    bats "${FIRST_HALF[@]}"
-  ;;
-
-  2)
-    bats "${LAST_HALF[@]}"
-  ;;
-
-  *)
-    usage
-  ;;
-esac
+TESTS=$(find "$(dirname $0)"/../unit -maxdepth 1 -name "${BATCH_NUM}0*.bats" | sort -n | xargs)
+echo "running the following tests $TESTS"
+bats $TESTS
--- a/tests/unit/10_apps.bats
+++ b/tests/unit/10_apps.bats
@@ -0,0 +1,59 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+@test "(apps) apps" {
+  create_app
+  run bash -c "dokku apps | grep $TEST_APP"
+  echo "output: "$output
+  echo "status: "$status
+  assert_output $TEST_APP
+  destroy_app
+}
+
+@test "(apps) apps:create" {
+  run dokku apps:create $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  destroy_app
+
+  run dokku apps:create 1994testapp
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  dokku --force apps:destroy 1994testapp
+
+  run dokku apps:create TestApp
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+}
+
+@test "(apps) apps:destroy" {
+  create_app
+  run bash -c "dokku --force apps:destroy $TEST_APP"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
+@test "(apps) apps:rename" {
+  deploy_app
+  run bash -c "dokku apps:rename $TEST_APP great-test-name"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run bash -c "dokku apps | grep $TEST_APP"
+  echo "output: "$output
+  echo "status: "$status
+  assert_output ""
+  run bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404"
+  echo "output: "$output
+  echo "status: "$status
+  assert_output ""
+  run bash -c "dokku --force apps:destroy great-test-name"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
--- a/tests/unit/10_build-env.bats
+++ b/tests/unit/10_build-env.bats
--- a/tests/unit/10_certs.bats
+++ b/tests/unit/10_certs.bats
@@ -24,28 +24,35 @@ teardown() {
  teardown_local_tls
 }

-@test "certs:add" {
+@test "(certs) certs:add" {
  run bash -c "dokku certs:add $TEST_APP $BATS_TMPDIR/tls/server.crt $BATS_TMPDIR/tls/server.key"
  echo "output: "$output
  echo "status: "$status
  assert_success
 }

-@test "certs:add < tar" {
+@test "(certs) certs:add < tar" {
  run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar"
  echo "output: "$output
  echo "status: "$status
  assert_success
 }

-@test "certs:info" {
+@test "(certs) certs:add < tar should ignore OSX hidden files" {
+  run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/osx_ssl_tarred.tar"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
+@test "(certs) certs:info" {
  run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:info $TEST_APP"
  echo "output: "$output
  echo "status: "$status
  assert_success
 }

-@test "certs:remove" {
+@test "(certs) certs:remove" {
  run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:remove $TEST_APP"
  echo "output: "$output
  echo "status: "$status
--- a/tests/unit/10_core_1.bats
+++ b/tests/unit/10_core_1.bats
@@ -0,0 +1,70 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  create_app
+}
+
+teardown() {
+  rm -rf /home/dokku/$TEST_APP/tls /home/dokku/tls
+  destroy_app
+  disable_tls_wildcard
+}
+
+assert_urls() {
+  urls=$@
+  run dokku urls $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_output < <(tr ' ' '\n' <<< "${urls}")
+}
+
+build_nginx_config() {
+  # simulate nginx post-deploy
+  dokku domains:setup $TEST_APP
+  dokku nginx:build-config $TEST_APP
+}
+
+@test "(core) remove exited containers" {
+  deploy_app
+  # make sure we have many exited containers of the same 'type'
+  run bash -c "for cnt in 1 2 3; do dokku run $TEST_APP hostname; done"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run bash -c "docker ps -a -f 'status=exited' --no-trunc=false | grep '/exec hostname'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run dokku cleanup
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  sleep 5  # wait for dokku cleanup to happen in the background
+  run bash -c "docker ps -a -f 'status=exited' --no-trunc=false | grep '/exec hostname'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+  run bash -c "docker ps -a -f 'status=exited' -q --no-trunc=false"
+  echo "output: "$output
+  echo "status: "$status
+  assert_output ""
+}
+
+@test "(core) run (with tty)" {
+  deploy_app
+  run /bin/bash -c "dokku run $TEST_APP ls /app/package.json"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
+@test "(core) run (without tty)" {
+  deploy_app
+  run /bin/bash -c ": |dokku run $TEST_APP ls /app/package.json"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
--- a/tests/unit/10_ps-dockerfile.bats
+++ b/tests/unit/10_ps-dockerfile.bats
--- a/tests/unit/10_tar.bats
+++ b/tests/unit/10_tar.bats
--- a/tests/unit/20_client.bats
+++ b/tests/unit/20_client.bats
--- a/tests/unit/20_config.bats
+++ b/tests/unit/20_config.bats
@@ -3,14 +3,17 @@
 load test_helper

 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"
+  [[ -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
 }

 teardown() {
  destroy_app
-  [[ -f $DOKKU_ROOT/ENV.bak ]] && mv -f $DOKKU_ROOT/ENV.bak $DOKKU_ROOT/ENV
+  ls -la ${DOKKU_ROOT}
+  if [[ -f ${DOKKU_ROOT}/ENV.bak ]];then
+    mv -f ${DOKKU_ROOT}/ENV.bak ${DOKKU_ROOT}/ENV
+  fi
 }

@test "(config) config:set --global" {
--- a/tests/unit/20_core_ports_1.bats
+++ b/tests/unit/20_core_ports_1.bats
@@ -0,0 +1,91 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  [[ -f "$DOKKU_ROOT/VHOST" ]] && cp -f "$DOKKU_ROOT/VHOST" "$DOKKU_ROOT/VHOST.bak"
+  [[ -f "$DOKKU_ROOT/HOSTNAME" ]] && cp -f "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/HOSTNAME.bak"
+  DOCKERFILE="$BATS_TMPDIR/Dockerfile"
+}
+
+teardown() {
+  destroy_app
+  [[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST"
+  [[ -f "$DOKKU_ROOT/HOSTNAME.bak" ]] && mv "$DOKKU_ROOT/HOSTNAME.bak" "$DOKKU_ROOT/HOSTNAME"
+}
+
+
+check_urls() {
+  local PATTERN="$1"
+  run bash -c "dokku --quiet urls $TEST_APP | egrep \"${1}\""
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
+@test "(core) port exposure (with global VHOST)" {
+  echo "dokku.me" > "$DOKKU_ROOT/VHOST"
+  deploy_app
+  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+
+  check_urls http://${TEST_APP}.dokku.me
+}
+
+@test "(core) port exposure (without global VHOST and real HOSTNAME)" {
+  rm "$DOKKU_ROOT/VHOST"
+  echo "${TEST_APP}.dokku.me" > "$DOKKU_ROOT/HOSTNAME"
+  deploy_app
+  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
+}
+
+@test "(core) port exposure (with NO_VHOST set)" {
+  deploy_app
+  dokku config:set $TEST_APP NO_VHOST=1
+  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
+}
+
+@test "(core) port exposure (without global VHOST and IPv4 address as HOSTNAME)" {
+  rm "$DOKKU_ROOT/VHOST"
+  echo "127.0.0.1" > "$DOKKU_ROOT/HOSTNAME"
+  deploy_app
+  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
+}
+
+@test "(core) port exposure (without global VHOST and IPv6 address as HOSTNAME)" {
+  rm "$DOKKU_ROOT/VHOST"
+  echo "fda5:c7db:a520:bb6d::aabb:ccdd:eeff" > "$DOKKU_ROOT/HOSTNAME"
+  deploy_app
+  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
+  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
+  check_urls http://${HOSTNAME}:[0-9]+
+}
--- a/tests/unit/20_docker-options.bats
+++ b/tests/unit/20_docker-options.bats
@@ -10,7 +10,7 @@ teardown() {
  destroy_app
 }

-@test "docker-options:add (all phases)" {
+@test "(docker-options) docker-options:add (all phases)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -21,7 +21,7 @@ teardown() {
  assert_success
 }

-@test "docker-options:add (build phase)" {
+@test "(docker-options) docker-options:add (build phase)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP build \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -32,7 +32,7 @@ teardown() {
  assert_success
 }

-@test "docker-options:add (deploy phase)" {
+@test "(docker-options) docker-options:add (deploy phase)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP deploy \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -43,7 +43,7 @@ teardown() {
  assert_success
 }

-@test "docker-options:add (run phase)" {
+@test "(docker-options) docker-options:add (run phase)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP run \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -54,7 +54,7 @@ teardown() {
  assert_success
 }

-@test "docker-options:remove (all phases)" {
+@test "(docker-options) docker-options:remove (all phases)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -73,7 +73,7 @@ teardown() {
  assert_success
 }

-@test "docker-options:remove (build phase)" {
+@test "(docker-options) docker-options:remove (build phase)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -92,7 +92,7 @@ teardown() {
  assert_output "Build options: none"
 }

-@test "docker-options:remove (deploy phase)" {
+@test "(docker-options) docker-options:remove (deploy phase)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -111,7 +111,7 @@ teardown() {
  assert_output "Deploy options: none"
 }

-@test "docker-options:remove (run phase)" {
+@test "(docker-options) docker-options:remove (run phase)" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP build,deploy,run \"-v /tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -130,7 +130,7 @@ teardown() {
  assert_output "Run options: none"
 }

-@test "docker-options (deploy with options)" {
+@test "(docker-options) deploy with options" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP deploy \"-v /var/tmp\""
  echo "output: "$output
  echo "status: "$status
@@ -150,7 +150,7 @@ teardown() {
  deploy_app
 }

-@test "docker-options:add (all phases over SSH)" {
+@test "(docker-options) docker-options:add (all phases over SSH)" {
  run ssh dokku@dokku.me docker-options:add $TEST_APP build,deploy,run "-v /tmp"
  echo "output: "$output
  echo "status: "$status
@@ -161,7 +161,7 @@ teardown() {
  assert_success
 }

-@test "docker-options (dockerfile deploy with link)" {
+@test "(docker-options) dockerfile deploy with link" {
  run /bin/bash -c "dokku docker-options:add $TEST_APP deploy \"-v /var/tmp\""
  echo "output: "$output
  echo "status: "$status
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
--- a/tests/unit/30_core_ports_2.bats
+++ b/tests/unit/30_core_ports_2.bats
@@ -23,73 +23,6 @@ check_urls() {
  assert_success
 }

-@test "(core) port exposure (with global VHOST)" {
-  echo "dokku.me" > "$DOKKU_ROOT/VHOST"
-  deploy_app
-  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
-  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
-  echo "output: "$output
-  echo "status: "$status
-  assert_failure
-
-  check_urls http://${TEST_APP}.dokku.me
-}
-
-@test "(core) port exposure (without global VHOST and real HOSTNAME)" {
-  rm "$DOKKU_ROOT/VHOST"
-  echo "${TEST_APP}.dokku.me" > "$DOKKU_ROOT/HOSTNAME"
-  deploy_app
-  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
-  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
-  check_urls http://${HOSTNAME}:[0-9]+
-}
-
-@test "(core) port exposure (with NO_VHOST set)" {
-  deploy_app
-  dokku config:set $TEST_APP NO_VHOST=1
-  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
-  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
-  check_urls http://${HOSTNAME}:[0-9]+
-}
-
-@test "(core) port exposure (without global VHOST and IPv4 address as HOSTNAME)" {
-  rm "$DOKKU_ROOT/VHOST"
-  echo "127.0.0.1" > "$DOKKU_ROOT/HOSTNAME"
-  deploy_app
-  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
-  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
-  check_urls http://${HOSTNAME}:[0-9]+
-}
-
-@test "(core) port exposure (without global VHOST and IPv6 address as HOSTNAME)" {
-  rm "$DOKKU_ROOT/VHOST"
-  echo "fda5:c7db:a520:bb6d::aabb:ccdd:eeff" > "$DOKKU_ROOT/HOSTNAME"
-  deploy_app
-  CONTAINER_ID=$(< $DOKKU_ROOT/$TEST_APP/CONTAINER.web.1)
-  run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep -q '[0-9]*'"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  HOSTNAME=$(< "$DOKKU_ROOT/HOSTNAME")
-  check_urls http://${HOSTNAME}:[0-9]+
-}
-
@test "(core) port exposure (pre-deploy domains:add)" {
  create_app
  run dokku domains:add $TEST_APP www.test.app.dokku.me
--- a/tests/unit/30_events.bats
+++ b/tests/unit/30_events.bats
--- a/tests/unit/30_ps-herokuish.bats
+++ b/tests/unit/30_ps-herokuish.bats
--- a/tests/unit/40_core_2.bats
+++ b/tests/unit/40_core_2.bats
@@ -26,48 +26,6 @@ build_nginx_config() {
  dokku nginx:build-config $TEST_APP
 }

-@test "(core) remove exited containers" {
-  deploy_app
-  # make sure we have many exited containers of the same 'type'
-  run bash -c "for cnt in 1 2 3; do dokku run $TEST_APP hostname; done"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run bash -c "docker ps -a -f 'status=exited' --no-trunc=false | grep '/exec hostname'"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run dokku cleanup
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  sleep 5  # wait for dokku cleanup to happen in the background
-  run bash -c "docker ps -a -f 'status=exited' --no-trunc=false | grep '/exec hostname'"
-  echo "output: "$output
-  echo "status: "$status
-  assert_failure
-  run bash -c "docker ps -a -f 'status=exited' -q --no-trunc=false"
-  echo "output: "$output
-  echo "status: "$status
-  assert_output ""
-}
-
-@test "(core) run (with tty)" {
-  deploy_app
-  run /bin/bash -c "dokku run $TEST_APP ls /app/package.json"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
-
-@test "(core) run (without tty)" {
-  deploy_app
-  run /bin/bash -c ": |dokku run $TEST_APP ls /app/package.json"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
-
@test "(core) run (with --options)" {
  deploy_app
  run /bin/bash -c "dokku --force --quiet run $TEST_APP node --version"
--- a/tests/unit/40_nginx-vhosts.bats
+++ b/tests/unit/40_nginx-vhosts.bats
--- a/tests/unit/40_plugin.bats
+++ b/tests/unit/40_plugin.bats
@@ -0,0 +1,104 @@
+#!/usr/bin/env bats
+
+load test_helper
+TEST_PLUGIN_NAME=smoke-test-plugin
+TEST_PLUGIN_GIT_REPO=https://github.com/dokku/${TEST_PLUGIN_NAME}.git
+
+remove_test_plugin() {
+  rm -rf $PLUGIN_ENABLED_PATH/$TEST_PLUGIN_NAME $PLUGIN_AVAILABLE_PATH/$TEST_PLUGIN_NAME
+}
+
+teardown() {
+  remove_test_plugin || true
+}
+
+@test "(plugin) plugin:install, plugin:disable, plugin:update plugin:uninstall" {
+  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --name $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin:update $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "sudo -E -u nobody dokku plugin:uninstall $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+
+  run bash -c "dokku plugin:disable $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep disabled | grep $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin:uninstall $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+}
+
+@test "(plugin) plugin:install plugin:update (with tag)" {
+  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO --committish v0.2.0 --name $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin:update $TEST_PLUGIN_NAME v0.3.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.2.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME | grep 0.3.0"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
+@test "(plugin) plugin:install, plugin:disable, plugin:uninstall as non-root user failure" {
+  run bash -c "sudo -E -u nobody dokku plugin:install $TEST_PLUGIN_GIT_REPO"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+
+  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
+  run bash -c "sudo -E -u nobody dokku plugin:disable $TEST_PLUGIN_NAME"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+}
--- a/tests/unit/40_tags.bats
+++ b/tests/unit/40_tags.bats
--- a/tests/unit/apps.bats
+++ b/tests/unit/apps.bats
@@ -1,28 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "(apps) apps" {
-  create_app
-  run bash -c "dokku apps | grep $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_output $TEST_APP
-  destroy_app
-}
-
-@test "(apps) apps:create" {
-  run dokku apps:create $TEST_APP
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  destroy_app
-}
-
-@test "(apps) apps:destroy" {
-  create_app
-  run bash -c "dokku --force apps:destroy $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
--- a/tests/unit/osx_ssl_tarred.tar
+++ b/tests/unit/osx_ssl_tarred.tar
--- a/tests/unit/plugin.bats
+++ b/tests/unit/plugin.bats
@@ -1,45 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-TEST_PLUGIN_NAME=smoke-test-plugin
-TEST_PLUGIN_GIT_REPO=https://github.com/dokku/${TEST_PLUGIN_NAME}.git
-
-remove_test_plugin() {
-  rm -rf $PLUGIN_ENABLED_PATH/$TEST_PLUGIN_NAME $PLUGIN_AVAILABLE_PATH/$TEST_PLUGIN_NAME
-}
-
-teardown() {
-  remove_test_plugin || true
-}
-
-@test "(plugin) plugin:install, plugin:disable, plugin:uninstall" {
-  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  run bash -c "dokku plugin | grep enabled | grep $TEST_PLUGIN_NAME"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  run bash -c "dokku plugin:disable $TEST_PLUGIN_NAME"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  run bash -c "dokku plugin | grep disabled | grep $TEST_PLUGIN_NAME"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  run bash -c "dokku plugin:uninstall $TEST_PLUGIN_NAME"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-
-  run bash -c "dokku plugin | grep $TEST_PLUGIN_NAME"
-  echo "output: "$output
-  echo "status: "$status
-  assert_failure
-}
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	f7e8c9be90	Release 0.4.10	2016-01-07 01:14:09 -05:00
Michael Hobbs	606e27653f	Merge pull request #1837 from dokku/mh-add-some-deploy-tests add back some deploy tests that test dokku functionality	2016-01-06 21:27:50 -08:00
Michael Hobbs	28633003d5	fix docker version and add back some deploy tests that test dokku functionality	2016-01-06 20:53:08 -08:00
Jose Diaz-Gonzalez	dcf9e0ae58	Merge pull request #1835 from dokku/josegonzalez-patch-1 Add support for more versions of docker-engine	2016-01-06 16:51:04 -05:00
Jose Diaz-Gonzalez	5b526a52fc	Add support for more versions of docker-engine [ci skip]	2016-01-06 13:34:09 -05:00
Michael Hobbs	729a2246c6	[ci skip] cleanup some language in test docs. add reference to copyfile target. closes #1833	2016-01-06 08:11:50 -08:00
Michael Hobbs	c8c3381dd6	Merge pull request #1834 from jvanbaarsen/ignore-osx-hidden-files Make sure we ignore hidden files in the SSL cert check	2016-01-06 07:58:35 -08:00
Jeroen van Baarsen	9767b90826	Make sure we ignore hidden files in the SSL cert check OSX creates hidden files: `./._server.key` and `./._server.crt`. The Dokku cert plugin is choking on those files. We should probably just ignore them, and go on with our lives Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2016-01-06 14:36:07 +01:00
Michael Hobbs	68b02c40a7	Merge pull request #1827 from dokku/mh-use-docker-circleci-1.9.x use docker 1.9.0 on circleci	2016-01-05 13:05:11 -08:00
Michael Hobbs	16544a77e2	Merge pull request #1828 from dokku/mh-label-dokku-containers label all dokku containers	2016-01-05 12:39:24 -08:00
Michael Hobbs	1c6916c68f	Merge pull request #1829 from dokku/mh-dokku-report implement dokku report command	2016-01-05 12:25:45 -08:00
Michael Hobbs	d7b5d6e904	[ci skip] implement dokku report command	2016-01-05 12:24:07 -08:00
Michael Hobbs	fdefff329a	[ci skip] docs cleanu	2016-01-05 12:23:29 -08:00
Michael Hobbs	39bba0b36e	use docker 1.9.0 on circleci	2016-01-05 12:05:44 -08:00
Michael Hobbs	17e7869150	label all dokku containers	2016-01-05 11:55:07 -08:00
Jose Diaz-Gonzalez	fec6db13fb	Merge pull request #1826 from dokku/1531_mh-plugin-update implement plugn update	2016-01-05 14:17:53 -05:00
Michael Hobbs	fc512b3231	implement plugn update and allow plugin:install to accept committish. closes #1531	2016-01-05 10:47:27 -08:00
Jose Diaz-Gonzalez	1805f41918	Merge pull request #1823 from dokku/josegonzalez-patch-1 Fix output of dokku apps	2016-01-04 18:32:54 -05:00
Jose Diaz-Gonzalez	7562610c7d	Fix output of dokku apps	2016-01-04 17:07:43 -05:00
Jose Diaz-Gonzalez	95d96ce1ab	Merge pull request #1822 from shingara/patch-1 --no-restart option after config:set not before	2016-01-04 16:55:58 -05:00
Cyril Mougel	16365a5a44	--no-restart option after config:set not before	2016-01-04 22:52:04 +01:00
Jose Diaz-Gonzalez	f13c77d50d	Merge pull request #1819 from andrewsomething/hostname-set-up Write out /home/dokku/HOSTNAME as specified by the web installer.	2016-01-04 13:52:30 -05:00
Andrew Starr-Bochicchio	245718f236	Write out /home/dokku/HOSTNAME as specified by the web installer.	2016-01-04 12:44:32 -05:00
Jose Diaz-Gonzalez	07aace9975	Merge pull request #1818 from dokku/josegonzalez-pre-receive Fix pre-receive git-hook	2016-01-04 11:21:10 -05:00
Jose Diaz-Gonzalez	244bb25e6a	Fix variable reference	2016-01-04 05:20:05 -05:00
Jose Diaz-Gonzalez	2a94bf267b	Fix pre-receive git-hook Closes #1817	2016-01-04 04:40:05 -05:00
Jose Diaz-Gonzalez	b22b366fb1	Release 0.4.9	2016-01-03 10:19:17 -05:00
Jose Diaz-Gonzalez	5387bce2d9	Merge pull request #1807 from dokku/josegonzalez-patch-1 Allow updating submodules at any revision	2016-01-02 20:07:54 -05:00
Jose Diaz-Gonzalez	f2c1cd8a35	Merge pull request #1812 from dokku/debian-packaging Debian packaging updates	2016-01-02 20:04:28 -05:00
Jose Diaz-Gonzalez	188694fb29	Merge pull request #1814 from blackxored/fix-ip-extraction fix: use new Go template for extracting IP	2016-01-02 19:56:34 -05:00
Adrian Perez	84fba7ff2b	fix: try to preserve pre 1.9 compatibility	2016-01-02 20:16:03 +01:00
Adrian Perez	6c7d34a773	fix: use new template for extracting IP I was running into issues with the IP addresses, and it seems that it's using an incorrect/outdated syntax for retrieving the container's IP Address. In multi-host networking `NetworkSettings.IPAddress` is empty. The docker documentation at https://docs.docker.com/engine/reference/commandline/inspect/ uses a different syntax which I've tested to work both on multi-host and standard bridge networking. If you're interested in the other issues and the work/hacks I've been doing related to #1795, let me know. In the meantime, I think this fix is needed.	2016-01-02 18:21:23 +01:00
Jose Diaz-Gonzalez	61f9ae6e67	Fix shellcheck violation	2016-01-02 04:31:48 -05:00
Jose Diaz-Gonzalez	5a74d5c247	Create the proper init file in a distribution-agnostic way From http://unix.stackexchange.com/a/164092/105389	2016-01-02 04:08:54 -05:00
Jose Diaz-Gonzalez	bb525a3cf1	Properly handle dokku-installer installation	2016-01-02 03:53:27 -05:00
Jose Diaz-Gonzalez	933a5c0abf	Reload the nginx configuration Otherwise we run the risk of proxying a request to a bad backend	2016-01-02 03:37:44 -05:00
Jose Diaz-Gonzalez	a2f0962b76	Stop any running dokku-installer processes They will cease to function regardless of whether the package has been purged or not	2016-01-02 03:37:16 -05:00
Jose Diaz-Gonzalez	73b3c4af40	Properly handle dokku data removal - remove deployed applications during dpkg purge - disable all core plugins during dpkg purge - ensure init files are removed - ensure motd is removed - remove all core plugins, dokku config files (including tls/sshcommand entries etc.) during purge - remove all empty directories and broken symlinks in the DOKKU_ROOT and DOKKU_LIB_ROOT directories during purge Note that we do not delete the dokku user itself as there might be other data we don't know about in this directory.	2016-01-02 02:52:30 -05:00
Jose Diaz-Gonzalez	51a50fb571	Use dokku_apps for listing apps instead of re-inventing the wheel	2016-01-02 02:31:34 -05:00
Jose Diaz-Gonzalez	40047f0f8b	Add support for symlinked directory paths and sort the output	2016-01-02 02:31:06 -05:00
Jose Diaz-Gonzalez	89d96dfee1	Only trigger systemctl if that command exists	2016-01-02 02:30:34 -05:00
Jose Diaz-Gonzalez	cac272a247	Fix restarts of systemctl and dokku-installer We previously assumed that systemd was detectable by the existence of certain directories. Unfortunately, it seems 14.04 already has these directories, so we need to handle this case separately. One other note is that dokku-installer will fail to "start" if already started on certain systems, thus the previous grep was more accurate in it's running.	2016-01-02 02:29:57 -05:00
Jose Diaz-Gonzalez	932e8191ad	Revert "Fix issue where installer created dokku-installer for both upstart and systemd" This reverts commit `1581884c6d`.	2016-01-02 00:52:04 -05:00
Jose Diaz-Gonzalez	63d961afa0	Revert "Fix lintian warning: file-in-unusual-dir" This reverts commit `3fb59fd04d`. Changing the path to dokku cannot be done in a patch release, as it would break existing sshcommand entries.	2016-01-01 23:57:18 -05:00
Jose Diaz-Gonzalez	7c88cecad4	Plugin documentation formatting	2016-01-01 22:26:46 -05:00
Jose Diaz-Gonzalez	389d677392	Fix lintian error: no-copyright-file	2016-01-01 22:11:06 -05:00
Jose Diaz-Gonzalez	70b29590b9	Fix lintian error: manpage-not-compressed	2016-01-01 22:05:25 -05:00
Jose Diaz-Gonzalez	f7a1f5c095	Fix lintian warning: file-in-unusual-dir	2016-01-01 22:02:40 -05:00
Jose Diaz-Gonzalez	220923071c	Fix lintian warning: file-in-unusual-dir	2016-01-01 21:59:00 -05:00
Jose Diaz-Gonzalez	3fb59fd04d	Fix lintian warning: file-in-unusual-dir	2016-01-01 21:54:34 -05:00
Jose Diaz-Gonzalez	5667f9cef1	Fix lintian warning: missing-debconf-dependency-for-preinst	2016-01-01 21:49:16 -05:00
Jose Diaz-Gonzalez	b8630b45d7	Fix lintian error: python-script-but-no-python-dep	2016-01-01 21:47:22 -05:00
Jose Diaz-Gonzalez	4cb713cebf	Fix lintian warning: postrm-does-not-purge-debconf	2016-01-01 21:45:38 -05:00
Jose Diaz-Gonzalez	b962221b41	Fix lintian warning: control-file-is-empty	2016-01-01 21:39:30 -05:00
Jose Diaz-Gonzalez	1d22f8c897	Fix lintian warning: malformed-prompt-in-templates	2016-01-01 21:38:51 -05:00
Jose Diaz-Gonzalez	b0a32dfd1b	Fixup debconf descriptions	2016-01-01 21:38:26 -05:00
Jose Diaz-Gonzalez	1314b3942d	Correctly handle dokku-installer init file creation on systemd instances - Use the nginx.conf file's existence as a check for whether we should start the service or not - Create the init files with the dokku-installer.py file. This adds actual systemd support. - Also ensure we always start the service, regardless of it's status. This fixes an issue with processing systemd output	2016-01-01 21:37:42 -05:00
Jose Diaz-Gonzalez	55b2aba3a8	Fix casing on all debugging messages	2016-01-01 21:35:11 -05:00
Jose Diaz-Gonzalez	9da11dc8f8	Fix lintian warning: description-synopsis-starts-with-article	2016-01-01 21:34:51 -05:00
Jose Diaz-Gonzalez	1581884c6d	Fix issue where installer created dokku-installer for both upstart and systemd We should only create the upstart version if the OS does not use systemd.	2016-01-01 21:34:09 -05:00
Jose Diaz-Gonzalez	2b1929fc33	Merge pull request #1811 from dokku/josegonzalez-patch-2 Add dokku haproxy to plugins	2016-01-01 20:21:35 -05:00
Jose Diaz-Gonzalez	6c50e62f32	Add dokku haproxy to plugins [ci skip]	2016-01-01 20:21:29 -05:00
Jose Diaz-Gonzalez	3f0a6a99da	Merge pull request #1810 from dokku/josegonzalez-patch-2 Dockerfile installation requirements	2016-01-01 19:42:54 -05:00
Jose Diaz-Gonzalez	94b2a6a014	Invoke db_stop to ensure underlying services close open file descriptors	2015-12-31 08:54:02 -05:00
Jose Diaz-Gonzalez	ae2b2febe9	Enable debugging support to debian preinst hook It is now possible to turn on debugging during an apt-get run by using `TRACE=1`	2015-12-31 08:22:38 -05:00
Jose Diaz-Gonzalez	908f551e0f	Enable debugging support to debian postinst hook It is now possible to turn on debugging during an apt-get run by using `TRACE=1`	2015-12-31 08:22:06 -05:00
Jose Diaz-Gonzalez	07506f1f53	Adding more info output to bootstrap script run This allows us to better keep track of what commands are being run and when.	2015-12-31 08:19:39 -05:00
Jose Diaz-Gonzalez	2b624ac485	Release 0.4.8	2015-12-31 07:04:55 -05:00
Jose Diaz-Gonzalez	f73dfe0672	Merge pull request #1809 from dokku/josegonzalez-patch-2 Remove non-zero downtime version of letsencrypt plugin	2015-12-31 06:04:25 -05:00
Jose Diaz-Gonzalez	e3b5024ca3	Remove non-zero downtime version of letsencrypt plugin [ci skip]	2015-12-31 06:04:19 -05:00
Jose Diaz-Gonzalez	a0c4f1fc1f	Merge pull request #1808 from dokku/josegonzalez-patch-2 Fix path to dokku-installer	2015-12-31 05:47:04 -05:00
Jose Diaz-Gonzalez	399b3ecfe3	Fix path to dokku-installer [ci skip]	2015-12-31 05:46:58 -05:00
Jose Diaz-Gonzalez	29ce25a040	Allow updating submodules at any revision Using `--depth=1` breaks any submodules that are not at HEAD	2015-12-30 00:13:05 -05:00
Michael Hobbs	8832a9dd58	fix errant test file rename	2015-12-29 14:43:19 -08:00
Jose Diaz-Gonzalez	c561a8b900	Merge pull request #1798 from dokku/1774_mh-invalid-appname-failure ensure app name begins with lowercase alphanumeric character	2015-12-25 21:55:02 -05:00
Jose Diaz-Gonzalez	eacb27d70b	Merge pull request #1804 from dokku/josegonzalez-patch-2 Fix deprecated version constraint usage in debian control file	2015-12-25 21:54:36 -05:00
Jose Diaz-Gonzalez	a2359d6994	Fix deprecated version constraint usage Fixes the following warning: ``` dpkg: warning: parsing file '/var/lib/dpkg/tmp.ci/control' near line 6 package 'dokku': `Depends' field, reference to `lxc-docker': `>' is obsolete, use `>=' or `>>' instead ``` Refs #1776	2015-12-24 18:02:26 -05:00
Jose Diaz-Gonzalez	67b4170e43	Merge pull request #1803 from dokku/mh-update-plugn update plugn download url and version	2015-12-24 16:20:57 -05:00
Michael Hobbs	01f5c93585	update plugn download url and version	2015-12-24 10:41:09 -08:00
Jose Diaz-Gonzalez	f6306deb0a	Merge pull request #1801 from dokku/josegonzalez-patch-1 Allow setting DOKKU_LIB_ROOT env var to modify the lib path on install	2015-12-23 21:24:02 -05:00
Jose Diaz-Gonzalez	f6a4521e19	Allow setting DOKKU_LIB_ROOT env var to modify the lib path on install	2015-12-23 20:02:56 -05:00
Jose Diaz-Gonzalez	35dc92fb3f	Release 0.4.7	2015-12-23 07:16:49 -05:00
Jose Diaz-Gonzalez	eecd262eff	Merge pull request #1800 from dokku/josegonzalez-patch-1 Respect DOKKU_ROOT in debian/postint	2015-12-23 03:59:16 -05:00
Jose Diaz-Gonzalez	6fbe8cabde	Respect DOKKU_ROOT in debian/postint [ci skip]	2015-12-23 03:59:10 -05:00
Jose Diaz-Gonzalez	dd0d0a3873	Merge pull request #1799 from dokku/josegonzalez-patch-1 Add support for tutum-agent	2015-12-23 01:41:56 -05:00
Jose Diaz-Gonzalez	4a36cbad53	Add support for tutum-agent The agent embeds it's own docker, so installing both dokku and tutum-agent on the same instance is currently impossible. [ci skip]	2015-12-23 01:41:48 -05:00
Jose Diaz-Gonzalez	3c3e5a962d	Merge pull request #1794 from dokku/remove-ruby-dependency Replace dokku-installer.rb with dokku-installer.py	2015-12-22 15:11:52 -05:00
Jose Diaz-Gonzalez	8775a2de1a	Merge pull request #1797 from dokku/1768_mh-plugin-root-only ensure we run plugin commands as root	2015-12-22 15:06:09 -05:00
Michael Hobbs	803ef7d9f3	ensure app name begins with lowercase. closes #1774	2015-12-22 12:02:18 -08:00
Michael Hobbs	d7b1e38cb7	ensure we run plugin commands as root. closes #1768	2015-12-22 11:16:25 -08:00
Jose Diaz-Gonzalez	e323770f89	Replace dokku-installer.rb with dokku-installer.py The python version should allow us to remove any ruby dependencies and should also slightly speed up dokku installation. All LSB-compliant distributions should have python, so we should be okay depending upon it. Closes #1783 Closes #1786	2015-12-22 01:59:23 -05:00
Michael Hobbs	32f1bc5396	Merge pull request #1789 from lvillani/skip-deploy Make it possible to skip a deploy	2015-12-21 17:11:21 -08:00
Michael Hobbs	9d0f099e86	Merge pull request #1791 from dokku/mh-pare-down-test-suite don't run app deploy tests and spread out unit tests to 4 containers	2015-12-21 16:36:25 -08:00
Michael Hobbs	76ad65b715	don't run app deploy tests and spread out unit tests to 4 containers. closes #1787	2015-12-21 10:18:16 -08:00
Michael Hobbs	d320203c2c	Merge pull request #1793 from dokku/1792_mh-comments-in-procfile filter out Procfile comments	2015-12-21 09:07:36 -08:00
Lorenzo Villani	30118d1b32	Make it possible to skip a deploy	2015-12-21 17:45:24 +01:00
Michael Hobbs	88be5083e0	filter out Procfile comments. closes #1792 . closes #1742	2015-12-21 08:23:35 -08:00
Jose Diaz-Gonzalez	2955150dfe	Merge pull request #1670 from zachfeldman/add-apps-rename Add apps rename	2015-12-18 13:40:39 -05:00
Jose Diaz-Gonzalez	321c178f9f	Merge pull request #1788 from dokku/mh-repo-move updates for moving of dokku sshcommand and plugn repos	2015-12-18 04:16:39 -05:00
Michael Hobbs	a24b12eece	Merge pull request #1790 from dokku/mh-dev-env-inputrc use pgup/pgdown for history shortcut in dev env	2015-12-17 13:31:01 -08:00
Michael Hobbs	8b88cb8867	[ci skip] use pgup/pgdown for history shortcut in dev env	2015-12-17 13:30:34 -08:00
Michael Hobbs	8b879079e4	updates for moving of dokku sshcommand and plugn repos	2015-12-17 11:40:32 -08:00
Michael Hobbs	e4a23048ec	Merge pull request #1784 from duboff/patch-1 Tiny fix in SSL documentation	2015-12-16 17:29:00 -08:00
Mikhail Dubov	a06166c08b	Tiny fix in SSL documentation	2015-12-17 00:33:19 +00:00
Michael Hobbs	b3e9893e9d	Merge pull request #1778 from mmerickel/optimize-build-clone optimize git clone for building using depth=1	2015-12-16 15:47:48 -08:00
Michael Merickel	d31ac73066	avoid copying the entire git repo to a tmp folder when building the app It's not possible to checkout a specific commit into a new repository using ``git fetch`` and so a temporary tag is added to the host repository, then fetched.	2015-12-16 16:08:56 -06:00
Michael Hobbs	6366aad1e7	Merge pull request #1781 from jvanbaarsen/add-post-config-update-hook Add post config update hook	2015-12-16 14:00:01 -08:00
Michael Hobbs	208d3c13d9	Merge pull request #1780 from jvanbaarsen/add-domain-plugin-documentation Add documentation for the new domain plugin hooks	2015-12-16 13:59:53 -08:00
Michael Hobbs	e408351ec6	Merge pull request #1777 from dokku/mh-test-labels format test labels	2015-12-16 12:09:31 -08:00
Jeroen van Baarsen	66e255a396	Add documentation for the new domain plugin hooks Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-12-16 20:22:34 +01:00
Jeroen van Baarsen	441272d54b	Add post config update hook This adds a hook that will send in the $APP, action name and config vars. By adding this, we allow plugin creators to handle this kind of events as well. Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-12-16 20:21:56 +01:00
Michael Hobbs	3d21132e98	format test labels	2015-12-16 10:50:10 -08:00
Michael Hobbs	51cd991174	Merge pull request #1782 from dokku/mh-make-docker-cp-work-on-ci make docker cp work on circleci	2015-12-16 10:49:34 -08:00
Michael Hobbs	104b76129d	install patched docker version on ci to make docker cp work	2015-12-16 09:00:23 -08:00
Jose Diaz-Gonzalez	4608a382b1	Merge pull request #1779 from sseemayer/master Add link to new zero-downtime Let's Encrypt Plugin to docs	2015-12-16 03:51:33 -05:00
Stefan Seemayer	1286529c6e	Add sseemayer/dokku-letsencrypt plugin to docs	2015-12-16 09:26:22 +01:00
Jose Diaz-Gonzalez	a00d4ef792	Merge pull request #1771 from jvanbaarsen/more-hook-info Make plugin hooks send out more information	2015-12-15 14:27:36 -05:00
Jose Diaz-Gonzalez	d097a34735	Merge pull request #1776 from t-8ch/jessie-backports fix version constraints	2015-12-15 14:27:21 -05:00
Thomas Weißschuh	dda3c721e0	fix version constraints The version of docker.io in jessie-backports is 1.6.2~dfsg1-1~bpo8+1. This is regarded as lower than 1.6.2 by dpkg because `~` has a special meaning in regards to version sort in dpkg. This leads to: ``` The following packages have unmet dependencies: dokku : Depends: docker-engine-cs but it is not installable or docker-engine but it is not installable or lxc-docker (>= 1.6.2) but it is not installable or docker.io (>= 1.6.2) but 1.6.2~dfsg1-1~bpo8+1 is to be installed Recommends: herokuish but it is not going to be installed ``` By changing the contraints the version in backports will be accepted by dpkg.	2015-12-15 16:45:43 +00:00
Jeroen van Baarsen	90ea6a5ba4	Make plugin hooks send out more information Add this point you only get information that "something" happend on the given hook. By adding more information to the hook, plugin creators can do more interesting stuff. * The first params remains the $APP name (to maintain backwards compatability) * The second params sends in the action that happend, for domain this can be: "add", "clear" or "remove" * The third param sends in the argument that was passed to the original function, for domain that would be a list of all the domains that was given. One reason this addition would be great for plugin owners, is that when you have a web tool over Dokku, and someone creates a domain over the CLI, we a plugin can send back information about the event to the webapp over an API. That way the webapp is always up-to-date with the Dokku installation. Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>	2015-12-12 17:02:28 +01:00
Zach Feldman	f0b260d7dc	Adds dokku apps:rename function, closes #1440 . Adds unit test for new apps:rename function. Add example in the docs for new apps:rename function. Add apps:rename command to help command. Delete cache directory before copying old app directory to new app directory. deploy_app instead of create_app for apps:rename testing. Change app url to match new name. Fix unit tests. Add some more tests, plugn triggers.	2015-11-30 16:27:10 -05:00