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
42 changed files with 435 additions and 173 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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`.

--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,57 @@
 # 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.
--- 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.8/bootstrap.sh
-    sudo DOKKU_TAG=v0.4.8 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/bootstrap.sh
+++ b/bootstrap.sh
@@ -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

@@ -90,6 +91,7 @@ elif [[ -n $DOKKU_TAG ]]; then
  elif [[ "$major" -eq "0" ]] && [[ "$minor" -ge "4" ]] && [[ "$patch" -ge "0" ]]; then
    export DOKKU_CHECKOUT="$DOKKU_SEMVER"
    dokku_install_package
+    echo "--> Running post-install dependency installation"
    sudo -E dokku plugin:install-dependencies --core
  else
    export DOKKU_CHECKOUT="$DOKKU_TAG"
@@ -97,6 +99,7 @@ elif [[ -n $DOKKU_TAG ]]; then
  fi
 else
  dokku_install_package
+  echo "--> Running post-install dependency installation"
  sudo -E dokku plugin:install-dependencies --core
 fi

--- a/circle.yml
+++ b/circle.yml
@@ -1,7 +1,7 @@
 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.8.2-circleci-cp-workaround'
+    - 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
@@ -14,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
@@ -9,7 +9,7 @@ import subprocess
 import sys
 import threading

-VERSION = 'v0.4.8'
+VERSION = 'v0.4.10'

 hostname = ''
 try:
@@ -95,6 +95,9 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
                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"):
--- 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.6
+HEROKUISH_VERSION ?= 0.3.8
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb

@@ -75,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
@@ -85,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.py /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
--- a/debian/conffiles
+++ b/debian/conffiles
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
 Package: dokku
-Version: 0.4.8
+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.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
+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: A docker-powered PaaS that helps you build and manage the lifecycle of applications
+Description: Docker-powered PaaS that helps build and manage the lifecycle of applications

--- a/debian/postinst
+++ b/debian/postinst
@@ -1,5 +1,5 @@
-#!/bin/sh
-set -e
+#!/bin/bash
+set -eo pipefail; [[ $TRACE ]] && set -x

 . /usr/share/debconf/confmodule

@@ -18,13 +18,13 @@ 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 ${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
+    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
@@ -35,7 +35,7 @@ case "$1" in
      fi
    done

-    # enable all core plugins
+    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;
@@ -45,17 +45,31 @@ case "$1" in
    done
    chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins

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

    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

@@ -84,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.py 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/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.8/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.rawgit.com/dokku/dokku/v0.4.8/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.8\/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.8\/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.8\/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.8\/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.8\/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.8\/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.8/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.8/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/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/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -90,3 +90,4 @@ A few notes:
  ```
 - 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://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
@@ -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
 ```

--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -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/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.8/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/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.8/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.8/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.8/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.8 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.8/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.8 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.8/bootstrap.sh
-sudo DOKKU_TAG=v0.4.8 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.
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -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
@@ -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,27 +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
-[sseemayer]: https://github.com/sseemayer

 ### Datastores

@@ -175,12 +176,13 @@ 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/sseemayer/dokku-letsencrypt)                                    | [sseemayer][]         | 0.4.0+                |
@@ -223,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.
@@ -235,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)       |
@@ -265,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.8/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.4.8/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.8/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.4.8/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.8/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>
--- a/15
+++ b/15
@@ -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
@@ -136,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
@@ -7,13 +7,15 @@ 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"
@@ -21,17 +23,18 @@ case "$1" in
    NEW_APP="$3"

    mkdir -p "$DOKKU_ROOT/$NEW_APP"
-    docker run --rm -v "$DOKKU_ROOT/$OLD_APP/cache:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
+    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"
--- 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/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
 }

@@ -174,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() {
@@ -211,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
--- a/plugins/git/commands
+++ b/plugins/git/commands
@@ -27,7 +27,7 @@ git_build_app_repo() {
  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 --depth=1 &> /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

--- 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/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/ci/parallel_runner.sh
+++ b/tests/ci/parallel_runner.sh
@@ -19,6 +19,7 @@ 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
@@ -51,6 +52,8 @@ case "$CIRCLE_NODE_INDEX" in
  2)
    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)
--- a/tests/unit/10_certs.bats
+++ b/tests/unit/10_certs.bats
@@ -38,6 +38,13 @@ teardown() {
  assert_success
 }

+@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
--- a/tests/unit/40_plugin.bats
+++ b/tests/unit/40_plugin.bats
@@ -12,8 +12,13 @@ teardown() {
  remove_test_plugin || true
 }

-@test "(plugin) plugin:install, plugin:disable, plugin:uninstall" {
-  run bash -c "dokku plugin:install $TEST_PLUGIN_GIT_REPO"
+@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
@@ -49,6 +54,33 @@ teardown() {
  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
--- a/tests/unit/osx_ssl_tarred.tar
+++ b/tests/unit/osx_ssl_tarred.tar
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	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