Merge branch 'master' into fix/ignore-cache-directories-when-clone

2025-12-28 16:06:40 +01:00 · 2019-02-04 00:30:58 +09:00
parent d35042066b 86351724ff
commit 17ec77073a
99 changed files with 415 additions and 280 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,6 @@ jobs:
      - run: |
          make ci-dependencies
      - run: |
-          ./contrib/release build
          ./tests/ci/setup.sh
      - run: |
          echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,62 @@
 # History

+## 0.14.5
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.5/bootstrap.sh
+sudo DOKKU_TAG=v0.14.5 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3419: @jayjun Fix Dokku installer checkbox for WebKit and Edge browsers
+
+## 0.14.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.4/bootstrap.sh
+sudo DOKKU_TAG=v0.14.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3415: @josegonzalez Drop universe installation in debian
+
+## 0.14.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.3/bootstrap.sh
+sudo DOKKU_TAG=v0.14.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3412: @josegonzalez Ensure official golang plugins have correct help output
+- #3411: @josegonzalez Properly handle the nginx installation dependency
+- #3406: @josegonzalez Add missing semicolons to app-json script
+- #3394: @josegonzalez Quiet ps:retire where possible
+
+### New Features
+
+- #3410: @josegonzalez Make installs quieter
+- #3409: @josegonzalez Build golang binaries with higher concurrency
+- #3408: @josegonzalez Disable container restarts for stopped containers
+- #3389: @heyarne Remove jQuery from web-based installer
+
+### Documentation
+
+- #3407: @tkrugg Fix typo on domain docs
+
+### Tests
+
+- #3414: @josegonzalez Test and release changes
+
 ## 0.14.2

 Install/update via the bootstrap script:
--- a/2
+++ b/2
@@ -106,7 +106,7 @@ addman: help2man man-db

 version:
 ifeq ($(DOKKU_VERSION),master)
-	git describe --tags > ~dokku/VERSION  2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
+	git describe --tags > ~dokku/VERSION  2>/dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
 else
 	echo $(DOKKU_VERSION) > ~dokku/VERSION
 endif
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ A fresh VM running any of the following operating systems:
 To install the latest stable release, run the following commands as a user who has access to `sudo`:

 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh
-sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.5/bootstrap.sh
+sudo DOKKU_TAG=v0.14.5 bash bootstrap.sh
 ```

 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.
--- a/6
+++ b/6
@@ -49,7 +49,7 @@ Vagrant::configure("2") do |config|
      vb.customize ["modifyvm", :id, "--cableconnected1", "on"]
    end

-    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 => "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
@@ -66,7 +66,7 @@ Vagrant::configure("2") do |config|
    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
    vm.vm.hostname = "#{DOKKU_DOMAIN}"
    vm.vm.network :private_network, ip: DOKKU_IP
-    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git dos2unix > /dev/null"
+    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update >/dev/null && apt-get -qq -y install git dos2unix >/dev/null"
    vm.vm.provision :shell, :inline => "cd /vagrant/ && export DOKKU_BRANCH=`git symbolic-ref -q --short HEAD 2>/dev/null` && export DOKKU_TAG=`git describe --tags --exact-match 2>/dev/null` && cd /root/ && cp /vagrant/bootstrap.sh ./ && dos2unix bootstrap.sh && bash bootstrap.sh"
  end

@@ -92,7 +92,7 @@ Vagrant::configure("2") do |config|
    vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
    vm.vm.hostname = "#{DOKKU_DOMAIN}"
    vm.vm.network :private_network, ip: DOKKU_IP
-    vm.vm.provision :shell, :inline => "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 => "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 => "export IS_RELEASE=true && cd /root/dokku && make deb-all rpm-all"
  end

--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -32,7 +32,13 @@ install-requirements() {
  echo "--> Ensuring we have the proper dependencies"

  case "$DOKKU_DISTRO" in
-    debian | ubuntu)
+    debian)
+      if ! dpkg -l | grep -q software-properties-common; then
+        apt-get update -qq >/dev/null
+        apt-get -qq -y install software-properties-common
+      fi
+      ;;
+    ubuntu)
      if ! dpkg -l | grep -q software-properties-common; then
        apt-get update -qq >/dev/null
        apt-get -qq -y install software-properties-common
--- a/contrib/build-base.Dockerfile
+++ b/contrib/build-base.Dockerfile
@@ -0,0 +1,6 @@
+FROM ubuntu:14.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
--- a/contrib/build-dokku-update.Dockerfile
+++ b/contrib/build-dokku-update.Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM dokku/build-base:0.0.1

 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc

 ARG WORKDIR=/go/src/github.com/dokku/dokku

--- a/contrib/build-dokku.Dockerfile
+++ b/contrib/build-dokku.Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM dokku/build-base:0.0.1

 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc

 ARG GOLANG_VERSION

@@ -36,7 +36,7 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
    SKIP_GO_CLEAN=true \
    make version copyfiles \
    && rm -rf plugins/common/*.go  plugins/common/glide*  plugins/common/vendor/ \
-    && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update \
-            rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil rpm-dokku-update
+    && make deb-dokku deb-plugn deb-sshcommand deb-sigil \
+            rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil

 RUN ls -lha /tmp/
--- a/contrib/build-herokuish.Dockerfile
+++ b/contrib/build-herokuish.Dockerfile
@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM dokku/build-base:0.0.1

 ENV DEBIAN_FRONTEND=noninteractive

 RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc

 ARG WORKDIR=/go/src/github.com/dokku/dokku

--- a/contrib/dokku-installer.py
+++ b/contrib/dokku-installer.py
@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading

-VERSION = 'v0.14.2'
+VERSION = 'v0.14.5'

 hostname = ''
 try:
@@ -218,9 +218,9 @@ def main():
 PAGE = """
 <html>
 <head>
+  <meta charset="utf-8" />
  <title>Dokku Setup</title>
  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-  <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
  <style>
    .bd-callout {
      padding: 1.25rem;
@@ -306,44 +306,59 @@ PAGE = """

  <div id="error-output"></div>
  <script>
+    var $ = document.querySelector.bind(document)
+
    function setup() {
-      if ($.trim($("#key").val()) == "") {
+      if ($("#key").value.trim() == "") {
        alert("Your admin public key cannot be blank.")
        return
      }
-      if ($.trim($("#hostname").val()) == "") {
+      if ($("#hostname").value.trim() == "") {
        alert("Your hostname cannot be blank.")
        return
      }
-      data = $("#form").serialize()
-      $("input,textarea,button").prop("disabled", true);
-      $.post('/setup', data)
-        .done(function() {
-          $(".result").addClass('text-success');
-          $(".result").html("Success! Redirecting in 3 seconds. ..")
+      var data = new FormData($("#form"))
+
+      var inputs = [].slice.call(document.querySelectorAll("input, textarea, button"))
+      inputs.forEach(function (input) {
+        input.disabled = true
+      })
+
+      var result = $(".result")
+      fetch("/setup", {method: "POST", body: data})
+        .then(function(response) {
+            if (response.ok) {
+                return response.json()
+            } else {
+                throw new Error('Server returned error')
+            }
+        })
+        .then(function(response) {
+          result.classList.add("text-success");
+          result.textContent = "Success! Redirecting in 3 seconds. .."
          setTimeout(function() {
            window.location.href = "http://dokku.viewdocs.io/dokku~{VERSION}/deployment/application-deployment/";
          }, 3000);
        })
-        .fail(function(data) {
-          $(".result").addClass('text-danger');
-          $(".result").html("Something went wrong...")
-          $("#error-output").html(data.responseText)
-        });
+        .catch(function (error) {
+          result.classList.add("text-danger");
+          result.textContent = "Could not send the request"
+        })
    }
+
    function update() {
-      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
+      if ($("#vhost").matches(":checked") && $("#hostname").value.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);
+        $("#vhost").checked = false;
      }
-      if ($("#vhost").is(':checked')) {
-        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
+      if ($("#vhost").matches(':checked')) {
+        $("#example").textContent = "http://<app-name>."+$("#hostname").value
      } else {
-        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
+        $("#example").textContent = "http://"+$("#hostname").value+":<app-port>"
      }
    }
-    $("#vhost").change(update);
-    $("#hostname").change(update);
+    $("#vhost").addEventListener("change", update);
+    $("#hostname").addEventListener("input", update);
    update();
  </script>
 </body>
--- a/contrib/packer.json
+++ b/contrib/packer.json
@@ -19,7 +19,7 @@
        "sleep 30",

        "echo '--> Updating apt repositories'",
-        "sudo apt-get update -qq > /dev/null",
+        "sudo apt-get update -qq >/dev/null",

        "echo '--> Installing make requirement'",
        "sudo apt-get -qq -y install build-essential",
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -6,7 +6,7 @@ readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"

-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT

 log-info() {
  # shellcheck disable=SC2034
@@ -24,7 +24,7 @@ log-fail() {
  # shellcheck disable=SC2034
  declare desc="Log fail formatter"
  log-error "$*"
-  exit -1
+  exit 1
 }

 fn-build-dokku() {
@@ -49,7 +49,7 @@ fn-build-dokku() {
    --build-arg IS_RELEASE="$IS_RELEASE" \
    --build-arg PLUGIN_MAKE_TARGET="build" \
    --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
-    -f "contrib/build.Dockerfile" \
+    -f "contrib/build-dokku.Dockerfile" \
    -t "$NAME" .
  return "$?"
 }
--- a/contrib/release-dokku-update
+++ b/contrib/release-dokku-update
@@ -6,7 +6,7 @@ readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"

-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT

 log-info() {
  # shellcheck disable=SC2034
@@ -24,7 +24,7 @@ log-fail() {
  # shellcheck disable=SC2034
  declare desc="Log fail formatter"
  log-error "$*"
-  exit -1
+  exit 1
 }

 fn-build-dokku() {
@@ -32,7 +32,7 @@ fn-build-dokku() {

  pushd "$ROOT_DIR" >/dev/null
  docker build \
-    -f "contrib/update-build.Dockerfile" \
+    -f "contrib/build-dokku-update.Dockerfile" \
    -t dokku-update:build .
  return "$?"
 }
--- a/contrib/release-herokuish
+++ b/contrib/release-herokuish
@@ -6,7 +6,7 @@ readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"

-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT

 log-info() {
  # shellcheck disable=SC2034
@@ -24,7 +24,7 @@ log-fail() {
  # shellcheck disable=SC2034
  declare desc="Log fail formatter"
  log-error "$*"
-  exit -1
+  exit 1
 }

 fn-build-dokku() {
@@ -32,7 +32,7 @@ fn-build-dokku() {

  pushd "$ROOT_DIR" >/dev/null
  docker build \
-    -f "contrib/herokuish-build.Dockerfile" \
+    -f "contrib/build-herokuish.Dockerfile" \
    -t herokuish:build .
  return "$?"
 }
--- a/contrib/release-plugin
+++ b/contrib/release-plugin
@@ -4,7 +4,7 @@ set -eo pipefail

 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXX")"

-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT

 log-info() {
  # shellcheck disable=SC2034
@@ -22,7 +22,7 @@ log-fail() {
  # shellcheck disable=SC2034
  declare desc="Log fail formatter"
  log-error "$*"
-  exit -1
+  exit 1
 }

 fn-github-download-release() {
--- a/deb.mk
+++ b/deb.mk
@@ -64,7 +64,7 @@ export SSHCOMMAND_DESCRIPTION

 install-from-deb:
 	@echo "--> Initial apt-get update"
-	sudo apt-get update -qq > /dev/null
+	sudo apt-get update -qq >/dev/null
 	sudo apt-get install -qq -y apt-transport-https

 	@echo "--> Installing docker"
@@ -72,8 +72,8 @@ install-from-deb:

 	@echo "--> Installing dokku"
 	wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
-	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2> /dev/null || echo "trusty") main" | sudo tee /etc/apt/sources.list.d/dokku.list
-	sudo apt-get update -qq > /dev/null
+	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2>/dev/null || echo "trusty") main" | sudo tee /etc/apt/sources.list.d/dokku.list
+	sudo apt-get update -qq >/dev/null
 	sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku

 deb-all: deb-setup deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update
@@ -82,9 +82,9 @@ deb-all: deb-setup deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil de

 deb-setup:
 	@echo "-> Updating deb repository and installing build requirements"
-	@sudo apt-get update -qq > /dev/null
-	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -qq -y gcc git build-essential wget ruby-dev ruby1.9.1 lintian > /dev/null 2>&1
-	@command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+	@sudo apt-get update -qq >/dev/null
+	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -qq -y gcc git build-essential wget ruby-dev ruby1.9.1 lintian >/dev/null 2>&1
+	@command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
 	@ssh -o StrictHostKeyChecking=no git@github.com || true

 deb-herokuish:
@@ -95,9 +95,9 @@ deb-herokuish:
 	@echo "#!/usr/bin/env bash" >> /tmp/tmp/post-install
 	@echo "sleep 5" >> /tmp/tmp/post-install
 	@echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
 	@echo "sudo docker pull gliderlabs/herokuish:v${HEROKUISH_VERSION} && sudo docker tag gliderlabs/herokuish:v${HEROKUISH_VERSION} gliderlabs/herokuish:latest" >> /tmp/tmp/post-install

 	@echo "-> Creating $(HEROKUISH_PACKAGE_NAME)"
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Package: dokku
-Version: 0.14.2
+Version: 0.14.5
 Section: web
 Priority: optional
 Architecture: amd64
--- a/docs/advanced-usage/plugin-management.md
+++ b/docs/advanced-usage/plugin-management.md
@@ -31,31 +31,31 @@ dokku plugin

 ```
 plugn: dev
-  00_dokku-standard    0.14.2 enabled    dokku core standard plugin
-  20_events            0.14.2 enabled    dokku core events logging plugin
-  apps                 0.14.2 enabled    dokku core apps plugin
-  build-env            0.14.2 enabled    dokku core build-env plugin
-  certs                0.14.2 enabled    dokku core certificate management plugin
-  checks               0.14.2 enabled    dokku core checks plugin
-  common               0.14.2 enabled    dokku core common plugin
-  config               0.14.2 enabled    dokku core config plugin
-  docker-options       0.14.2 enabled    dokku core docker-options plugin
-  domains              0.14.2 enabled    dokku core domains plugin
-  enter                0.14.2 enabled    dokku core enter plugin
-  git                  0.14.2 enabled    dokku core git plugin
-  logs                 0.14.2 enabled    dokku core logs plugin
-  named-containers     0.14.2 enabled    dokku core named containers plugin
-  network              0.14.2 enabled    dokku core network plugin
-  nginx-vhosts         0.14.2 enabled    dokku core nginx-vhosts plugin
-  plugin               0.14.2 enabled    dokku core plugin plugin
-  proxy                0.14.2 enabled    dokku core proxy plugin
-  ps                   0.14.2 enabled    dokku core ps plugin
-  repo                 0.14.2 enabled    dokku core repo plugin
-  shell                0.14.2 enabled    dokku core shell plugin
-  ssh-keys             0.14.2 enabled    dokku core ssh-keys plugin
-  storage              0.14.2 enabled    dokku core storage plugin
-  tags                 0.14.2 enabled    dokku core tags plugin
-  tar                  0.14.2 enabled    dokku core tar plugin
+  00_dokku-standard    0.14.5 enabled    dokku core standard plugin
+  20_events            0.14.5 enabled    dokku core events logging plugin
+  apps                 0.14.5 enabled    dokku core apps plugin
+  build-env            0.14.5 enabled    dokku core build-env plugin
+  certs                0.14.5 enabled    dokku core certificate management plugin
+  checks               0.14.5 enabled    dokku core checks plugin
+  common               0.14.5 enabled    dokku core common plugin
+  config               0.14.5 enabled    dokku core config plugin
+  docker-options       0.14.5 enabled    dokku core docker-options plugin
+  domains              0.14.5 enabled    dokku core domains plugin
+  enter                0.14.5 enabled    dokku core enter plugin
+  git                  0.14.5 enabled    dokku core git plugin
+  logs                 0.14.5 enabled    dokku core logs plugin
+  named-containers     0.14.5 enabled    dokku core named containers plugin
+  network              0.14.5 enabled    dokku core network plugin
+  nginx-vhosts         0.14.5 enabled    dokku core nginx-vhosts plugin
+  plugin               0.14.5 enabled    dokku core plugin plugin
+  proxy                0.14.5 enabled    dokku core proxy plugin
+  ps                   0.14.5 enabled    dokku core ps plugin
+  repo                 0.14.5 enabled    dokku core repo plugin
+  shell                0.14.5 enabled    dokku core shell plugin
+  ssh-keys             0.14.5 enabled    dokku core ssh-keys plugin
+  storage              0.14.5 enabled    dokku core storage plugin
+  tags                 0.14.5 enabled    dokku core tags plugin
+  tar                  0.14.5 enabled    dokku core tar plugin
 ```

 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.
--- a/docs/assets/favicons/browserconfig.xml
+++ b/docs/assets/favicons/browserconfig.xml
@@ -2,10 +2,10 @@
 <browserconfig>
  <msapplication>
    <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/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.14.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.5\/docs\/assets\/favicons\/android-chrome-36x36.png",
            "sizes": "36x36",
            "type": "image\/png",
            "density": "0.75"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.5\/docs\/assets\/favicons\/android-chrome-48x48.png",
            "sizes": "48x48",
            "type": "image\/png",
            "density": "1.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.5\/docs\/assets\/favicons\/android-chrome-72x72.png",
            "sizes": "72x72",
            "type": "image\/png",
            "density": "1.5"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.5\/docs\/assets\/favicons\/android-chrome-96x96.png",
            "sizes": "96x96",
            "type": "image\/png",
            "density": "2.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.5\/docs\/assets\/favicons\/android-chrome-144x144.png",
            "sizes": "144x144",
            "type": "image\/png",
            "density": "3.0"
        },
        {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.5\/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
@@ -39,13 +39,13 @@ h1 {
  font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/dokku.png);
  text-indent: 40px;
 }
 .blurb {
  color: #424242;
  background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/gplaypattern.png);
  padding: 45px 0;
  text-align: center;
 }
--- a/docs/assets/versions.json
+++ b/docs/assets/versions.json
@@ -11,6 +11,6 @@
    "0.11.6", 
    "0.12.13", 
    "0.13.4", 
-    "0.14.2"
+    "0.14.5"
  ]
 }
--- a/docs/configuration/domains.md
+++ b/docs/configuration/domains.md
@@ -88,12 +88,12 @@ dokku domains:report
 ```
 =====> node-js-app domains information
       Domains app enabled: true
-       Domains app vhosts:  ruby-sample.dokku.org
+       Domains app vhosts:  node-js-sample.dokku.org
       Domains global enabled: true
       Domains global vhosts: dokku.org
 =====> python-sample domains information
       Domains app enabled: true
-       Domains app vhosts:  ruby-sample.dokku.org
+       Domains app vhosts:  python-sample.dokku.org
       Domains global enabled: true
       Domains global vhosts: dokku.org
 =====> ruby-sample domains information
--- a/docs/deployment/application-deployment.md
+++ b/docs/deployment/application-deployment.md
@@ -52,6 +52,9 @@ dokku postgres:link rails-database ruby-rails-sample

 ### Deploy the app

+> Warning: Your application _should_ respect the `PORT` environment variable or it may not respond to web requests.
+> Please see the [port management documentation](/docs/networking/port-management.md) for details.
+
 Now you can deploy the `ruby-rails-sample` app to your Dokku server. All you have to do is add a remote to name the app. Applications are created on-the-fly on the Dokku server.

 ```shell
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -45,7 +45,7 @@ hello_main_cmd() {
  # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@""
  local argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
-  [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
+  [[ -n $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
  set -- $cmd $@
  ##

@@ -73,7 +73,7 @@ hello_world_cmd() {
  # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@""
  local argv=("$@")
  [[ ${argv[0]} == "$cmd" ]] && shift 1
-  [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
+  [[ -n $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
  set -- $cmd $@
  ##

--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -760,7 +760,7 @@ APP="$1"; verify_app_name "$APP"
 TMP_WORK_DIR="$2"
 REV="$3" # optional, may not be sent for tar-based builds

-pushd "$TMP_WORK_DIR" > /dev/null
+pushd "$TMP_WORK_DIR" >/dev/null
 touch Procfile
 echo "clock: some-command" >> Procfile
 ```
@@ -804,12 +804,12 @@ verify_app_name "$APP"
 dokku_log_info1 "Installing $CONTAINER_PACKAGE..."

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

 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
+docker commit $ID $IMAGE >/dev/null
 ```

 ### `post-release-dockerfile`
@@ -919,7 +919,7 @@ verify_app_name "$APP"
 dokku_log_info1 "Running gulp"
 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
+docker commit $id $IMAGE >/dev/null
 dokku_log_info1 "Building UI Complete"
 ```

@@ -995,12 +995,12 @@ verify_app_name "$APP"
 dokku_log_info1 "Installing GraphicsMagick..."

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

 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
+docker commit $ID $IMAGE >/dev/null
 ```

 ### `pre-release-dockerfile`
@@ -1152,7 +1152,7 @@ APP=${refname/*\//}.$reference_app

 if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
  REFERENCE_REPO="$DOKKU_ROOT/$reference_app"
-  git clone --bare --shared --reference "$REFERENCE_REPO" "$REFERENCE_REPO" "$DOKKU_ROOT/$APP" > /dev/null
+  git clone --bare --shared --reference "$REFERENCE_REPO" "$REFERENCE_REPO" "$DOKKU_ROOT/$APP" >/dev/null
 fi
 plugn trigger receive-app $APP $newrev
 ```
--- a/docs/development/release-process.md
+++ b/docs/development/release-process.md
@@ -7,7 +7,7 @@ To propose a release, the following tasks need to be performed:
 ```shell
 export PACKAGECLOUD_TOKEN=SOME_TOKEN
 # supports major/minor/patch/betafish
-contrib/release
+contrib/release-dokku
 ```

 > If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.14.2-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.14.5-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'
--- a/docs/getting-started/install/debian.md
+++ b/docs/getting-started/install/debian.md
@@ -4,7 +4,7 @@ As of 0.3.18, Dokku defaults to being installed via Debian package. While certai

 ```shell
 # install prerequisites
-sudo apt-get update -qq > /dev/null
+sudo apt-get update -qq >/dev/null
 sudo apt-get install -qq -y apt-transport-https

 # install docker
@@ -12,10 +12,10 @@ wget -nv -O - https://get.docker.com/ | sh

 # install dokku
 wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
-OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
+OS_ID="$(lsb_release -cs 2>/dev/null || echo "trusty")"
 echo "trusty utopic vivid wily xenial yakkety zesty artful bionic" | grep -q "$OS_ID" || OS_ID="trusty"
 echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ ${OS_ID} main" | sudo tee /etc/apt/sources.list.d/dokku.list
-sudo apt-get update -qq > /dev/null
+sudo apt-get update -qq >/dev/null
 sudo apt-get install -qq -y dokku
 sudo dokku plugin:install-dependencies --core
 ```
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -21,8 +21,8 @@ To install the latest stable version of Dokku, you can run the following shell c

 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh;
-sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.5/bootstrap.sh;
+sudo DOKKU_TAG=v0.14.5 bash bootstrap.sh
 ```

 The installation process takes about 5-10 minutes, depending upon internet connection speed.
--- a/docs/home.html
+++ b/docs/home.html
@@ -10,30 +10,30 @@
    <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.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/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.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/favicons/browserconfig.xml">
    <meta name="theme-color" content="#ffffff">

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <style>
      .sponsors {
@@ -127,12 +127,12 @@
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.14.5/bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.14.5 bash bootstrap.sh</span>
          </p>
          <p class="line">
            <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
@@ -164,7 +164,7 @@
          <p class="line">
            <span class="path"></span>
            <span class="prompt">$</span>
-            <span class="command">export OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"</span>
+            <span class="command">export OS_ID="$(lsb_release -cs 2>/dev/null || echo "trusty")"</span>
          </p>
          <p class="line">
            <span class="path"></span>
--- a/docs/template.html
+++ b/docs/template.html
@@ -9,26 +9,26 @@
    <meta name="author" content="">
    <title>Dokku - The smallest PaaS implementation you've ever seen</title>

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

    <script>
@@ -42,7 +42,7 @@
    </script>

    <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.5/docs/assets/style.css" rel="stylesheet">
    <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
    <style>
--- a/2
+++ b/2
@@ -136,7 +136,7 @@ execute_dokku_cmd() {

  if [[ "$(readlink -f "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}")" == *core-plugins* ]]; then
    [[ ${argv[0]} == "$PLUGIN_CMD" ]] && shift 1
-    if [[ ! -z $DOKKU_APP_NAME ]]; then
+    if [[ -n $DOKKU_APP_NAME ]]; then
      if [[ "$PLUGIN_CMD" == config* ]] && [[ ${argv[1]} == "--no-restart" ]]; then
        shift 1
        set -- "--no-restart" "$DOKKU_APP_NAME" "$@"
--- a/plugins/00_dokku-standard/install
+++ b/plugins/00_dokku-standard/install
@@ -43,7 +43,7 @@ ExecStart=$dokku_path ps:restore
 WantedBy=docker.service
 EOF
  if command -v systemctl &>/dev/null; then
-    systemctl reenable dokku-redeploy
+    systemctl --quiet reenable dokku-redeploy
  fi
 fi

--- a/plugins/00_dokku-standard/plugin.toml
+++ b/plugins/00_dokku-standard/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core standard plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/20_events/plugin.toml
+++ b/plugins/20_events/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core events logging plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -10,7 +10,7 @@ get_phase_script() {
  declare IMAGE_TAG="$1" PHASE_SCRIPT_KEY="$2"
  local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_get_phase_script.XXXX")
  local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json"
-  trap 'rm -rf "$GET_PHASE_SCRIPT_TMP_WORK_DIR" > /dev/null' RETURN INT TERM
+  trap 'rm -rf "$GET_PHASE_SCRIPT_TMP_WORK_DIR" >/dev/null' RETURN INT TERM

  copy_from_image "$IMAGE" "app.json" "$GET_PHASE_SCRIPT_TMP_WORK_DIR" 2>/dev/null || true

@@ -68,14 +68,14 @@ execute_script() {
    COMMAND+=" if [[ ! -x \"$SCRIPT_BIN\" ]]; then "
    COMMAND+="   echo specified binary is not executable ; "
    COMMAND+="   exit 1 ; "
-    COMMAND+=" fi "
+    COMMAND+=" fi ; "
  fi

  COMMAND+=" $SCRIPT_CMD || exit 1;"
  COMMAND+=" if [[ -d '/cache' ]]; then "
  COMMAND+="   echo removing installation cache... ; "
  COMMAND+="   rm -f /tmp/cache ; "
-  COMMAND+=" fi "
+  COMMAND+=" fi ; "

  local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
  local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
--- a/plugins/app-json/plugin.toml
+++ b/plugins/app-json/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core app-json plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/apps/plugin.toml
+++ b/plugins/apps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core apps plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/build-env/plugin.toml
+++ b/plugins/build-env/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core build-env plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/certs/plugin.toml
+++ b/plugins/certs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core certificate management plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/certs/subcommands/add
+++ b/plugins/certs/subcommands/add
@@ -44,7 +44,7 @@ certs_set() {
  elif is_tar_import; then
    local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs_set.XXXX")
    pushd "$CERTS_SET_TMP_WORK_DIR" &>/dev/null
-    trap 'popd &> /dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR > /dev/null' RETURN
+    trap 'popd &>/dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR >/dev/null' RETURN
    tar xvf - <&0

    local CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f | grep ".crt$")
--- a/plugins/certs/subcommands/generate
+++ b/plugins/certs/subcommands/generate
@@ -15,7 +15,7 @@ certs_generate_cmd() {
  if [[ ! -f "$APP_SSL_PATH/server.key" ]] && [[ ! -f "$APP_SSL_PATH/server.crt" ]]; then
    local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs.XXXXXXXXX")
    pushd "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null
-    trap 'popd &> /dev/null || true; rm -rf "$CERTS_GENERATE_TMP_WORK_DIR" > /dev/null' INT TERM EXIT
+    trap 'popd &>/dev/null || true; rm -rf "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null' INT TERM EXIT

    openssl genrsa -out server.key 2048
    openssl req -new -key server.key -out server.csr
--- a/plugins/checks/install
+++ b/plugins/checks/install
@@ -12,15 +12,14 @@ migrate_checks_vars_0_5_0() {

  local app

-  dokku_log_info1 "Migrating zero downtime env variables to 0.5.x. The following variables have been deprecated"
-  dokku_log_info2 "DOKKU_SKIP_ALL_CHECKS DOKKU_SKIP_DEFAULT_CHECKS"
-  dokku_log_info2 "Please use dokku checks:[disable|enable] <app> to control zero downtime functionality"
-
  for app in $APPS; do
    local APP_SKIP_ALL_CHECKS=$(config_get "$app" DOKKU_SKIP_ALL_CHECKS || true)
    local APP_SKIP_DEFAULT_CHECKS=$(config_get "$app" DOKKU_SKIP_DEFAULT_CHECKS || true)

    if [[ "$APP_SKIP_ALL_CHECKS" == "true" ]] || [[ "$APP_SKIP_DEFAULT_CHECKS" == "true" ]] || [[ "$GLOBAL_SKIP_ALL_CHECKS" == "true" ]] || [[ "$GLOBAL_SKIP_DEFAULT_CHECKS" == "true" ]]; then
+      dokku_log_info1 "Migrating zero downtime env variables to 0.5.x. The following variables have been deprecated"
+      dokku_log_info2 "DOKKU_SKIP_ALL_CHECKS DOKKU_SKIP_DEFAULT_CHECKS"
+      dokku_log_info2 "Please use dokku checks:[disable|enable] <app> to control zero downtime functionality"
      dokku_log_info2 ""
      dokku_log_info2 "zero downtime checks disabled for app ($app)"
      config_set --no-restart "$app" DOKKU_CHECKS_ENABLED=0
@@ -34,23 +33,19 @@ migrate_checks_vars_0_5_0() {
    dokku_log_info1 "Removing global zero downtime settings"
    config_unset --global DOKKU_SKIP_ALL_CHECKS DOKKU_SKIP_DEFAULT_CHECKS
  fi
-  dokku_log_info2 "Migration complete"
-  dokku_log_info2 ""
 }

-migrate_checks_vars_0_5_0 "$@"
-
 migrate_checks_vars_0_6_0() {
  declare desc="migrates CHECKS config variables from 0.5.x to support fully-disabled zero-downtime checks"
  local APPS="$(dokku_apps)"

  local app

-  dokku_log_info1 "Migrating zero downtime env variables to 0.6.x. The following variables will be migrated"
-  dokku_log_info2 "DOKKU_CHECKS_ENABLED -> DOKKU_CHECKS_SKIPPED"
  for app in $APPS; do
    local APP_DOKKU_CHECKS_ENABLED=$(config_get "$app" DOKKU_CHECKS_ENABLED || true)
    if [[ $APP_DOKKU_CHECKS_ENABLED ]]; then
+      dokku_log_info1 "Migrating zero downtime env variables to 0.6.x. The following variables will be migrated"
+      dokku_log_info2 "DOKKU_CHECKS_ENABLED -> DOKKU_CHECKS_SKIPPED"
      if [[ "$APP_DOKKU_CHECKS_ENABLED" == "0" ]]; then
        dokku_log_info2 ""
        dokku_log_info2 "zero downtime checks disabled for app ($app)"
@@ -59,8 +54,7 @@ migrate_checks_vars_0_6_0() {
      config_unset --no-restart "$app" DOKKU_CHECKS_ENABLED || true
    fi
  done
-  dokku_log_info2 "Migration complete"
-  dokku_log_info2 ""
 }

+migrate_checks_vars_0_5_0 "$@"
 migrate_checks_vars_0_6_0 "$@"
--- a/plugins/checks/plugin.toml
+++ b/plugins/checks/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core checks plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -168,7 +168,7 @@ dokku_container_log_verbose_quiet() {
 is_valid_app_name() {
  declare desc="verify app name format"
  local APP="$1"
-  [[ ! -n "$APP" ]] && dokku_log_fail "APP must not be null"
+  [[ -z "$APP" ]] && dokku_log_fail "APP must not be null"
  if [[ "$APP" =~ ^[a-z].* ]] || [[ "$APP" =~ ^[0-9].* ]]; then
    if [[ ! $APP =~ [A-Z] ]] && [[ ! $APP =~ [:] ]]; then
      return 0
@@ -1049,7 +1049,7 @@ suppress_output() {
  declare desc="suppress all output from a given command unless there is an error"
  local TMP_COMMAND_OUTPUT
  TMP_COMMAND_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_COMMAND_OUTPUT" > /dev/null' RETURN INT TERM EXIT
+  trap 'rm -rf "$TMP_COMMAND_OUTPUT" >/dev/null' RETURN INT TERM EXIT

  "$@" >"$TMP_COMMAND_OUTPUT" 2>&1 || {
    local exit_code="$?"
--- a/plugins/common/plugin.toml
+++ b/plugins/common/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core common plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/config/Makefile
+++ b/plugins/config/Makefile
@@ -9,7 +9,7 @@ build-in-docker: clean
 		-v $$PWD/../..:$(GO_REPO_ROOT) \
 		-w $(GO_REPO_ROOT)/plugins/config \
 		$(BUILD_IMAGE) \
-		bash -c "GO_ARGS='$(GO_ARGS)' make build" || exit $$?
+		bash -c "GO_ARGS='$(GO_ARGS)' make -j4 build" || exit $$?

 build: commands subcommands

--- a/plugins/config/plugin.toml
+++ b/plugins/config/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core config plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/config/src/commands/commands.go
+++ b/plugins/config/src/commands/commands.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"

+	"github.com/dokku/dokku/plugins/common"
 	"github.com/dokku/dokku/plugins/config"
 	columnize "github.com/ryanuber/columnize"
 )
@@ -43,10 +44,18 @@ func main() {
 		merged := args.Bool("merged", false, "--merged: display the app's environment merged with the global environment")
 		args.Parse(os.Args[2:])
 		config.CommandShow(args.Args(), *global, *shell, *export, *merged)
-	case "help":
-		fmt.Print("\n    config, Manages global and app-specific config vars\n")
 	case "config:help":
 		usage()
+	case "help":
+		command := common.NewShellCmd(fmt.Sprintf("ps -o command= %d", os.Getppid()))
+		command.ShowOutput = false
+		output, err := command.Output()
+
+		if err == nil && strings.Contains(string(output), "--all") {
+			fmt.Println(helpContent)
+		} else {
+			fmt.Print("\n    config, Manages global and app-specific config vars\n")
+		}
 	default:
 		dokkuNotImplementExitCode, err := strconv.Atoi(os.Getenv("DOKKU_NOT_IMPLEMENTED_EXIT"))
 		if err != nil {
@@ -58,11 +67,11 @@ func main() {
 }

 func usage() {
+	fmt.Println(helpHeader)
 	config := columnize.DefaultConfig()
 	config.Delim = ","
 	config.Prefix = "    "
 	config.Empty = ""
 	content := strings.Split(helpContent, "\n")[1:]
-	fmt.Println(helpHeader)
 	fmt.Println(columnize.Format(content, config))
 }
--- a/plugins/docker-options/docker-args-deploy
+++ b/plugins/docker-options/docker-args-deploy
@@ -32,7 +32,7 @@ docker_args() {
      local line
      read -r line || local DONE=true

-      [[ ! -n "$line" ]] && continue
+      [[ -z "$line" ]] && continue

      # shellcheck disable=SC1001
      case "$line" in
--- a/plugins/docker-options/plugin.toml
+++ b/plugins/docker-options/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core docker-options plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/domains/functions
+++ b/plugins/domains/functions
@@ -248,7 +248,7 @@ get_default_vhosts() {
      if ! ([[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]]); then
        local SUBDOMAIN=${APP/%\.${VHOST}/}
        local hostname=$(: | plugn trigger nginx-hostname "$APP" "$SUBDOMAIN" "$VHOST")
-        if [[ ! -n $hostname ]]; then
+        if [[ -z $hostname ]]; then
          if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then
            local hostname="${APP/\//-}"
          else
--- a/plugins/domains/plugin.toml
+++ b/plugins/domains/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core domains plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/enter/plugin.toml
+++ b/plugins/enter/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core enter plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/enter/subcommands/default
+++ b/plugins/enter/subcommands/default
@@ -25,7 +25,7 @@ enter_default_cmd() {

  if [[ "$3" == "--container-id" ]]; then
    local DOKKU_APP_CIDS=($(get_app_container_ids "$APP"))
-    if [[ ! -n "$4" ]]; then
+    if [[ -z "$4" ]]; then
      dokku_log_warn "No container id specified."
      dokku_log_fail "Available ids for app ($APP): ${DOKKU_APP_CIDS[*]}"
    fi
@@ -38,7 +38,7 @@ enter_default_cmd() {
  else
    local DOKKU_APP_CIDS=($(get_app_container_ids "$APP" "$CONTAINER_TYPE"))
    local ID=${DOKKU_APP_CIDS[0]}
-    if [[ ! -n $ID ]]; then
+    if [[ -z $ID ]]; then
      dokku_log_warn "No containers found for type '$CONTAINER_TYPE'"
      dokku_log_fail "Available types for app ($APP): ${AVAILABLE_CONTAINER_TYPES[*]}"
    fi
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -32,7 +32,7 @@ git_build_app_repo() {

  # clean up after ourselves
  local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_git.XXXX")
-  trap 'rm -rf "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+  trap 'rm -rf "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT

  local TMP_TAG="dokku/$REV"
  chmod 755 "$GIT_BUILD_APP_REPO_TMP_WORK_DIR"
--- a/plugins/git/plugin.toml
+++ b/plugins/git/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core git plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/logs/plugin.toml
+++ b/plugins/logs/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core logs plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/network/Makefile
+++ b/plugins/network/Makefile
@@ -9,9 +9,10 @@ build-in-docker: clean
 		-v $$PWD/../..:$(GO_REPO_ROOT) \
 		-w $(GO_REPO_ROOT)/plugins/network \
 		$(BUILD_IMAGE) \
-		bash -c "GO_ARGS='$(GO_ARGS)' make build" || exit $$?
+		bash -c "GO_ARGS='$(GO_ARGS)' make -j4 build" || exit $$?

-build: commands subcommands triggers triggers-copy
+build: commands subcommands triggers
+	$(MAKE) triggers-copy

 commands: **/**/commands.go
 	go build $(GO_ARGS) -o commands src/commands/commands.go
--- a/plugins/network/plugin.toml
+++ b/plugins/network/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core network plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/network/src/commands/commands.go
+++ b/plugins/network/src/commands/commands.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"

+	"github.com/dokku/dokku/plugins/common"
 	columnize "github.com/ryanuber/columnize"
 )

@@ -34,7 +35,15 @@ func main() {
 	case "network", "network:help":
 		usage()
 	case "help":
-		fmt.Print("\n    network, Manages network settings for an app\n")
+		command := common.NewShellCmd(fmt.Sprintf("ps -o command= %d", os.Getppid()))
+		command.ShowOutput = false
+		output, err := command.Output()
+
+		if err == nil && strings.Contains(string(output), "--all") {
+			fmt.Println(helpContent)
+		} else {
+			fmt.Print("\n    network, Manages network settings for an app\n")
+		}
 	default:
 		dokkuNotImplementExitCode, err := strconv.Atoi(os.Getenv("DOKKU_NOT_IMPLEMENTED_EXIT"))
 		if err != nil {
@@ -46,11 +55,11 @@ func main() {
 }

 func usage() {
+	fmt.Println(helpHeader)
 	config := columnize.DefaultConfig()
 	config.Delim = ","
 	config.Prefix = "    "
 	config.Empty = ""
 	content := strings.Split(helpContent, "\n")[1:]
-	fmt.Println(helpHeader)
 	fmt.Println(columnize.Format(content, config))
 }
--- a/plugins/nginx-vhosts/dependencies
+++ b/plugins/nginx-vhosts/dependencies
@@ -23,12 +23,17 @@ nginx_needs_upgrade() {
  echo $NEEDS_UPGRADE
 }

+nginx_install() {
+  declare desc="install nginx and dnsutils"
+  export DEBIAN_FRONTEND=noninteractive
+  apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y nginx dnsutils
+}
+
 nginx_dependencies() {
  declare desc="installs dependencies for the nginx-vhosts plugin"
  case "$DOKKU_DISTRO" in
    debian)
-      export DEBIAN_FRONTEND=noninteractive
-      apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y nginx dnsutils
+      nginx_install
      ;;

    ubuntu)
@@ -38,17 +43,22 @@ nginx_dependencies() {
        return
      fi

-      [[ -z "$CIRCLECI" ]] && apt-get install -qq -y software-properties-common python-software-properties
-      [[ -n "$CIRCLECI" ]] && aptitude install -q -y software-properties-common python-software-properties
+      if ! which nginx >/dev/null 2>&1; then
+        nginx_install
+        return
+      fi

      ubuntu_year=$(lsb_release -d | cut -d ' ' -f 2 | awk '{split($0,a,"."); print a[1]}')
      ubuntu_month=$(lsb_release -d | cut -d ' ' -f 2 | awk '{split($0,a,"."); print a[2]}')
      [[ "$ubuntu_year" -ge "16" ]] && exit 0
      [[ "$ubuntu_year" -eq "15" ]] && [[ "$ubuntu_month" -eq "10" ]] && exit 0

+      [[ -z "$CIRCLECI" ]] && apt-get install -qq -y software-properties-common python-software-properties
+      [[ -n "$CIRCLECI" ]] && aptitude install -q -y software-properties-common python-software-properties
+
      add-apt-repository -y ppa:nginx/stable
      apt-get update -qq >/dev/null
-      apt-get install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes -qq -y nginx dnsutils
+      nginx_install
      ;;

    opensuse)
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -304,7 +304,7 @@ nginx_build_config() {
    local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXXXX")
    local CUSTOM_NGINX_TEMPLATE="$NGINX_BUILD_CONFIG_TMP_WORK_DIR/$NGINX_TEMPLATE_NAME"
    # shellcheck disable=SC2086
-    trap 'rm -rf $NGINX_CONF $NGINX_BUILD_CONFIG_TMP_WORK_DIR > /dev/null' RETURN INT TERM EXIT
+    trap 'rm -rf $NGINX_CONF $NGINX_BUILD_CONFIG_TMP_WORK_DIR >/dev/null' RETURN INT TERM EXIT

    get_custom_nginx_template "$APP" "$CUSTOM_NGINX_TEMPLATE" 2>/dev/null
    if [[ -f "$CUSTOM_NGINX_TEMPLATE" ]]; then
--- a/plugins/nginx-vhosts/install
+++ b/plugins/nginx-vhosts/install
@@ -59,7 +59,7 @@ fi

 # revert dokku group changes
 gpasswd -a dokku adm
-chgrp -R adm /var/log/nginx
+chgrp --quiet -R adm /var/log/nginx
 gpasswd -M "$(egrep ^dokku: /etc/group | awk -F ":" '{ print $4 }')" dokku
 [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/create 0640 www-data dokku/create 0640 www-data adm/g' /etc/logrotate.d/nginx

@@ -73,12 +73,14 @@ cp "${PLUGIN_CORE_AVAILABLE_PATH}/nginx-vhosts/templates/500-error.html" "${DOKK
 [[ -f /etc/logrotate.d/nginx ]] && sed -i -e 's/invoke-rc.d/service/g' /etc/logrotate.d/nginx

 # @TODO: Remove this after a few versions
-dokku_log_info1 "Migrating DOKKU_NGINX env variables. The following variables will be migrated"
-dokku_log_info2 "DOKKU_NGINX_PORT -> DOKKU_PROXY_PORT"
-dokku_log_info2 "DOKKU_NGINX_SSL_PORT -> DOKKU_PROXY_SSL_PORT"
 for app in $(dokku_apps); do
  nginx_port="$(config_get "$app" DOKKU_NGINX_PORT || true)"
  nginx_ssl_port="$(config_get "$app" DOKKU_NGINX_SSL_PORT || true)"
+  if [[ -n "$nginx_port" ]] || [[ -n "$nginx_ssl_port" ]]; then
+    dokku_log_info1 "Migrating DOKKU_NGINX env variables. The following variables will be migrated"
+    dokku_log_info2 "DOKKU_NGINX_PORT -> DOKKU_PROXY_PORT"
+    dokku_log_info2 "DOKKU_NGINX_SSL_PORT -> DOKKU_PROXY_SSL_PORT"
+  fi
  if [[ -n "$nginx_port" ]]; then
    dokku_log_info1 "Migrating DOKKU_NGINX_PORT to DOKKU_PROXY_PORT for $app"
    config_set --no-restart "$app" DOKKU_PROXY_PORT="$nginx_port"
@@ -90,7 +92,6 @@ for app in $(dokku_apps); do
    config_unset --no-restart "$app" DOKKU_NGINX_SSL_PORT
  fi
 done
-dokku_log_info2 "Migration complete"

 case "$DOKKU_DISTRO" in
  debian)
--- a/plugins/nginx-vhosts/internal-functions
+++ b/plugins/nginx-vhosts/internal-functions
@@ -28,7 +28,7 @@ nginx_vhosts_is_valid_nginx_config_func() {
  declare APP="$1"
  local VALIDATE_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/validate.conf.sigil"
  local TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_OUTPUT" > /dev/null' RETURN INT TERM EXIT
+  trap 'rm -rf "$TMP_OUTPUT" >/dev/null' RETURN INT TERM EXIT

  sigil -f "$VALIDATE_TEMPLATE" NGINX_CONF="$DOKKU_ROOT/$APP/nginx.conf" | cat -s >"$TMP_OUTPUT"
  sudo "$NGINX_LOCATION" -t -c "$TMP_OUTPUT" 2>/dev/null
--- a/plugins/nginx-vhosts/plugin.toml
+++ b/plugins/nginx-vhosts/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core nginx-vhosts plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/plugin/plugin.toml
+++ b/plugins/plugin/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core plugin plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/proxy/plugin.toml
+++ b/plugins/proxy/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core proxy plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -69,7 +69,7 @@ generate_scale_file() {
    dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..."

    local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_scale.XXXX")
-    trap 'rm -rf "$GENERATE_SCALE_FILE_TMP_WORK_DIR" > /dev/null' RETURN
+    trap 'rm -rf "$GENERATE_SCALE_FILE_TMP_WORK_DIR" >/dev/null' RETURN

    if [[ -f $DOKKU_PROCFILE ]]; then
      while read -r line || [[ -n "$line" ]]; do
--- a/plugins/ps/plugin.toml
+++ b/plugins/ps/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ps plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/repo/Makefile
+++ b/plugins/repo/Makefile
@@ -9,7 +9,7 @@ build-in-docker: clean
 		-v $$PWD/../..:$(GO_REPO_ROOT) \
 		-w $(GO_REPO_ROOT)/plugins/repo \
 		$(BUILD_IMAGE) \
-		bash -c "GO_ARGS='$(GO_ARGS)' make build" || exit $$?
+		bash -c "GO_ARGS='$(GO_ARGS)' make -j4 build" || exit $$?

 build: commands subcommands

--- a/plugins/repo/plugin.toml
+++ b/plugins/repo/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core repo plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/repo/src/commands/commands.go
+++ b/plugins/repo/src/commands/commands.go
@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"strings"

+	"github.com/dokku/dokku/plugins/common"
 	columnize "github.com/ryanuber/columnize"
 )

@@ -32,7 +33,15 @@ func main() {
 	case "repo", "repo:help":
 		usage()
 	case "help":
-		fmt.Print("\n    repo, Runs commands that interact with the app's repo\n")
+		command := common.NewShellCmd(fmt.Sprintf("ps -o command= %d", os.Getppid()))
+		command.ShowOutput = false
+		output, err := command.Output()
+
+		if err == nil && strings.Contains(string(output), "--all") {
+			fmt.Println(helpContent)
+		} else {
+			fmt.Print("\n    repo, Runs commands that interact with the app's repo\n")
+		}
 	default:
 		dokkuNotImplementExitCode, err := strconv.Atoi(os.Getenv("DOKKU_NOT_IMPLEMENTED_EXIT"))
 		if err != nil {
@@ -44,11 +53,11 @@ func main() {
 }

 func usage() {
+	fmt.Println(helpHeader)
 	config := columnize.DefaultConfig()
 	config.Delim = ","
 	config.Prefix = "    "
 	config.Empty = ""
 	content := strings.Split(helpContent, "\n")[1:]
-	fmt.Println(helpHeader)
 	fmt.Println(columnize.Format(content, config))
 }
--- a/plugins/scheduler-docker-local/check-deploy
+++ b/plugins/scheduler-docker-local/check-deploy
@@ -121,6 +121,7 @@ scheduler-docker-local-check-deploy() {
    ! (is_container_status "$DOKKU_APP_CONTAINER_ID" "Running") && dokku_log_fail "App container failed to start!!"
    local container_restarts="$(docker inspect -f "{{ .RestartCount }}" "$DOKKU_APP_CONTAINER_ID")"
    if [[ $container_restarts -ne 0 ]]; then
+      docker container update --restart=no "$DOKKU_APP_CONTAINER_ID" &>/dev/null || true
      docker stop "$DOKKU_APP_CONTAINER_ID" || true
      dokku_log_fail "App container failed to start!!"
    fi
--- a/plugins/scheduler-docker-local/install
+++ b/plugins/scheduler-docker-local/install
@@ -40,7 +40,7 @@ Description=Run dokku-retire.service every 5 minutes
 OnCalendar=*:0/5
 EOF
    if command -v systemctl &>/dev/null; then
-      systemctl reenable dokku-redeploy
+      systemctl --quiet reenable dokku-retire
    fi
  else
    cat <<EOF >/etc/cron.d/dokku-retire
--- a/plugins/scheduler-docker-local/plugin.toml
+++ b/plugins/scheduler-docker-local/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core scheduler-docker-local plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -48,6 +48,10 @@ scheduler-docker-local-scheduler-deploy() {
      local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE")"
      for cid in $proctype_oldids; do
        dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)"
+
+        # Disable the container restart policy
+        docker container update --restart=no "$cid" &>/dev/null || true
+
        # shellcheck disable=SC2086
        docker stop $DOCKER_STOP_TIME_ARG "$cid" &>/dev/null
        # remove cid from oldids to skip the old container finish processing
@@ -107,7 +111,11 @@ scheduler-docker-local-scheduler-deploy() {
        declare CID="$1" PROC_TYPE="$2" CONTAINER_INDEX="$3"
        mkdir -p "${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP"
        echo "${CID} ${PROC_TYPE}.${CONTAINER_INDEX}" >>"${DOKKU_LIB_ROOT}/data/scheduler-docker-local/$APP/failed-containers"
-        docker inspect "$CID" &>/dev/null && docker stop "$CID" >/dev/null && docker kill "$CID" &>/dev/null
+        docker inspect "$CID" &>/dev/null && {
+          # Disable the container restart policy
+          docker container update --restart=no "$CID" &>/dev/null || true
+          docker stop "$CID" >/dev/null && docker kill "$CID" &>/dev/null
+        }
        trap - INT TERM EXIT
        kill -9 $$
      }
@@ -169,6 +177,9 @@ scheduler-docker-local-scheduler-deploy() {
      trap '' INT HUP
      sleep "$WAIT"
      for oldid in $oldids; do
+        # Disable the container restart policy
+        docker container update --restart=no "$oldid" &>/dev/null || true
+
        # Attempt to stop, if that fails, then force a kill as docker seems
        # to not send SIGKILL as the docs would indicate. If that fails, move
        # on to the next.
--- a/plugins/scheduler-docker-local/scheduler-inspect
+++ b/plugins/scheduler-docker-local/scheduler-inspect
@@ -14,7 +14,7 @@ scheduler-docker-local-scheduler-inspect() {
  fi

  local TMP_INSPECT_CMD=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_INSPECT_CMD" > /dev/null' RETURN INT TERM EXIT
+  trap 'rm -rf "$TMP_INSPECT_CMD" >/dev/null' RETURN INT TERM EXIT
  cat >"$TMP_INSPECT_CMD" <<EOF
 import json
 import sys
--- a/plugins/scheduler-docker-local/scheduler-run
+++ b/plugins/scheduler-docker-local/scheduler-run
@@ -46,7 +46,7 @@ scheduler-docker-local-scheduler-run() {
  PROC_CMD=$(get_cmd_from_procfile "$APP" "$POTENTIAL_PROCFILE_KEY" || echo '')
  remove_procfile "$APP"

-  if [ ! -z "$PROC_CMD" ]; then
+  if [[ -n "$PROC_CMD" ]]; then
    dokku_log_info1 "Found '$POTENTIAL_PROCFILE_KEY' in Procfile, running that command"
    set -- "$PROC_CMD" "${@:2}"
  fi
--- a/plugins/scheduler-docker-local/scheduler-stop
+++ b/plugins/scheduler-docker-local/scheduler-stop
@@ -19,6 +19,10 @@ scheduler-docker-local-scheduler-stop() {
  [[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"

  if [[ -n "$DOKKU_APP_RUNNING_CONTAINER_IDS" ]]; then
+    # Disable the container restart policy
+    # shellcheck disable=SC2086
+    docker container update --restart=no $DOKKU_APP_RUNNING_CONTAINER_IDS &>/dev/null || true
+
    # shellcheck disable=SC2086
    docker stop $DOCKER_STOP_TIME_ARG $DOKKU_APP_RUNNING_CONTAINER_IDS >/dev/null || true
  fi
--- a/plugins/shell/plugin.toml
+++ b/plugins/shell/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core shell plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/ssh-keys/plugin.toml
+++ b/plugins/ssh-keys/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core ssh-keys plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/storage/plugin.toml
+++ b/plugins/storage/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core storage plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/tags/plugin.toml
+++ b/plugins/tags/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tags plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/plugins/tar/functions
+++ b/plugins/tar/functions
@@ -12,7 +12,7 @@ tar_build() {

  # clean up after ourselves
  local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_tar.XXXX")
-  trap 'rm -rf "$TAR_BUILD_TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+  trap 'rm -rf "$TAR_BUILD_TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT

  # extract tar file
  chmod 755 "$TAR_BUILD_TMP_WORK_DIR"
--- a/plugins/tar/plugin.toml
+++ b/plugins/tar/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core tar plugin"
-version = "0.14.2"
+version = "0.14.5"
 [plugin.config]
--- a/rpm.mk
+++ b/rpm.mk
@@ -14,9 +14,9 @@ rpm-all: rpm-setup rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil rp

 rpm-setup:
 	@echo "-> Installing rpm build requirements"
-	@sudo apt-get update -qq > /dev/null
-	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -qq -y gcc git build-essential wget ruby-dev ruby1.9.1 rpm > /dev/null 2>&1
-	@command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+	@sudo apt-get update -qq >/dev/null
+	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -qq -y gcc git build-essential wget ruby-dev ruby1.9.1 rpm >/dev/null 2>&1
+	@command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
 	@ssh -o StrictHostKeyChecking=no git@github.com || true

 rpm-herokuish:
@@ -29,9 +29,9 @@ rpm-herokuish:
 	@echo 'systemctl start docker' >> /tmp/tmp/post-install
 	@echo "sleep 5" >> /tmp/tmp/post-install
 	@echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
 	@echo "sudo docker pull gliderlabs/herokuish:v${HEROKUISH_VERSION} && sudo docker tag gliderlabs/herokuish:v${HEROKUISH_VERSION} gliderlabs/herokuish:latest" >> /tmp/tmp/post-install

 	@echo "-> Creating $(HEROKUISH_RPM_PACKAGE_NAME)"
--- a/tests.mk
+++ b/tests.mk
@@ -2,7 +2,7 @@ SYSTEM := $(shell sh -c 'uname -s 2>/dev/null')

 bats:
 ifeq ($(SYSTEM),Darwin)
-ifneq ($(shell bats --version > /dev/null 2>&1 ; echo $$?),0)
+ifneq ($(shell bats --version >/dev/null 2>&1 ; echo $$?),0)
 	brew install bats-core
 endif
 else
@@ -12,7 +12,7 @@ else
 endif

 shellcheck:
-ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0)
+ifneq ($(shell shellcheck --version >/dev/null 2>&1 ; echo $$?),0)
 ifeq ($(SYSTEM),Darwin)
 	brew install shellcheck
 else
@@ -23,7 +23,7 @@ endif
 endif

 shfmt:
-ifneq ($(shell shfmt --version > /dev/null 2>&1 ; echo $$?),0)
+ifneq ($(shell shfmt --version >/dev/null 2>&1 ; echo $$?),0)
 ifeq ($(shfmt),Darwin)
 	brew install shfmt
 else
@@ -34,7 +34,7 @@ endif
 endif

 xmlstarlet:
-ifneq ($(shell xmlstarlet --version > /dev/null 2>&1 ; echo $$?),0)
+ifneq ($(shell xmlstarlet --version >/dev/null 2>&1 ; echo $$?),0)
 ifeq ($(SYSTEM),Darwin)
 	brew install xmlstarlet
 else
@@ -51,7 +51,7 @@ ifdef ENABLE_DOKKU_TRACE
 	echo "export DOKKU_TRACE=1" >> /home/dokku/dokkurc
 endif
 	@echo "Setting dokku.me in /etc/hosts"
-	sudo /bin/bash -c "[[ `ping -c1 dokku.me > /dev/null 2>&1; echo $$?` -eq 0 ]] || echo \"127.0.0.1  dokku.me *.dokku.me www.test.app.dokku.me\" >> /etc/hosts"
+	sudo /bin/bash -c "[[ `ping -c1 dokku.me >/dev/null 2>&1; echo $$?` -eq 0 ]] || echo \"127.0.0.1  dokku.me *.dokku.me www.test.app.dokku.me\" >> /etc/hosts"

 	@echo "-----> Generating keypair..."
 	mkdir -p /root/.ssh
@@ -60,7 +60,7 @@ endif
 	chmod 600 /root/.ssh/dokku_test_rsa*

 	@echo "-----> Setting up ssh config..."
-ifneq ($(shell ls /root/.ssh/config > /dev/null 2>&1 ; echo $$?),0)
+ifneq ($(shell ls /root/.ssh/config >/dev/null 2>&1 ; echo $$?),0)
 	echo "Host dokku.me \\r\\n RequestTTY yes \\r\\n IdentityFile /root/.ssh/dokku_test_rsa" >> /root/.ssh/config
 	echo "Host 127.0.0.1 \\r\\n Port 22333 \\r\\n RequestTTY yes \\r\\n IdentityFile /root/.ssh/dokku_test_rsa" >> /root/.ssh/config
 else ifeq ($(shell grep dokku.me /root/.ssh/config),)
@@ -80,8 +80,8 @@ endif
 	cat /root/.ssh/dokku_test_rsa.pub | sudo sshcommand acl-add dokku test

 	@echo "-----> Intitial SSH connection to populate known_hosts..."
-	ssh -o StrictHostKeyChecking=no dokku@dokku.me help > /dev/null
-	ssh -o StrictHostKeyChecking=no dokku@127.0.0.1 help > /dev/null
+	ssh -o StrictHostKeyChecking=no dokku@dokku.me help >/dev/null
+	ssh -o StrictHostKeyChecking=no dokku@127.0.0.1 help >/dev/null

 ifeq ($(shell grep dokku.me /home/dokku/VHOST 2>/dev/null),)
 	@echo "-----> Setting default VHOST to dokku.me..."
@@ -239,5 +239,5 @@ test: setup-deploy-tests lint unit-tests deploy-tests

 test-ci:
 	@mkdir -p test-results/bats
-	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; circleci tests glob *.bats | circleci tests split --split-by=timings | xargs)"
-	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; circleci tests glob *.bats | circleci tests split --split-by=timings | xargs)
+	@cd tests/unit && echo "executing tests: $(shell cd tests/unit ; circleci tests glob *.bats | circleci tests split --split-by=timings --timings-type=classname | xargs)"
+	cd tests/unit && bats --formatter bats-format-junit -e -T -o ../../test-results/bats $(shell cd tests/unit ; circleci tests glob *.bats | circleci tests split --split-by=timings --timings-type=classname | xargs)
--- a/tests/bats-exec-test-single
+++ b/tests/bats-exec-test-single
@@ -44,7 +44,7 @@ main() {
  fi

  TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX")
-  trap 'rm -rf "$TMP_OUTPUT" > /dev/null' RETURN INT TERM EXIT
+  trap 'rm -rf "$TMP_OUTPUT" >/dev/null' RETURN INT TERM EXIT

  /usr/local/libexec/bats-preprocess <"$TEST_FILE" >"$TMP_OUTPUT"
  AVAILABLE_TESTS="$(fn-available-tests "$TMP_OUTPUT")"
--- a/tests/ci/setup.sh
+++ b/tests/ci/setup.sh
@@ -43,7 +43,7 @@ install_dokku() {
    return
  fi

-  "${ROOT_DIR}/contrib/release" build
+  "${ROOT_DIR}/contrib/release-dokku" build

  echo "dokku dokku/hostname string dokku.me" | sudo debconf-set-selections
  echo "dokku dokku/key_file string /root/.ssh/id_rsa.pub" | sudo debconf-set-selections
--- a/tests/test_deploy
+++ b/tests/test_deploy
@@ -30,7 +30,7 @@ TMP=$(mktemp -d "/tmp/$TARGET.XXXXX")
 rmdir "$TMP" && cp -r "$(dirname "$SELF")/$APP" "$TMP"

 pushd "$TMP" &>/dev/null || exit 1
-trap 'popd &> /dev/null || true; rm -rf "$TMP"' INT TERM EXIT
+trap 'popd &>/dev/null || true; rm -rf "$TMP"' INT TERM EXIT

 git init
 git config user.email "robot@example.com"
--- a/tests/unit/10_checks.bats
+++ b/tests/unit/10_checks.bats
@@ -17,7 +17,7 @@ teardown() {
 }

@test "(checks) checks" {
-  run /bin/bash -c "dokku checks $TEST_APP 2> /dev/null | grep $TEST_APP | xargs"
+  run /bin/bash -c "dokku checks $TEST_APP 2>/dev/null | grep $TEST_APP | xargs"
  echo "output: $output"
  echo "status: $status"
  assert_output "$TEST_APP none none"
--- a/tests/unit/10_tar.bats
+++ b/tests/unit/10_tar.bats
@@ -17,8 +17,8 @@ deploy_app_tar() {
  TMP=$(mktemp -d "/tmp/dokku.me.XXXXX")

  rmdir "$TMP" && cp -r "${BATS_TEST_DIRNAME}/../../tests/apps/$APP_TYPE" "$TMP"
-  pushd "$TMP" &> /dev/null || exit 1
-  trap 'popd &> /dev/null || true; rm -rf "$TMP"' RETURN INT TERM
+  pushd "$TMP" &>/dev/null || exit 1
+  trap 'popd &>/dev/null || true; rm -rf "$TMP"' RETURN INT TERM

  shift 1
  tar c . $* | ssh dokku@dokku.me tar:in $TEST_APP || destroy_app $?
--- a/tests/unit/20_docker-options.bats
+++ b/tests/unit/20_docker-options.bats
@@ -69,7 +69,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP 2> /dev/null | xargs"
+  run /bin/bash -c "dokku docker-options $TEST_APP 2>/dev/null | xargs"
  echo "output: $output"
  echo "status: $status"
  assert_output "Deploy options: --restart=on-failure:10"
@@ -88,7 +88,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP build 2> /dev/null"
+  run /bin/bash -c "dokku docker-options $TEST_APP build 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_output "Build options: none"
@@ -107,7 +107,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP deploy 2> /dev/null | xargs"
+  run /bin/bash -c "dokku docker-options $TEST_APP deploy 2>/dev/null | xargs"
  echo "output: $output"
  echo "status: $status"
  assert_output "Deploy options: --restart=on-failure:10"
@@ -126,7 +126,7 @@ teardown() {
  echo "output: $output"
  echo "status: $status"
  assert_success
-  run /bin/bash -c "dokku docker-options $TEST_APP run 2> /dev/null"
+  run /bin/bash -c "dokku docker-options $TEST_APP run 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_output "Run options: none"
--- a/tests/unit/20_domains.bats
+++ b/tests/unit/20_domains.bats
@@ -18,7 +18,7 @@ teardown() {

@test "(domains) domains" {
  dokku domains:setup $TEST_APP
-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null | grep ${TEST_APP}.dokku.me"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep ${TEST_APP}.dokku.me"
  echo "output: $output"
  echo "status: $status"
  assert_output "${TEST_APP}.dokku.me"
@@ -45,7 +45,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -61,7 +61,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -101,7 +101,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -119,7 +119,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -139,7 +139,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -157,7 +157,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -178,7 +178,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -191,7 +191,7 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2> /dev/null | egrep -qw '^global.dokku.me\$'"
+  run /bin/bash -c "dokku domains 2>/dev/null | egrep -qw '^global.dokku.me\$'"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -203,17 +203,17 @@ teardown() {
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2> /dev/null | grep -q global1.dokku.me"
+  run /bin/bash -c "dokku domains 2>/dev/null | grep -q global1.dokku.me"
  echo "output: $output"
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2> /dev/null | grep -q global2.dokku.me"
+  run /bin/bash -c "dokku domains 2>/dev/null | grep -q global2.dokku.me"
  echo "output: $output"
  echo "status: $status"
  assert_success

-  run /bin/bash -c "dokku domains 2> /dev/null | grep -q global3.dokku.me"
+  run /bin/bash -c "dokku domains 2>/dev/null | grep -q global3.dokku.me"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -239,7 +239,7 @@ teardown() {

  dokku domains:setup $TEST_APP

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
@@ -260,7 +260,7 @@ teardown() {

  dokku domains:setup $TEST_APP

-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null"
  echo "output: $output"
  echo "status: $status"
  assert_success
--- a/tests/unit/20_network.bats
+++ b/tests/unit/20_network.bats
@@ -24,7 +24,7 @@ assert_nonssl_domain() {

 assert_app_domain() {
  local domain=$1
-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null | grep -xF ${domain}"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep -xF ${domain}"
  echo "output: $output"
  echo "status: $status"
  assert_output "${domain}"
--- a/tests/unit/40_proxy.bats
+++ b/tests/unit/40_proxy.bats
@@ -24,7 +24,7 @@ assert_nonssl_domain() {

 assert_app_domain() {
  local domain=$1
-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null | grep -xF ${domain}"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep -xF ${domain}"
  echo "output: $output"
  echo "status: $status"
  assert_output "${domain}"
--- a/tests/unit/test_helper.bash
+++ b/tests/unit/test_helper.bash
@@ -196,7 +196,7 @@ assert_nonssl_domain() {

 assert_app_domain() {
  local domain=$1
-  run /bin/bash -c "dokku domains $TEST_APP 2> /dev/null | grep -xF ${domain}"
+  run /bin/bash -c "dokku domains $TEST_APP 2>/dev/null | grep -xF ${domain}"
  echo "output: $output"
  echo "status: $status"
  assert_output "${domain}"
@@ -224,7 +224,7 @@ deploy_app() {
  [[ -n "$CUSTOM_TEMPLATE" ]] && $CUSTOM_TEMPLATE $TEST_APP $TMP/$CUSTOM_PATH

  pushd "$TMP" &>/dev/null || exit 1
-  trap 'popd &> /dev/null || true; rm -rf "$TMP"' RETURN INT TERM
+  trap 'popd &>/dev/null || true; rm -rf "$TMP"' RETURN INT TERM

  git init
  git config user.email "robot@example.com"