Release 0.14.2

# History

## 0.14.2

Install/update via the bootstrap script:

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

### Bug Fixes

- #3395: @josegonzalez Correct early exit 1 in apps:report

### Documentation

- #3393: @jayjun Fix capitalization and formatting in installation guides
- #3392: @jayjun Fix wrong PostgreSQL environment variable in guide
- #3391: @josegonzalez Update all gpgkey paths to the new url

.circleci/config.yml

@@ -8,6 +8,7 @@ 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
@@ -16,9 +17,10 @@ jobs:
           sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
       - run: |
           case $CIRCLE_NODE_INDEX in
-            0) sudo -E make -e lint ;;
-            1) sudo -E make -e go-tests ci-go-coverage;;
-            2) sudo -E make -e deploy-test-checks-root deploy-test-config deploy-test-multi deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;
+            0) sudo -E make -e lint go-tests ci-go-coverage ;;
+            1) sudo -E make -e deploy-test-checks-root deploy-test-config ;;
+            2) sudo -E make -e deploy-test-multi ;;
+            3) sudo -E make -e deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;
           esac
       - run:
           shell: /bin/bash
@@ -26,3 +28,8 @@ jobs:
           no_output_timeout: 60m
       - store_artifacts:
           path: ./coverage.out
+      - store_artifacts:
+          path: ./test-results
+          destination: test-results
+      - store_test_results:
+          path: test-results

.dockerignore

@@ -3,8 +3,9 @@
 .git
 .vagrant
 contrib
+build
 docs
 tests
 !contrib/dokku-installer.py
 !contrib/dokku-update
-!contrib/bash-completion
+!contrib/bash-completion

.gitignore

@@ -4,8 +4,10 @@
 .ruby-version
 .idea/
 .vagrant
+build/
 data/
+test-results/
 stack.tgz
 tmp
 coverage.out
-contrib/dokku-update-version
+contrib/dokku-update-version

CONTRIBUTING.md

@@ -11,7 +11,7 @@ several ways to help out:
 * Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)
 * Come up with new ways to show off our [lovely logo](https://avatars1.githubusercontent.com/u/13455795)
 * Blog about different ways you are using dokku
-* [Sponsor](https://opencollective.com/dokku#support) the Dokku project financially
+* Sponsor the Dokku project financially on [OpenCollective](https://opencollective.com/dokku#support) or [Patreon](https://www.patreon.com/dokku)
 
 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.

HISTORY.md

@@ -1,5 +1,244 @@
 # History
 
+## 0.14.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh
+sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3395: @josegonzalez Correct early exit 1 in apps:report
+
+### Documentation
+
+- #3393: @jayjun Fix capitalization and formatting in installation guides
+- #3392: @jayjun Fix wrong PostgreSQL environment variable in guide
+- #3391: @josegonzalez Update all gpgkey paths to the new url
+
+## 0.14.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.1/bootstrap.sh
+sudo DOKKU_TAG=v0.14.1 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3386: @josegonzalez Ensure we can deploy code when there is no pre or post-deploy script defined
+
+## 0.14.0
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.0/bootstrap.sh
+sudo DOKKU_TAG=v0.14.0 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3384: @josegonzalez fix: use updated gpg key for apt repository
+- #3382: @josegonzalez Set cleanup to global when no application is specified
+- #3350: @josegonzalez Do not build the proxy config when there are no app listeners
+- #3366: @josegonzalez Add post-app-clone-setup to network clean make target
+- #3349: @josegonzalez Ensure apps are cleanly cloned
+- #3356: @josegonzalez Move storage directory into DOKKU_LIB_ROOT
+- #3341: @baikunz Select only default dokku network IP
+- #3348: @josegonzalez Use correct name for packagecloud token when running CI commands
+- #3339: @josegonzalez Properly check args when calling cleanup globally
+- #3344: @josegonzalez Allow running dokku report without needing an interactive shell
+
+### New Features
+
+- #3381: @josegonzalez Add support for the Procfile release command
+- #3380: @josegonzalez Install stable docker when using bootstrap script
+- #3378: @josegonzalez Make admin setup UI look nicer
+- #3369: @josegonzalez Pull invalid nginx configuration when the nginx configs fail to validate
+- #3371: @josegonzalez Add tests section to changelog
+- #3358: @josegonzalez Image tag deploy workflow cleanup
+- #3351: @josegonzalez Do not clone URLS and VHOST files to new apps
+- #3357: @josegonzalez Add support for building arbitrary releases
+- #3354: @josegonzalez Drop default dhparam key size to 2048
+- #3347: @josegonzalez Upgrade herokuish
+- #3352: @josegonzalez Increase security of default SSL setup
+- #3353: @josegonzalez Normalize tests
+- #3345: @josegonzalez Allow triggering the full report for all apps via --all flag
+- #3346: @josegonzalez Always overwrite the dokku.conf file for nginx
+
+### Documentation
+
+- #3377: @josegonzalez Remove team member section on homepage in favor of sponsor section
+- #3376: @josegonzalez Switch from rawgit to jsdelivr
+- #3365: @josegonzalez Remove extra tags:create call from docs
+
+### Tests
+
+- #3379: @josegonzalez Run mvdan/shfmt on test runs
+- #3370: @josegonzalez Add junit support to shellcheck output
+- #3308: @josegonzalez Add timing info to test runs on CircleCI
+- #3367: @josegonzalez Run tests from built artifact
+- #3368: @josegonzalez Balance circleci tests
+- #3363: @josegonzalez Add a wrapper for invoking a single test
+- #3362: @josegonzalez Allow tests to be run from any directory
+- #3360: @josegonzalez Switch to bats-core
+- #3361: @josegonzalez Do not generate dhparam for tests
+
+### Other
+
+- #3279: @fruitl00p Make sure the universe repo is loaded into APT
+
+## 0.13.4
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.4/bootstrap.sh
+sudo DOKKU_TAG=v0.13.4 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3337: @josegonzalez Use correct container id variable for killing containers
+
+### New Features
+
+- #3338: @josegonzalez Redirect ps:retire output to a log file
+
+## 0.13.3
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.3/bootstrap.sh
+sudo DOKKU_TAG=v0.13.3 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3330: @josegonzalez Ensure chowned properties always have a user and group set
+
+### New Features
+
+- #3334: @josegonzalez refactor: run every 5 minutes instead of 2
+
+## 0.13.2
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.2/bootstrap.sh
+sudo DOKKU_TAG=v0.13.2 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3329: @josegonzalez Avoid parsing missing file when retiring containers
+- #3325: @wcalandro Add "--global" to dokku cleanup on dokku update
+
+### Documentation
+
+- #3326: @josegonzalez Add note to release on how to upgrade via the bootstrap script
+
+## 0.13.1
+
+Install/update via the bootstrap script:
+
+```shell
+wget https://raw.githubusercontent.com/dokku/dokku/v0.13.1/bootstrap.sh
+sudo DOKKU_TAG=v0.13.1 bash bootstrap.sh
+```
+
+### Bug Fixes
+
+- #3324: @josegonzalez Add missing source of config functions
+
+## 0.13.0
+
+### Bug Fixes
+
+- #3312: @josegonzalez fix: keep track of failed containers regardless of docker kill output
+- #3299: @josegonzalez Wrap script_bin in double-quotes
+- #3295: @alexquick Sort config:show by key name
+- #3288: @josegonzalez Wrap script binary in single quotes during executable check
+
+### New Features
+
+- #3302: @josegonzalez Add ability to check on app lock status via apps:locked command
+- #3315: @aokon Upgrade herokuish to 0.4.5 version
+- #3236: @josegonzalez Retire old containers
+- #3307: @josegonzalez Add support for docker.io package
+- #3301: @josegonzalez Add ability to sync packages to a new version of ubuntu
+- #3286: @josegonzalez Sanitize docker inspect output with ps:inspect
+- #3240: @josegonzalez Refactor Procfile handling to use go-procfile-util
+- #3282: @josegonzalez Use create instead of run for faster and more reliable file copy from docker images
+- #3280: @josegonzalez Better scheduler support
+- #3259: @josegonzalez Check if script is executable when a full path is specified
+
+### Documentation
+
+- #3314: @royklutman Remove reference to non-existent DigitalOcean hosting plan
+- #3313: @morenoh149 Indicate to user to specify hostname
+- #3310: @josegonzalez Add a note to our issue template begging for money
+- #3281: @josegonzalez Add documentation on custom error pages
+
+## 0.12.13
+
+### New Features
+
+- #3257: @josegonzalez Suppress output in git plugin during builds
+- #3254: @michaelshobbs Update herokuish to 0.4.4
+
+### Documentation
+
+- #3270: @alexymik Correct typo in git documentation
+- #3268: @josegonzalez Correct notice on ubuntu support
+- #3247: @mimischi Fix typo in ps:stopall
+- #3246: @dv Change DISABLE_CHOWN to disable-chown
+
+## 0.12.12
+
+### New Features
+
+- #3244: @josegonzalez Allow disabling chown for persistent storage in scheduler-docker-local
+
+## 0.12.11
+
+### Bug Fixes
+
+- #3238: @josegonzalez Handle proxy issues in app renaming
+- #3234: @mashrikt Unset GIT_QUARANTINE_PATH when updating repo submodule
+- #3223: @josegonzalez Get the global scheduler if no app is specified
+- #3218: @wcalandro Fix error text when using "dokku plugin:uninstall"
+
+### New Features
+
+- #3242: @josegonzalez Upgrade herokuish to 0.4.3
+- #3241: @josegonzalez Add a subcommand for retrieving failed app deploy logs
+- #3237: @josegonzalez Support --quiet header when showing all environment variables
+
+### Documentation
+
+- #3235: @josegonzalez Switch from ps:rebuild to ps:restart
+- #3221: @josegonzalez Better callout for why env vars do not get applied to dockerfile builds
+
+## 0.12.10
+
+### New Features
+
+- #3214: @josegonzalez Add net-tools as a dependency to debian installs
+
+## 0.12.9
+
+### Bug Fixes
+
+- #3212: @josegonzalez Add missing config source
+
 ## 0.12.8
 
 ### Bug Fixes

ISSUE_TEMPLATE.md

@@ -1,3 +1,5 @@
+> If you're using Dokku - especially for commercial purposes - consider donating to project development via [OpenCollective](https://opencollective.com/dokku) or [Patreon](https://www.patreon.com/dokku). Funds go to general development, support, and infrastructure costs.
+>
 > If you need help figuring out how to use a specific buildpack, or are having issues using multiple buildpacks, please see our [irc or slack channels](http://dokku.viewdocs.io/dokku/getting-started/where-to-get-help/#the-irc-and-slack-channels). Issues pertaining to buildpacks may be closed and locked.
 
 ## Description of problem
@@ -27,8 +29,9 @@
 
 ### Additional information
 
-- `docker inspect CONTAINER_ID` (if applicable):
-  (BEWARE: `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX):
+- Container Inspect Output (if applicable):
+  - 0.13.0+: `dokku inspect APP_NAME`
+  - <0.13.0: `docker inspect CONTAINER_ID`: WARNING, `docker inspect` will print environment variables for some commands, be sure you're not exposing any sensitive information when posting issues. You may replace these values with XXXXXXX.
 - `cat /home/dokku/<app>/nginx.conf` (if applicable):
 - Link to the exact repository being deployed (if possible/applicable):
 - If a deploy is failing or behaving unexpectedly:

Makefile

@@ -1,6 +1,8 @@
 DOKKU_VERSION ?= master
 
+PROCFILE_VERSION ?= 0.4.0
 SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.7.0/sshcommand
+PROCFILE_UTIL_URL ?= https://github.com/josegonzalez/go-procfile-util/releases/download/v${PROCFILE_VERSION}/procfile-util_${PROCFILE_VERSION}_linux_x86_64.tgz
 PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_linux_x86_64.tgz
 SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
@@ -26,7 +28,7 @@ endif
 
 include common.mk
 
-.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies sshcommand plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build
+.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies sshcommand procfile-util plugn docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku go-build
 
 include tests.mk
 include deb.mk
@@ -109,13 +111,13 @@ else
 	echo $(DOKKU_VERSION) > ~dokku/VERSION
 endif
 
-plugin-dependencies: plugn
+plugin-dependencies: plugn procfile-util
 	sudo -E dokku plugin:install-dependencies --core
 
-plugins: plugn docker
+plugins: plugn procfile-util docker
 	sudo -E dokku plugin:install --core
 
-dependencies: apt-update sshcommand plugn docker help2man man-db sigil
+dependencies: apt-update sshcommand plugn procfile-util docker help2man man-db sigil
 	$(MAKE) -e stack
 
 apt-update:
@@ -132,6 +134,10 @@ sshcommand:
 	chmod +x /usr/local/bin/sshcommand
 	sshcommand create dokku /usr/local/bin/dokku
 
+procfile-util:
+	wget -qO /tmp/procfile-util_latest.tgz ${PROCFILE_UTIL_URL}
+	tar xzf /tmp/procfile-util_latest.tgz -C /usr/local/bin
+
 plugn:
 	wget -qO /tmp/plugn_latest.tgz ${PLUGN_URL}
 	tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin

README.md

@@ -1,5 +1,5 @@
 # Dokku
-[![Build Status](https://img.shields.io/circleci/project/dokku/dokku/master.svg?style=flat-square "Build Status")](https://circleci.com/gh/dokku/dokku/tree/master)
+[![Build Status](https://img.shields.io/circleci/project/github/dokku/dokku.svg?style=flat-square "Build Status")](https://circleci.com/gh/dokku/dokku/tree/master)
 [![Ubuntu Package](https://img.shields.io/badge/package-ubuntu-brightgreen.svg?style=flat-square "Ubuntu Package")](https://packagecloud.io/dokku/dokku)
 [![Arch Package](https://img.shields.io/badge/package-arch-brightgreen.svg?style=flat-square "Arch Package")](https://aur.archlinux.org/packages/dokku/)
 [![IRC Network](https://img.shields.io/badge/irc-freenode-blue.svg?style=flat-square "IRC Freenode")](https://webchat.freenode.net/?channels=dokku)
@@ -88,9 +88,8 @@ Support us with a monthly donation and help us continue our activities. [[Become
 
 A fresh VM running any of the following operating systems:
 
-- Ubuntu 16.04 x64
-- Ubuntu 14.04 x64
-- Debian 8.2 x64
+- Ubuntu x64 - Any currently supported release
+- Debian 8.2+ x64
 - CentOS 7 x64 *(experimental)*
 - Arch Linux x64 *(experimental)*
 
@@ -99,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.12.8/bootstrap.sh
-sudo DOKKU_TAG=v0.12.8 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh
+sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
 ```
 
 You can then proceed to the ip address or domain name associated with your server to complete the web-based installation.

bootstrap.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 # A script to bootstrap dokku.
 # It expects to be run on Ubuntu 14.04 via 'sudo'
@@ -15,7 +16,7 @@ ensure-environment() {
   local FREE_MEMORY
   echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
 
-  hostname -f > /dev/null 2>&1 || {
+  hostname -f >/dev/null 2>&1 || {
     echo "This installation script requires that you have a hostname set for the instance. Please set a hostname for 127.0.0.1 in your /etc/hosts"
     exit 1
   }
@@ -31,8 +32,14 @@ install-requirements() {
   echo "--> Ensuring we have the proper dependencies"
 
   case "$DOKKU_DISTRO" in
-    debian|ubuntu)
-      apt-get update -qq > /dev/null
+    debian | ubuntu)
+      if ! dpkg -l | grep -q software-properties-common; then
+        apt-get update -qq >/dev/null
+        apt-get -qq -y install software-properties-common
+      fi
+
+      add-apt-repository universe >/dev/null
+      apt-get update -qq >/dev/null
       ;;
   esac
 }
@@ -41,7 +48,7 @@ install-dokku() {
   if [[ -n $DOKKU_BRANCH ]]; then
     install-dokku-from-source "origin/$DOKKU_BRANCH"
   elif [[ -n $DOKKU_TAG ]]; then
-    local DOKKU_SEMVER="${DOKKU_TAG//v}"
+    local DOKKU_SEMVER="${DOKKU_TAG//v/}"
     major=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[1]}')
     minor=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[2]}')
     patch=$(echo "$DOKKU_SEMVER" | awk '{split($0,a,"."); print a[3]}')
@@ -95,10 +102,10 @@ install-dokku-from-source() {
 
 install-dokku-from-package() {
   case "$DOKKU_DISTRO" in
-    debian|ubuntu)
+    debian | ubuntu)
       install-dokku-from-deb-package "$@"
       ;;
-    centos|rhel)
+    centos | rhel)
       install-dokku-from-rpm-package "$@"
       ;;
     *)
@@ -128,24 +135,27 @@ install-dokku-from-deb-package() {
   fi
 
   echo "--> Initial apt-get update"
-  apt-get update -qq > /dev/null
+  apt-get update -qq >/dev/null
   apt-get -qq -y install apt-transport-https
 
-  echo "--> Installing docker"
-  if uname -r | grep -q linode; then
-    echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
-    echo "    You can safely ignore this warning."
-    echo "    Installation will continue in 10 seconds."
-    sleep 10
+  if ! command -v docker &>/dev/null; then
+    echo "--> Installing docker"
+    if uname -r | grep -q linode; then
+      echo "--> NOTE: Using Linode? Docker may complain about missing AUFS support."
+      echo "    You can safely ignore this warning."
+      echo "    Installation will continue in 10 seconds."
+      sleep 10
+    fi
+    export CHANNEL=stable
+    wget -nv -O - https://get.docker.com/ | sh
   fi
-  wget -nv -O - https://get.docker.com/ | sh
 
   if [[ "$DOKKU_DISTRO_VERSION" == "14.04" ]]; then
     echo "--> Adding nginx PPA"
     add-apt-repository -y ppa:nginx/stable
   fi
 
-  OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
+  OS_ID="$(lsb_release -cs 2>/dev/null || echo "trusty")"
   if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu"; then
     DOKKU_DISTRO="ubuntu"
     OS_ID="trusty"
@@ -164,15 +174,16 @@ install-dokku-from-deb-package() {
   fi
 
   echo "--> Installing dokku"
-  wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
+  wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
   echo "deb https://packagecloud.io/dokku/dokku/$DOKKU_DISTRO/ $OS_ID main" | tee /etc/apt/sources.list.d/dokku.list
-  apt-get update -qq > /dev/null
+  apt-get update -qq >/dev/null
 
-  [[ -n $DOKKU_VHOST_ENABLE ]]  && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE"   | sudo debconf-set-selections
-  [[ -n $DOKKU_WEB_CONFIG ]]    && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG"       | sudo debconf-set-selections
-  [[ -n $DOKKU_HOSTNAME ]]      && echo "dokku dokku/hostname string $DOKKU_HOSTNAME"            | sudo debconf-set-selections
+  [[ -n $DOKKU_VHOST_ENABLE ]] && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | sudo debconf-set-selections
+  [[ -n $DOKKU_WEB_CONFIG ]] && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG" | sudo debconf-set-selections
+  [[ -n $DOKKU_HOSTNAME ]] && echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | sudo debconf-set-selections
   [[ -n $DOKKU_SKIP_KEY_FILE ]] && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | sudo debconf-set-selections
-  [[ -n $DOKKU_KEY_FILE ]]      && echo "dokku dokku/key_file string $DOKKU_KEY_FILE"            | sudo debconf-set-selections
+  [[ -n $DOKKU_KEY_FILE ]] && echo "dokku dokku/key_file string $DOKKU_KEY_FILE" | sudo debconf-set-selections
+  [[ -n $DOKKU_NGINX_ENABLE ]] && echo "dokku dokku/nginx_enable string $DOKKU_NGINX_ENABLE" | sudo debconf-set-selections
 
   if [[ -n $DOKKU_CHECKOUT ]]; then
     # shellcheck disable=SC2086

contrib/build.Dockerfile

@@ -39,7 +39,4 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
     && 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
 
-RUN mkdir -p /data \
-    && cp /tmp/*.deb /data \
-    && cp /tmp/*.rpm /data \
-    && ls -lha /data/
+RUN ls -lha /tmp/

contrib/copy-packages

@@ -0,0 +1,51 @@
+#!/usr/bin/env python2.7
+import os
+import requests
+import shutil
+import subprocess
+from requests.auth import HTTPBasicAuth
+
+PACKAGECLOUD_TOKEN = os.getenv('DOKKU_PACKAGECLOUD_TOKEN')
+
+
+def download_file(filename, url):
+    r = requests.get(url, stream=True)
+    with open(filename, 'wb') as f:
+        shutil.copyfileobj(r.raw, f)
+
+
+def upload_file(filename):
+    versions = [
+        "bionic",
+    ]
+    cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}"
+    for version in versions:
+        cmd = cmd_template.format(version, filename)
+        subprocess.call(cmd, shell=True)
+
+
+def main():
+    auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, '')
+    base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/trusty.json',
+                        auth=auth)
+    data = base.json()
+    urls = []
+    for package in data:
+        urls.append(package['versions_url'])
+
+    download_urls = {}
+    for url in urls:
+        base = requests.get('https://packagecloud.io{0}'.format(url),
+                            auth=auth)
+        data = base.json()
+        for version in data:
+            download_urls['downloads/' + version['filename']] = version['download_url']
+
+    for filename, download_url in download_urls.items():
+        print "downloading", filename
+        download_file(filename, download_url)
+        upload_file(filename)
+
+
+if __name__ == "__main__":
+    main()

contrib/dokku-installer.py

@@ -10,7 +10,7 @@ import subprocess
 import sys
 import threading
 
-VERSION = 'v0.12.8'
+VERSION = 'v0.14.2'
 
 hostname = ''
 try:
@@ -21,7 +21,13 @@ try:
 except subprocess.CalledProcessError:
     pass
 
-key_file = os.getenv('KEY_FILE', '/root/.ssh/authorized_keys')
+key_file = os.getenv('KEY_FILE', None)
+if os.path.isfile('/home/ec2-user/.ssh/authorized_keys'):
+    key_file = '/home/ec2-user/.ssh/authorized_keys'
+elif os.path.isfile('/home/ubuntu/.ssh/authorized_keys'):
+    key_file = '/home/ubuntu/.ssh/authorized_keys'
+else:
+    key_file = '/root/.ssh/authorized_keys'
 
 admin_keys = []
 if os.path.isfile(key_file):
@@ -72,6 +78,7 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
     def do_GET(self):
         content = PAGE.replace('{VERSION}', VERSION)
         content = content.replace('{HOSTNAME}', hostname)
+        content = content.replace('{AUTHORIZED_KEYS_LOCATION}', key_file)
         content = content.replace('{ADMIN_KEYS}', "\n".join(admin_keys))
         self.send_response(200)
         self.end_headers()
@@ -120,6 +127,7 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
             proc.stdin.close()
             proc.wait()
 
+        set_debconf_selection('boolean', 'nginx_enable', 'true')
         set_debconf_selection('boolean', 'skip_key_file', 'true')
         set_debconf_selection('boolean', 'vhost_enable', vhost_enable)
         set_debconf_selection('boolean', 'web_config', 'false')
@@ -211,33 +219,91 @@ PAGE = """
 <html>
 <head>
   <title>Dokku Setup</title>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+  <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;
+      margin-top: 1.25rem;
+      margin-bottom: 1.25rem;
+      border: 1px solid #eee;
+      border-left-width: .25rem;
+      border-radius: .25rem;
+    }
+    .bd-callout p:last-child {
+      margin-bottom: 0;
+    }
+    .bd-callout-info {
+      border-left-color: #5bc0de;
+    }
+    pre {
+      font-size: 80%;
+      margin-bottom: 0;
+    }
+    h1 small {
+      font-size: 50%;
+    }
+    h5 {
+      font-size: 1rem;
+    }
+    .container {
+      width: 640px;
+    }
+    .result {
+      padding-left: 20px;
+    }
+    input.form-control, textarea.form-control {
+      background-color: #fafbfc;
+      font-size: 14px;
+    }
+    input.form-control::placeholder, textarea.form-control::placeholder {
+      color:  #adb2b8
+    }
+  </style>
 </head>
 <body>
-  <div class="container" style="width: 640px;">
-  <form id="form" role="form">
-    <h1>Dokku Setup <small>{VERSION}</small></h1>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Admin Access</small></h3>
-      <label for="key">Public Key</label><br />
-      <textarea class="form-control" name="keys" rows="7" id="key">{ADMIN_KEYS}</textarea>
-    </div>
-    <div class="form-group">
-      <h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
-      <div class="form-group">
-        <label for="hostname">Hostname</label>
-        <input class="form-control" type="text" id="hostname" name="hostname" value="{HOSTNAME}" />
+  <div class="container">
+    <form id="form" role="form">
+      <h1 class="pt-3">Dokku Setup <small class="text-muted">{VERSION}</small></h1>
+      <div class="alert alert-warning small" role="alert">
+        <strong>Warning:</strong> The SSH key filled out here can grant root access to the server. Please complete the setup as soon as possible.
       </div>
-      <div class="checkbox">
-        <label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
+
+      <div class="row">
+        <div class="col">
+          <h3>Admin Access</h3>
+          <div class="form-group">
+            <label for="key">Public SSH Keys</label><br />
+            <textarea class="form-control" name="keys" rows="5" id="key" placeholder="Begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'">{ADMIN_KEYS}</textarea>
+            <small class="form-text text-muted">Public keys allow users to ssh onto the server as the <code>dokku</code> user, as well as remotely execute Dokku commands. They are currently auto-populated from: <code>{AUTHORIZED_KEYS_LOCATION}</code>, and can be changed later via the  <a href="http://dokku.viewdocs.io/dokku/deployment/user-management/" target="_blank"><code>dokku ssh-keys</code></a> plugin.</small>
+          </div>
+        </div>
       </div>
-      <p>Your app URLs will look like:</p>
-      <pre id="example">http://hostname:port</pre>
-    </div>
-    <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
-  </form>
+
+      <div class="row">
+        <div class="col">
+          <h3>Hostname Configuration</h3>
+          <div class="form-group">
+            <label for="hostname">Hostname</label>
+            <input class="form-control" type="text" id="hostname" name="hostname" value="{HOSTNAME}" placeholder="A hostname or ip address such as {HOSTNAME}" />
+            <small class="form-text text-muted">This will be used as the default host for all applications, and can be changed later via the <a href="http://dokku.viewdocs.io/dokku/configuration/domains/" target="_blank"><code>dokku domains:set-global</code></a> command.</small>
+          </div>
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="vhost" name="vhost" value="true">
+            <label class="form-check-label" for="vhost">Use virtualhost naming for apps</label>
+            <small class="form-text text-muted">When enabled, Nginx will be run on port 80 and proxy requests to apps based on hostname.</small>
+            <small class="form-text text-muted">When disabled, a specific port will be setup for each application on first deploy, and requests to that port will be proxied to the relevant app.</small>
+          </div>
+          <div class="bd-callout bd-callout-info">
+            <h5>What will app URLs look like?</h5>
+            <pre><code id="example">http://hostname:port</code></pre>
+          </div>
+        </div>
+      </div>
+      <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span class="result"></span>
+    </form>
   </div>
+
   <div id="error-output"></div>
   <script>
     function setup() {
@@ -253,11 +319,15 @@ PAGE = """
       $("input,textarea,button").prop("disabled", true);
       $.post('/setup', data)
         .done(function() {
-          $("#result").html("Success!")
-          window.location.href = "http://dokku.viewdocs.io/dokku~{VERSION}/deployment/application-deployment/";
+          $(".result").addClass('text-success');
+          $(".result").html("Success! Redirecting in 3 seconds. ..")
+          setTimeout(function() {
+            window.location.href = "http://dokku.viewdocs.io/dokku~{VERSION}/deployment/application-deployment/";
+          }, 3000);
         })
         .fail(function(data) {
-          $("#result").html("Something went wrong...")
+          $(".result").addClass('text-danger');
+          $(".result").html("Something went wrong...")
           $("#error-output").html(data.responseText)
         });
     }

contrib/dokku-update

@@ -79,11 +79,11 @@ main() {
     arch)
       yaourt -Syyua
       ;;
-    debian|ubuntu)
-      apt-get update -qq > /dev/null
+    debian | ubuntu)
+      apt-get update -qq >/dev/null
       apt-get -qq -y --force-yes dist-upgrade
       ;;
-    centos|opensuse|rhel)
+    centos | opensuse | rhel)
       dokku-log-warn "Updating this operating system is not supported"
       ;;
     *)
@@ -94,7 +94,7 @@ main() {
 
   # update all plugins
   dokku-log-info "Updating all plugins"
-  for  PLUGIN_NAME in $(dokku plugin:list | grep enabled | awk '$1=$1' | cut -d' ' -f1); do
+  for PLUGIN_NAME in $(dokku plugin:list | grep enabled | awk '$1=$1' | cut -d' ' -f1); do
     dokku-update-plugin "$PLUGIN_NAME"
   done
   dokku plugin:install
@@ -106,7 +106,7 @@ main() {
   dokku-log-info "Waiting for old containers to stop"
   sleep 120
   dokku-log-info "Cleaning up"
-  dokku cleanup
+  dokku cleanup --global
 }
 
 main "$@"

contrib/dokku_client.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 export DOKKU_PORT=${DOKKU_PORT:=22}
 export DOKKU_HOST=${DOKKU_HOST:=}
 
@@ -48,7 +49,7 @@ fn-dokku-host() {
   declare DOKKU_GIT_REMOTE="$1" DOKKU_HOST="$2"
 
   if [[ -z "$DOKKU_HOST" ]]; then
-    if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
+    if [[ -d .git ]] || git rev-parse --git-dir >/dev/null 2>&1; then
       DOKKU_HOST=$(git remote -v 2>/dev/null | grep -Ei "^${DOKKU_GIT_REMOTE}\s" | head -n 1 | cut -f1 -d' ' | cut -f2 -d '@' | cut -f1 -d':' 2>/dev/null || true)
     fi
   fi
@@ -67,7 +68,7 @@ main() {
 
   for arg in "$@"; do
     if [[ "$skip" == "true" ]]; then
-      next_index=$(( next_index + 1 ))
+      next_index=$((next_index + 1))
       skip=false
       continue
     fi
@@ -92,13 +93,13 @@ main() {
         cmd_set=true
       fi
     fi
-    next_index=$(( next_index + 1 ))
+    next_index=$((next_index + 1))
   done
 
   DOKKU_REMOTE_HOST="$(fn-dokku-host "$DOKKU_GIT_REMOTE" "$DOKKU_HOST")"
 
   if [[ -z "$APP" ]]; then
-    if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
+    if [[ -d .git ]] || git rev-parse --git-dir >/dev/null 2>&1; then
       set +e
       APP=$(git remote -v 2>/dev/null | grep -Ei "dokku@$DOKKU_REMOTE_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
       set -e
@@ -112,14 +113,14 @@ main() {
       if [[ -z "$APP_ARG" ]]; then
         APP=$(fn-random-name)
         counter=0
-        while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps 2>/dev/null| grep -q "$APP"; do
+        while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps 2>/dev/null | grep -q "$APP"; do
           if [[ $counter -ge 100 ]]; then
             echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
             ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps
             exit 1
           else
             APP=$(random_name)
-            counter=$((counter+1))
+            counter=$((counter + 1))
           fi
         done
       else

contrib/herokuish-build.Dockerfile

@@ -13,7 +13,4 @@ COPY . ${WORKDIR}
 
 RUN make deb-herokuish rpm-herokuish
 
-RUN mkdir -p /data \
-    && cp /tmp/*.deb /data \
-    && cp /tmp/*.rpm /data \
-    && ls -lha /data/
+RUN ls -lha /tmp/

contrib/release

@@ -68,7 +68,7 @@ fn-extract-package() {
   [[ "$IS_RELEASE" == "true" ]] && NAME="dokku:build-release"
 
   log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
-  docker run --rm --entrypoint cat "$NAME" "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}"
+  docker run --rm --entrypoint cat "$NAME" "/tmp/${PACKAGE_NAME}" >"${ROOT_DIR}/build/${PACKAGE_NAME}"
   return "$?"
 }
 
@@ -237,7 +237,7 @@ fn-repo-update-history-and-commit() {
   declare desc="Updates the history file and commits the changes"
   declare CURRENT_VERSION="$1" NEXT_VERSION="$2"
   local PULL_REQUEST_ID TITLE AUTHOR TYPE CHANGELOG_TEXT
-  local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG HISTORY_OTHER ISSUE_FILE
+  local COMMIT_MESSAGE HISTORY HISTORY_CONTENTS HISTORY_DOCUMENTATION HISTORY_ENHANCEMENT HISTORY_BUG HISTORY_OTHER HISTORY_TESTS ISSUE_FILE
 
   pushd "$ROOT_DIR" >/dev/null
 
@@ -260,6 +260,8 @@ fn-repo-update-history-and-commit() {
       HISTORY_DOCUMENTATION="${HISTORY_DOCUMENTATION}"$'\n'"$CHANGELOG_TEXT"
     elif [[ "$TYPE" == "enhancement" ]] || [[ "$TYPE" == "refactor" ]]; then
       HISTORY_ENHANCEMENT="${HISTORY_ENHANCEMENT}"$'\n'"$CHANGELOG_TEXT"
+    elif [[ "$TYPE" == "tests" ]]; then
+      HISTORY_TESTS="${HISTORY_TESTS}"$'\n'"$CHANGELOG_TEXT"
     else
       HISTORY_OTHER="${HISTORY_OTHER}"$'\n'"$CHANGELOG_TEXT"
     fi
@@ -267,6 +269,11 @@ fn-repo-update-history-and-commit() {
 
   HISTORY="# History"
   HISTORY="${HISTORY}"$'\n\n'"## ${NEXT_VERSION}"
+  HISTORY="${HISTORY}"$'\n\n'"Install/update via the bootstrap script:"
+  HISTORY="${HISTORY}"$'\n\n'"\`\`\`shell"
+  HISTORY="${HISTORY}"$'\n'"wget https://raw.githubusercontent.com/dokku/dokku/v${NEXT_VERSION}/bootstrap.sh"
+  HISTORY="${HISTORY}"$'\n'"sudo DOKKU_TAG=v${NEXT_VERSION} bash bootstrap.sh"
+  HISTORY="${HISTORY}"$'\n'"\`\`\`"
 
   if [[ "$HISTORY_BUG" ]]; then
     HISTORY="${HISTORY}"$'\n\n'"### Bug Fixes"
@@ -283,6 +290,11 @@ fn-repo-update-history-and-commit() {
     HISTORY="${HISTORY}"$'\n'"$HISTORY_DOCUMENTATION"
   fi
 
+  if [[ "$HISTORY_TESTS" ]]; then
+    HISTORY="${HISTORY}"$'\n\n'"### Tests"
+    HISTORY="${HISTORY}"$'\n'"$HISTORY_TESTS"
+  fi
+
   if [[ "$HISTORY_OTHER" ]]; then
     HISTORY="${HISTORY}"$'\n\n'"### Other"
     HISTORY="${HISTORY}"$'\n'"$HISTORY_OTHER"
@@ -308,7 +320,7 @@ fn-require-bin() {
 main() {
   declare RELEASE="$1"
   local CURRENT_VERSION NEXT_VERSION IS_RELEASE
-  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish")
+  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build")
 
   if [[ "$RELEASE" == '--trace' ]]; then
     shift 1
@@ -317,39 +329,45 @@ main() {
   fi
 
   if [[ -z "$RELEASE" ]]; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given"
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], none given"
   fi
 
   if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given"
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given"
   fi
 
+  log-info "Creating $RELEASE release"
+
+  mkdir -p "build"
   fn-require-bin "docker"
   fn-require-bin "git"
-  fn-require-bin "package_cloud"
-  [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-require-bin "package_cloud"
+    [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable"
+  fi
 
   CURRENT_VERSION="$(fn-version-current)"
   NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")"
   IS_RELEASE="$(fn-is-release "$RELEASE")"
 
   fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
-
   fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package"
-
   fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
-
   fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
 
-  fn-publish-package "$IS_RELEASE" "deb" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-publish-package "$IS_RELEASE" "deb" "build/dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+    fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+    fn-repo-push-tags "$IS_RELEASE"
+  fi
 
-  fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
-
-  fn-repo-push-tags "$IS_RELEASE"
   if [[ "$IS_RELEASE" != "true" ]]; then
     git reset -q HEAD plugins/*/plugin.toml
     git checkout -- plugins/*/plugin.toml
   fi
+
+  echo "build/dokku_${NEXT_VERSION}_amd64.deb" >build/deb-filename
+  echo "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" >build/rpm-filename
 }
 
 main "$@"

contrib/release-dokku-update

@@ -47,7 +47,7 @@ fn-extract-package() {
   fi
 
   log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
-  docker run --rm --entrypoint cat dokku-update:build "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}"
+  docker run --rm --entrypoint cat dokku-update:build "/tmp/${PACKAGE_NAME}" >"${ROOT_DIR}/build/${PACKAGE_NAME}"
   return "$?"
 }
 
@@ -70,7 +70,7 @@ fn-publish-package() {
         EXIT_CODE="$ex"
       fi
     done
-  
+
     DIST=debian
     OS_IDS=("wheezy" "jessie" "stretch" "buster")
     for OS_ID in "${OS_IDS[@]}"; do
@@ -121,7 +121,7 @@ fn-require-bin() {
 main() {
   declare RELEASE="$1"
   local NEXT_VERSION
-  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish")
+  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build")
 
   if [[ "$RELEASE" == '--trace' ]]; then
     shift 1
@@ -130,29 +130,31 @@ main() {
   fi
 
   if [[ -z "$RELEASE" ]]; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given"
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], none given"
   fi
 
   if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given"
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given"
   fi
 
+  mkdir -p "build"
   fn-require-bin "docker"
-  fn-require-bin "package_cloud"
-  [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-require-bin "package_cloud"
+    [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable"
+  fi
 
   NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
   IS_RELEASE="$(fn-is-release "$RELEASE")"
 
   fn-build-dokku || log-fail "Error building package"
-
   fn-extract-package "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
-
   fn-extract-package "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
 
-  fn-publish-package "$IS_RELEASE" "deb" "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
-
-  fn-publish-package "$IS_RELEASE" "rpm" "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-publish-package "$IS_RELEASE" "deb" "build/dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+    fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+  fi
 }
 
 main "$@"

contrib/release-herokuish

@@ -47,7 +47,7 @@ fn-extract-package() {
   fi
 
   log-info "(extract-package) writing ${PACKAGE_NAME} to correct path"
-  docker run --rm --entrypoint cat herokuish:build "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}"
+  docker run --rm --entrypoint cat herokuish:build "/tmp/${PACKAGE_NAME}" >"${ROOT_DIR}/build/${PACKAGE_NAME}"
   return "$?"
 }
 
@@ -70,7 +70,7 @@ fn-publish-package() {
         EXIT_CODE="$ex"
       fi
     done
-  
+
     DIST=debian
     OS_IDS=("wheezy" "jessie" "stretch" "buster")
     for OS_ID in "${OS_IDS[@]}"; do
@@ -121,7 +121,7 @@ fn-require-bin() {
 main() {
   declare RELEASE="$1"
   local NEXT_VERSION
-  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish")
+  local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build")
 
   if [[ "$RELEASE" == '--trace' ]]; then
     shift 1
@@ -130,27 +130,31 @@ main() {
   fi
 
   if [[ -z "$RELEASE" ]]; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given"
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], none given"
   fi
 
   if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then
-    log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given"
+    log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given"
   fi
 
+  mkdir -p "build"
   fn-require-bin "docker"
-  fn-require-bin "package_cloud"
-  [[ -n "$PACKAGECLOUD_API_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_API_TOKEN environment variable"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-require-bin "package_cloud"
+    [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable"
+  fi
 
   NEXT_VERSION="$(grep HEROKUISH_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)"
   IS_RELEASE="$(fn-is-release "$RELEASE")"
 
   fn-build-dokku || log-fail "Error building package"
-
   fn-extract-package "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"
   fn-extract-package "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package"
 
-  fn-publish-package "$IS_RELEASE" "deb" "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
-  fn-publish-package "$IS_RELEASE" "rpm" "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+  if [[ "$RELEASE" != "build" ]]; then
+    fn-publish-package "$IS_RELEASE" "deb" "build/herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package"
+    fn-publish-package "$IS_RELEASE" "rpm" "build/herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
+  fi
 }
 
 main "$@"

contrib/release-plugin

@@ -57,7 +57,7 @@ main() {
   local CURRENT_VERSION FILENAME NEXT_VERSION ORG_REPO_NAME REPO_NAME major minor patch
 
   if [[ -z "$RELEASE" ]]; then
-    cat<<'EOF'
+    cat <<'EOF'
 requirements:
 
 - this is run in a plugin folder
@@ -97,9 +97,9 @@ EOF
     while true; do
       read -rp "Do you wish to continue? " yn
       case $yn in
-          [Yy]* ) break;;
-          [Nn]* ) exit;;
-          * ) echo "Please answer yes or no.";;
+        [Yy]*) break ;;
+        [Nn]*) exit ;;
+        *) echo "Please answer yes or no." ;;
       esac
     done
   fi
@@ -131,19 +131,19 @@ EOF
   patch=$(echo "$CURRENT_VERSION" | awk '{split($0,a,"."); print a[3]}')
 
   if [[ "$RELEASE" == "major" ]]; then
-    major=$((major + 1));
+    major=$((major + 1))
     minor="0"
     patch="0"
   elif [[ "$RELEASE" == "minor" ]]; then
-    minor=$((minor + 1));
+    minor=$((minor + 1))
     patch="0"
   elif [[ "$RELEASE" == "patch" ]]; then
-    patch=$((patch + 1));
+    patch=$((patch + 1))
   else
     log-error "Invalid release type specified"
     return 1
   fi
-  NEXT_VERSION="${major}.${minor}.${patch}"  
+  NEXT_VERSION="${major}.${minor}.${patch}"
 
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" plugin.toml
   git add plugin.toml
@@ -163,7 +163,7 @@ EOF
       DOKKU_PLUGIN_S3_PATH="${DOKKU_PLUGIN_S3_PATH}/"
     fi
 
-    fn-github-download-release "$ORG_REPO_NAME" "$NEXT_VERSION" > "${TMP_WORK_DIR}/${FILENAME}"
+    fn-github-download-release "$ORG_REPO_NAME" "$NEXT_VERSION" >"${TMP_WORK_DIR}/${FILENAME}"
     aws s3 cp "${TMP_WORK_DIR}/${FILENAME}" "s3://${DOKKU_PLUGIN_S3_BUCKET}/${DOKKU_PLUGIN_S3_PATH}${FILENAME}" --acl public-read
   fi
 }

contrib/update-build.Dockerfile

@@ -13,7 +13,4 @@ COPY . ${WORKDIR}
 
 RUN make deb-dokku-update rpm-dokku-update
 
-RUN mkdir -p /data \
-    && cp /tmp/*.deb /data \
-    && cp /tmp/*.rpm /data \
-    && ls -lha /data/
+RUN ls -lha /tmp/

deb.mk

@@ -1,6 +1,8 @@
+BUILD_DIRECTORY ?= /tmp
+
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.4.2
+HEROKUISH_VERSION ?= 0.4.6
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
 
@@ -69,13 +71,13 @@ install-from-deb:
 	wget -nv -O - https://get.docker.com/ | sh
 
 	@echo "--> Installing dokku"
-	wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
+	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
 	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
-	mv /tmp/*.deb .
+	mv $(BUILD_DIRECTORY)/*.deb .
 	@echo "Done"
 
 deb-setup:
@@ -100,9 +102,9 @@ deb-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) \
+		--version $(HEROKUISH_VERSION) \
+		--architecture $(HEROKUISH_ARCHITECTURE) \
+		--package $(BUILD_DIRECTORY)/$(HEROKUISH_PACKAGE_NAME) \
 		--deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-ce | docker-ee' \
 		--deb-pre-depends sudo \
 		--after-install /tmp/tmp/post-install \
@@ -110,7 +112,6 @@ deb-herokuish:
 		--description $(HEROKUISH_DESCRIPTION) \
 		--license 'MIT License' \
 		.
-	mv *.deb /tmp
 
 deb-dokku:
 	rm -rf /tmp/tmp /tmp/build dokku_*_$(DOKKU_ARCHITECTURE).deb
@@ -157,8 +158,8 @@ else
 	git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV
 endif
 	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build/var/lib/dokku/STABLE_VERSION`/g" /tmp/build/DEBIAN/control && rm /tmp/build/DEBIAN/control.bak
-	dpkg-deb --build /tmp/build "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
-	lintian "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	dpkg-deb --build /tmp/build "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
 
 deb-dokku-update:
 	rm -rf /tmp/dokku-update*.deb dokku-update*.deb
@@ -166,14 +167,13 @@ deb-dokku-update:
 	sudo fpm -t deb -s dir -n dokku-update \
 			 --version $(DOKKU_UPDATE_VERSION) \
 			 --architecture $(DOKKU_UPDATE_ARCHITECTURE) \
-			 --package $(DOKKU_UPDATE_PACKAGE_NAME) \
+			 --package $(BUILD_DIRECTORY)/$(DOKKU_UPDATE_PACKAGE_NAME) \
 			 --depends 'dokku' \
 			 --url "https://github.com/$(DOKKU_UPDATE_REPO_NAME)" \
 			 --description $(DOKKU_UPDATE_DESCRIPTION) \
 			 --license 'MIT License' \
 			 contrib/dokku-update=/usr/local/bin/dokku-update \
 			 contrib/dokku-update-version=/var/lib/dokku-update/VERSION
-	mv *.deb /tmp
 
 deb-plugn:
 	rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME)
@@ -190,14 +190,13 @@ deb-plugn:
 	sudo fpm -t deb -s dir -C /tmp/build -n plugn \
 			 --version $(PLUGN_VERSION) \
 			 --architecture $(PLUGN_ARCHITECTURE) \
-			 --package $(PLUGN_PACKAGE_NAME) \
+			 --package $(BUILD_DIRECTORY)/$(PLUGN_PACKAGE_NAME) \
 			 --url "https://github.com/$(PLUGN_REPO_NAME)" \
 			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
 			 --category utils \
 			 --description "$$PLUGN_DESCRIPTION" \
 			 --license 'MIT License' \
 			 .
-	mv *.deb /tmp
 
 deb-sshcommand:
 	rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME)
@@ -215,14 +214,13 @@ deb-sshcommand:
 	sudo fpm -t deb -s dir -C /tmp/build -n sshcommand \
 			 --version $(SSHCOMMAND_VERSION) \
 			 --architecture $(SSHCOMMAND_ARCHITECTURE) \
-			 --package $(SSHCOMMAND_PACKAGE_NAME) \
+			 --package $(BUILD_DIRECTORY)/$(SSHCOMMAND_PACKAGE_NAME) \
 			 --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \
 			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
 			 --category admin \
 			 --description "$$SSHCOMMAND_DESCRIPTION" \
 			 --license 'MIT License' \
 			 .
-	mv *.deb /tmp
 
 deb-sigil:
 	rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME)
@@ -239,11 +237,10 @@ deb-sigil:
 	sudo fpm -t deb -s dir -C /tmp/build -n gliderlabs-sigil \
 			 --version $(SIGIL_VERSION) \
 			 --architecture $(SIGIL_ARCHITECTURE) \
-			 --package $(SIGIL_PACKAGE_NAME) \
+			 --package $(BUILD_DIRECTORY)/$(SIGIL_PACKAGE_NAME) \
 			 --url "https://github.com/$(SIGIL_REPO_NAME)" \
 			 --maintainer "Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>" \
 			 --category utils \
 			 --description "$$SIGIL_DESCRIPTION" \
 			 --license 'MIT License' \
 			 .
-	mv *.deb /tmp

debian/config

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
   # shellcheck disable=SC1091
@@ -14,9 +15,10 @@ db_go || true
 
 db_get "dokku/web_config"
 if [ $RET = "true" ]; then
-    exit 0
+  exit 0
 fi
 
+db_input "high" "dokku/nginx_enable" || true
 db_input "high" "dokku/hostname" || true
 db_input "high" "dokku/vhost_enable" || true
 if [ "$ACTION" != "reconfigure" ]; then

debian/control

@@ -1,9 +1,9 @@
 Package: dokku
-Version: 0.12.8
+Version: 0.14.2
 Section: web
 Priority: optional
 Architecture: amd64
-Depends: locales, git, make, curl, gcc, man-db, netcat, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.7.1) | docker-engine (>= 1.7.1) | docker-io (>= 1.7.1)  | docker-ce | docker-ee, software-properties-common, python-software-properties | python3-software-properties, rsyslog
+Depends: locales, git, make, curl, gcc, man-db, netcat, sshcommand (>= 0.6.0), gliderlabs-sigil, docker-engine-cs (>= 1.7.1) | docker-engine (>= 1.7.1) | docker-io (>= 1.7.1)  | docker.io (>= 1.7.1) | docker-ce | docker-ee, net-tools, software-properties-common, procfile-util, python-software-properties | python3-software-properties, rsyslog
 Recommends: herokuish (>= 0.3.4), parallel, dokku-update
 Pre-Depends: nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python2.7, debconf
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>

debian/postinst

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
   # shellcheck disable=SC1091
@@ -26,10 +27,10 @@ call-sshcommand() {
 }
 
 case "$1" in
-  abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
+  abort-upgrade | abort-remove | abort-deconfigure) ;;
 
-  configure)
+  \
+    configure)
     mandb
     [ ! -x /usr/bin/docker.io ] || ln -sf /usr/bin/docker.io /usr/local/bin/docker
     modprobe aufs || echo "WARNING: Restart server to finish installing dokku!"
@@ -55,14 +56,18 @@ case "$1" in
       elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
         rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
       elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available;
+        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available
       fi
     done
 
+    db_get "dokku/nginx_enable"
     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;
+      if [ "$plugin" = "nginx-vhosts" ] && [ "$RET" = "false" ]; then
+        echo "Skipping enable of nginx-vhosts plugin"
+        continue
+      elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+        ln -s ${DOKKU_LIB_ROOT}/core-plugins/available/$plugin ${DOKKU_LIB_ROOT}/plugins/available/$plugin
         PLUGIN_PATH=${DOKKU_LIB_ROOT}/core-plugins plugn enable $plugin
         PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn enable $plugin
       fi
@@ -71,7 +76,7 @@ case "$1" in
     chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins
 
     echo "Ensure proper sshcommand path"
-    echo '/usr/bin/dokku' > "${DOKKU_ROOT}/.sshcommand"
+    echo '/usr/bin/dokku' >"${DOKKU_ROOT}/.sshcommand"
     if [[ -f .ssh/authorized_keys ]]; then
       sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "${DOKKU_ROOT}/.ssh/authorized_keys"
       rm "${DOKKU_ROOT}/.ssh/authorized_keys"
@@ -92,8 +97,8 @@ case "$1" in
         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
+      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
@@ -110,19 +115,19 @@ case "$1" in
     else
       db_get "dokku/vhost_enable"
       if [ "$RET" = "true" ]; then
-          db_get "dokku/hostname"
-          echo "Setting VHOST contents to $RET"
-          echo "$RET" > "${DOKKU_ROOT}/VHOST"
+        db_get "dokku/hostname"
+        echo "Setting VHOST contents to $RET"
+        echo "$RET" >"${DOKKU_ROOT}/VHOST"
       fi
     fi
 
     db_get "dokku/hostname"
-    echo "$RET" > "${DOKKU_ROOT}/HOSTNAME"
+    echo "$RET" >"${DOKKU_ROOT}/HOSTNAME"
 
     if [ -z "${DEBCONF_RECONFIGURE}" ]; then
       db_get "dokku/key_file"
       if [ -f "$RET" ]; then
-        call-sshcommand acl-add dokku default < "$RET" || true
+        call-sshcommand acl-add dokku default <"$RET" || true
       fi
     fi
     ;;

debian/postrm

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
   # shellcheck disable=SC1091
@@ -21,7 +22,10 @@ main() {
   rm -f /etc/systemd/system/dokku-redeploy.service
   rm -f /etc/update-motd.d/99-dokku
 
-  (nginx -t && service nginx reload) || true
+  db_get "dokku/nginx_enable"
+  if [ "$RET" = "true" ]; then
+    (nginx -t && service nginx reload) || true
+  fi
 
   if [[ "$1" == "purge" ]]; then
     rm -f /etc/nginx/conf.d/dokku.conf

debian/preinst

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+set -eo pipefail
+[[ $TRACE ]] && set -x
 
 if [[ -e /usr/share/debconf/confmodule ]]; then
   # shellcheck disable=SC1091
@@ -23,10 +24,13 @@ case "$1" in
         echo '    proxy_pass  http://dokku-installer;'
         echo '  }'
         echo '}'
-      } >> $NGINX_CONF
+      } >>$NGINX_CONF
 
       rm -f /etc/nginx/sites-enabled/*
-      DOKKU_DISTRO="$(. /etc/os-release > /dev/null 2>&1 || true ; echo "$ID")"
+      DOKKU_DISTRO="$(
+        . /etc/os-release >/dev/null 2>&1 || true
+        echo "$ID"
+      )"
       case "$DOKKU_DISTRO" in
         debian)
           NGINX_INIT="/usr/sbin/invoke-rc.d"
@@ -44,21 +48,21 @@ case "$1" in
     if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then
       db_get "dokku/key_file"
       if [ ! -f "$RET" ]; then
-          echo "Error: keyfile '$RET' not found."
-          echo "       you can enter a new keyfile path when you restart the installation."
-          db_reset "dokku/key_file"
-          exit 1
+        echo "Error: keyfile '$RET' not found."
+        echo "       you can enter a new keyfile path when you restart the installation."
+        db_reset "dokku/key_file"
+        exit 1
       fi
     fi
     ;;
 
-  upgrade)
-    ;;
+  upgrade) ;;
 
-  abort-upgrade)
-    ;;
+  \
+    abort-upgrade) ;;
 
-  *)
+  \
+    *)
     echo "preinst called with unknown argument \`$1'" >&2
     exit 1
     ;;

debian/prerm

@@ -1,34 +1,35 @@
 #!/bin/bash
-set -eo pipefail; [[ $TRACE ]] && set -x
+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
+    echo "Usage: $0 PID" >/dev/stderr
     exit 1
   fi
 
-  declare -i pid=$1;
-  ppid=0;
-  header_modifier="";
-  while : ; do
+  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;
+      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;
+      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
+  if ps_backtrace $BASHPID 2>/dev/null | grep dpkg | grep -- "--purge" >/dev/null; then
     echo "Processing purge"
 
     echo "Destroying deployed applications"
@@ -40,7 +41,7 @@ main() {
     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;
+        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

debian/templates

@@ -22,3 +22,8 @@ Template: dokku/key_file
 Description: Keyfile for initial user:
 Type: string
 Default: /root/.ssh/id_rsa.pub
+
+Template: dokku/nginx_enable
+Description: Enable nginx-vhosts plugin?
+Type: boolean
+Default: true

docs/advanced-usage/deployment-tasks.md

@@ -2,25 +2,52 @@
 
 > New as of 0.5.0
 
-Sometimes you need to run a command on at deployment time, but before an app is completely deployed.
-Common use cases include:
+Sometimes you need to run a command on at deployment time, but before an app is completely deployed. Common use cases include:
 
 * Checking a database is initialized
 * Running database migrations
 * Any commands required to set up the server (e.g. something like a Django `collectstatic`)
 
-## `app.json` and `scripts.dokku`
+To support this, Dokku provides support for a special `release` command within your app's `Procfile`, as well as a special `scripts.dokku` key inside of your app's `app.json` file. Be aware that all commands are run within the context of the built docker image - no commands affect the host unless there are volume mounts attached to your app.
 
-Dokku accomplishes this by using an `app.json` file. The format in use is similar to format of Heroku's [app.json](https://devcenter.heroku.com/articles/app-json-schema).
-However, Dokku currently only supports the nodes `scripts.dokku.predeploy` and `scripts.dokku.postdeploy`.
-For buildpack apps, simply place an `app.json` file in the root of your repository.
-For dockerfile apps, place `app.json` in the configured `WORKDIR` directory; otherwise Dokku defaults to the buildpack app behavior of looking in `/app`.
+Each "phase" has different expectations and limitations:
 
-> NOTE: postdeploy changes are *NOT* committed to the app image.
+- `app.json`: `scripts.dokku.predeploy`
+    - When to use: This should be used if your app does not support arbitrary build commands and you need to make changes to the built image.
+    - Are changes committed to the image at this phase: Yes
+    - Example use-cases
+        - Bundling assets in a slightly different way
+        - Installing a custom package from source or copying a binary into place
+- `app.json`: `scripts.dokku.postdeploy`
+    - When to use: This should be used in conjunction with external systems to signal the completion of your deploy.
+    - Are changes committed to the image at this phase: No
+    - Example use-cases
+        - Notifying slack that your app is deployed
+        - Coordinating traffic routing with a central load balancer
+- `Procfile`: `release`
+    - When to use: This should be used in conjunction with external systems to signal the completion of your app image build.
+    - Are changes committed to the image at this phase: No
+    - Example use-cases
+        - Sending CSS, JS, and other assets from your app’s slug to a CDN or S3 bucket
+        - Priming or invalidating cache stores
+        - Running database migrations
 
-### Example app.json
+Please keep the above in mind when utilizing deployment tasks.
 
-> NOTE: Only the `scripts.dokku.predeploy` and `scripts.dokku.postdeploy` tasks are supported by Dokku at this time. All other fields will be ignored and can be omitted.
+> To execute commands on the host during a release phase, see the [plugin creation documentation](/docs/development/plugin-creation) docs for more information on building your own custom plugin.
+
+## `app.json` deployment tasks
+
+Dokku provides limited support for the `app.json` manifest from Heroku (documentation available [here](https://devcenter.heroku.com/articles/app-json-schema)). The keys available for use with Deployment Tasks are:
+
+- `scripts.dokku.predeploy`: This is run _after_ an app's docker image is built, but _before_ any containers are scheduled. Changes made to your image are committed at this phase.
+- `scripts.dokku.postdeploy`: This is run _after_ an app's containers are scheduled. Changes made to your image are *not* committed at this phase.
+
+For buildpack-based deployments, the location of the `app.json` file should be at the root of your repository. Dockefile-based app deploys should have the `app.json` in the configured `WORKDIR` directory; otherwise Dokku defaults to the buildpack app behavior of looking in `/app`.
+
+> Warning: Any failed `app.json` deployment task will fail the deploy. In the case of either phase, a failure will not affect any running containers.
+
+The following is an example `app.json` file. Please note that only the `scripts.dokku.predeploy` and `scripts.dokku.postdeploy` tasks are supported by Dokku at this time. All other fields will be ignored and can be omitted.
 
 ```json
 {
@@ -32,3 +59,19 @@ For dockerfile apps, place `app.json` in the configured `WORKDIR` directory; oth
   }
 }
 ```
+
+## Procfile Release command
+
+> New as of 0.14.0
+
+The `Procfile` also supports a special `release` command which acts in a similar way to the [Heroku Release Phase](https://devcenter.heroku.com/articles/release-phase). This command is executed _after_ an app's docker image is built, but _before_ any containers are scheduled. This is also run _after_ any command executed by `scripts.dokku.predeploy`.
+
+To use the `release` command, simply add a `release` stanza to your Procfile.
+
+```Procfile
+release: curl https://some.external.api.service.com/deployment?state=built
+```
+
+Unlike the `scripts.dokku.predeploy` command, changes made during by the `release` command are *not* persisted to disk.
+
+> Warning: scaling the release command up will likely result in unspecified issues within your deployment, and is highly discouraged.

docs/advanced-usage/persistent-storage.md

@@ -39,11 +39,11 @@ dokku storage:mount node-js-app /var/lib/dokku/data/storage/node-js-app:/storage
 
 Dokku will then mount the shared contents of `/var/lib/dokku/data/storage` to `/storage` inside the container.
 
-Once you have mounted persistent storage, you will also need to restart the application. See the 
+Once you have mounted persistent storage, you will also need to restart the application. See the
 [process scaling documentation](/docs/deployment/process-management.md) for more information.
 
 ```shell
-dokku ps:rebuild app-name
+dokku ps:restart app-name
 ```
 
 A more complete workflow may require making a custom directory for your application and mounting it within your `/app/storage` directory instead. The mount point is *not* relative to your application's working directory, and is instead relative to the root of the container.
@@ -132,7 +132,7 @@ Your app may have services that are running in memory and need to be backed up l
 By default, Dokku will only bind storage mounts during the deploy and run phases. Under certain conditions, one might want to bind a storage mount during the build phase. This can be accomplished by using the `docker-options` plugin directly.
 
 ```shell
-dokku docker-options:add <app> build "-v /tmp/python-test:/opt/test"
+dokku docker-options:add node-js-app build "-v /tmp/python-test:/opt/test"
 ```
 
 You cannot use mounted volumes during the build phase of a Dockerfile deploy. This is because Docker does not support volumes when executing `docker build`.
@@ -147,4 +147,4 @@ By default, Dokku will execute your buildpack application processes as the `hero
 
 > NOTE: this user must exist in your herokuish image.
 
-Additionally, Dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`.
+Additionally, the default `docker-local` scheduler that comes with Dokku will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`. See the [scheduler-docker-local documentation](/docs/advanced-usage/schedulers/docker-local.md#disabling-chown-of-persistent-storage) docs for more information.

docs/advanced-usage/plugin-management.md

@@ -31,31 +31,31 @@ dokku plugin
 
 ```
 plugn: dev
-  00_dokku-standard    0.12.8 enabled    dokku core standard plugin
-  20_events            0.12.8 enabled    dokku core events logging plugin
-  apps                 0.12.8 enabled    dokku core apps plugin
-  build-env            0.12.8 enabled    dokku core build-env plugin
-  certs                0.12.8 enabled    dokku core certificate management plugin
-  checks               0.12.8 enabled    dokku core checks plugin
-  common               0.12.8 enabled    dokku core common plugin
-  config               0.12.8 enabled    dokku core config plugin
-  docker-options       0.12.8 enabled    dokku core docker-options plugin
-  domains              0.12.8 enabled    dokku core domains plugin
-  enter                0.12.8 enabled    dokku core enter plugin
-  git                  0.12.8 enabled    dokku core git plugin
-  logs                 0.12.8 enabled    dokku core logs plugin
-  named-containers     0.12.8 enabled    dokku core named containers plugin
-  network              0.12.8 enabled    dokku core network plugin
-  nginx-vhosts         0.12.8 enabled    dokku core nginx-vhosts plugin
-  plugin               0.12.8 enabled    dokku core plugin plugin
-  proxy                0.12.8 enabled    dokku core proxy plugin
-  ps                   0.12.8 enabled    dokku core ps plugin
-  repo                 0.12.8 enabled    dokku core repo plugin
-  shell                0.12.8 enabled    dokku core shell plugin
-  ssh-keys             0.12.8 enabled    dokku core ssh-keys plugin
-  storage              0.12.8 enabled    dokku core storage plugin
-  tags                 0.12.8 enabled    dokku core tags plugin
-  tar                  0.12.8 enabled    dokku core tar plugin
+  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
 ```
 
 Installing a plugin is easy as well using the `plugin:install` command. This command will also trigger the `install` pluginhook on all existing plugins.

docs/advanced-usage/schedulers/docker-local.md

@@ -1,5 +1,12 @@
 # Docker Local Scheduler
 
+> Subcommands new as of 0.12.12
+
+```
+scheduler-docker-local:report [<app>] [<flag>]              # Displays a scheduler-docker-local report for one or more apps
+scheduler-docker-local:set <app> <key> (<value>)            # Set or clear a scheduler-docker-local property for an app
+```
+
 > New as of 0.12.0
 
 Dokku natively includes functionality to manage application lifecycles for a single server using the `scheduler-docker-local` plugin. It is the default scheduler, but as with all schedulers, it is set on a per-application basis. The scheduler can currently be overridden by running the following command:
@@ -14,6 +21,22 @@ As it is the default, unsetting the `DOCKER_SCHEDULER` config variable is also a
 dokku config:unset node-js-app DOCKER_SCHEDULER
 ```
 
+## Usage
+
+### Disabling chown of persistent storage
+
+The `scheduler-docker-local` plugin will ensure your storage mounts are owned by either `herokuishuser` or the overridden value you have set in `DOKKU_APP_USER`. You may disable this by running the following `scheduler-docker-local:set` command for your application:
+
+```shell
+dokku scheduler-docker-local:set node-js-app disable-chown true
+```
+
+Once set, you may re-enable it by setting a blank value for `disable-chown`:
+
+```shell
+dokku scheduler-docker-local:set node-js-app disable-chown
+```
+
 ## Implemented Triggers
 
 This plugin implements various functionality through `plugn` triggers to integrate with Docker for running apps on a single server. The following functionality is supported by the `scheduler-docker-local` plugin.
@@ -25,7 +48,8 @@ This plugin implements various functionality through `plugn` triggers to integra
 - `pre-restore`
 - `scheduler-deploy`
 - `scheduler-docker-cleanup`
+- `scheduler-logs-failed`
 - `scheduler-run`
 - `scheduler-stop`
 - `scheduler-tags-create`
-- `scheduler-tags-destroy`
+- `scheduler-tags-destroy`

docs/assets/favicons/browserconfig.xml

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

docs/assets/favicons/manifest.json

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

docs/assets/style.css

@@ -39,13 +39,13 @@ h1 {
   font-size: 1.6em;
 }
 .header .navbar-brand a {
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }
@@ -177,7 +177,8 @@ h1 {
 .featurette img {
   width: 400px;
 }
-.slack-channel {
+.slack-channel,
+.sponsors {
   background-color: #EEF1F7;
   font-size: 1.6em;
   font-weight: 300;
@@ -199,28 +200,35 @@ h1 {
 .slack-button img {
   height: 1em;
 }
-.team-members img {
-  -moz-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
-  -webkit-border-radius: 3px;
-  -webkit-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
-  border-radius: 3px;
-  border: 8px solid white;
-  box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
-  display: block;
-  height: 200px;
-  margin: 20px auto 20px auto;
+.sponsors {
+  background-color: #272822;
+  color: #FCFCFC;
 }
-.team-members .fund-link {
+.sponsors a {
+  color: #f0ad4e;
+}
+.sponsors .backer img,
+.sponsors .sponsor img {
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  border: 8px solid gray;
+  margin: 20px auto 20px auto;
+  max-width: 192px;
+}
+.sponsors .backer img {
+  -webkit-border-radius: 50%;
+  border-radius: 50%;
+  border: 0;
+}
+.sponsors img:hover {
+  -moz-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+  -webkit-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+  box-shadow: 0px 0px 32px 0px rgba(0,0,0,0.75);
+}
+.sponsors .fund-link {
   display: block;
   font-size: .8em;
 }
-.team-member {
-  min-height: 320px;
-}
-.team-member-image img:last-child { display: none }
-.team-member-image:hover img:first-child { display: none; }
-.team-member-image:hover img:last-child { display: inline-block; }
-
 .list-group-item {
   border: none;
   font-size: 1.1em;

docs/assets/versions.json

@@ -9,6 +9,8 @@
     "0.9.4", 
     "0.10.5", 
     "0.11.6", 
-    "0.12.8"
+    "0.12.13", 
+    "0.13.4", 
+    "0.14.2"
   ]
 }

docs/configuration/environment-variables.md

@@ -13,8 +13,9 @@ config:export (<app>|--global) [--envfile]
 config:keys (<app>|--global) [--merged]                                               Show keys set in environment
 config:bundle (<app>|--global) [--merged]                                             Bundle environment into tarfile
 ```
+> For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
 
-The variables are available both at run time and during the application build/compilation step for buildpack-based deploys. For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available *only* during runtime, as noted in [this issue](https://github.com/dokku/dokku/issues/1860).
+Environment variables are available both at run time and during the application build/compilation step for buildpack-based deploys.
 
 For buildpack deploys, Dokku will create a  `/app/.env` file that can be used for legacy buildpacks. Note that this is *not* updated when `config:set` or `config:unset` is called, and is only written during a `deploy` or `ps:rebuild`. Developers are encouraged to instead read from the application environment directly, as the proper values will be available then.
 

docs/configuration/nginx.md

@@ -6,6 +6,67 @@ Dokku uses nginx as its server for routing requests to specific applications. By
 nginx:access-logs <app> [-t]             # Show the nginx access logs for an application (-t follows)
 nginx:build-config <app>                 # (Re)builds nginx config for given app
 nginx:error-logs <app> [-t]              # Show the nginx error logs for an application (-t follows)
+nginx:validate [<app>] [--clean]         # Validates and optionally cleans up invalid nginx configurations
+```
+
+## Checking access logs
+
+You may check nginx access logs via the `nginx:access-logs` command. This assumes that app access logs are being stored in `/var/log/nginx/$APP-access.log`, as is the default in the generated `nginx.conf`.
+
+```shell
+dokku nginx:access-logs node-js-app
+```
+
+You may also follow the logs by specifying the `-t` flag.
+
+```shell
+dokku nginx:access-logs node-js-app -t
+```
+
+## Checking error logs
+
+You may check nginx error logs via the `nginx:access-logs` command. This assumes that app error logs are being stored in `/var/log/nginx/$APP-error.log`, as is the default in the generated `nginx.conf`.
+
+```shell
+dokku nginx:error-logs node-js-app
+```
+
+You may also follow the logs by specifying the `-t` flag.
+
+```shell
+dokku nginx:error-logs node-js-app -t
+```
+
+## Regenerating nginx config
+
+In certain cases, your app nginx configs may drift from the correct config for your app. You may regenerate the config at any point via the `nginx:build-config` command. This may fail if there are no current web listeners for your app.
+
+```shell
+dokku nginx:build-config node-js-app
+```
+
+## Validating nginx configs
+
+It may be desired to validate an nginx config outside of the deployment process. To do so, run the `nginx:validate` command. With no arguments, this will validate all app nginx configs, one at a time. A minimal wrapper nginx config is generated for each app's nginx config, upon which `nginx -t` will be run.
+
+```shell
+dokku nginx:validate
+```
+
+As app nginx configs are actually executed within a shared context, it is possible for an individual config to be invalid when being validated standalone but _also_ be valid within the global server context. As such, the exit code for the `nginx:validate` command is the exit code of `nginx -t` against the server's real nginx config.
+
+The `nginx:validate` command also takes an optional `--clean` flag. If specified, invalid nginx configs will be removed.
+
+> Warning: Invalid app nginx config's will be removed _even if_ the config is valid in the global server context.
+
+```shell
+dokku nginx:validate --clean
+```
+
+The `--clean` flag may also be specified for a given app:
+
+```shell
+dokku nginx:validate node-js-app --clean
 ```
 
 ## Customizing the nginx configuration
@@ -75,6 +136,16 @@ Your `nginx.conf` file - not to be confused with Dokku's `nginx.conf.sigil` - wo
 
 Please adjust the `Procfile` and `nginx.conf` file as appropriate.
 
+## Custom Error Pages
+
+By default, Dokku provides custom error pages for the following three categories of errors:
+
+- 4xx: For all non-404 errors with a 4xx response code.
+- 404: For "404 Not Found" errors.
+- 5xx: For all 5xx error responses
+
+These are provided as an alternative to the generic Nginx error page, are shared for _all_ applications, and their contents are located on disk at `/var/lib/dokku/data/nginx-vhosts/dokku-errors`. To customize them for a specific app, create a custom `nginx.conf.sigil` as described above and change the paths to point elsewhere.
+
 ## Domains plugin
 
 See the [domain configuration documentation](/docs/configuration/domains.md).

docs/deployment/application-deployment.md

@@ -1,5 +1,8 @@
 # Deploying to Dokku
 
+> Note: This document uses the hostname `dokku.me` in commands. For your server please
+> substitute your server's hostname instead.
+
 ## Deploy tutorial
 
 Once Dokku has been configured with at least one user, applications can be deployed via a `git push` command. To quickly see Dokku deployment in action, you can use the Heroku Ruby on Rails example app.
@@ -37,7 +40,7 @@ dokku postgres:create rails-database
 
 ### Linking backing services to applications
 
-Once the service creation is complete, set the `POSTGRES_URL` environment variable by linking the service.
+Once the service creation is complete, set the `DATABASE_URL` environment variable by linking the service.
 
 ```shell
 # on the Dokku host
@@ -63,6 +66,10 @@ git push dokku master
 > the upstream with the scheme `ssh://` like so: `ssh://dokku@dokku.me:ruby-rails-sample`
 > Please see the [Git](https://git-scm.com/docs/git-clone#_git_urls_a_id_urls_a) documentation for more details.
 
+> Note: Your private key should be registered with ssh-agent in local development. If you get a
+> permission denied error when pushing you can register your private key by running
+> `ssh-add -k ~/<your private key>`.
+
 ```
 Counting objects: 231, done.
 Delta compression using up to 8 threads.

docs/deployment/application-management.md

@@ -8,10 +8,11 @@ apps:create <app>                              # Create a new app
 apps:destroy <app>                             # Permanently destroy an app
 apps:exists <app>                              # Checks if an app exists
 apps:list                                      # List your apps
-apps:lock                                      # Creates a '.deploy.lock' file in an application's repo
+apps:lock <app>                                # Locks an app for deployment
+apps:locked <app>                              # Checks if an app is locked for deployment
 apps:rename <old-app> <new-app>                # Rename an app
 apps:report [<app>] [<flag>]                   # Display report about an app
-apps:unlock                                    # Removes the '.deploy.lock' file from an application's repo
+apps:unlock <app>                              # Unlocks an app for deployment
 ```
 
 ## Usage
@@ -148,9 +149,9 @@ dokku apps:clone node-js-app io-js-app
 Cloning node-js-app to io-js-app... done
 ```
 
-This will copy all of your app's contents into a new app directory with the name of your choice and then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved.
+This will copy all of your app's contents into a new app directory with the name of your choice and then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved. Custom domains and SSL certificates will not be copied to the new app.
 
-> Warning: If you have exposed specific ports via docker-options, added generic domains, or performed anything that cannot be done against multiple applications, `apps:clone` may result in errors.
+> Warning: If you have exposed specific ports via docker-options, or performed anything that cannot be done against multiple applications, `apps:clone` may result in errors.
 
 By default, Dokku will deploy this new application, though you can skip the deploy by using the `--skip-deploy` flag:
 
@@ -193,10 +194,25 @@ dokku apps:unlock node-js-app
 
 ```
  !     A deploy may be in progress.
- !     Removing the application lock will not stop in progress deploys.
+ !     Removing the app lock will not stop in progress deploys.
 -----> Deploy lock removed.
 ```
 
+### Checking lock status
+
+> New as of 0.13.0
+
+In some cases, you may wish to inspect the state of an app lock. To do so, you can issue an `apps:lock` command. This will exit non-zero if there is no app lock in place.
+
+
+```shell
+dokku apps:locked node-js-app
+```
+
+```
+Deploy lock does not exist
+```
+
 ### Displaying reports about an app
 
 > New as of 0.8.1

docs/deployment/logs.md

@@ -1,19 +1,21 @@
 # Log Management
 
 ```
-logs <app>           # display recent log output
+logs <app> [-h] [-t] [-n num] [-q] [-p process]  # Display recent log output
+logs:failed [<app>]                              # Shows the last failed deploy logs
 ```
 
 ## Usage
 
-### Application Logs
-You can easily get logs of an application using the `logs` command:
+### App Logs
+
+You can easily get logs of an app using the `logs` command:
 
 ```shell
 dokku logs node-js-app
 ```
 
-## Behavioral modifiers
+#### Behavioral modifiers
 
 Dokku also supports certain command-line arguments that augment the `log` command's behavior.
 
@@ -26,8 +28,25 @@ Dokku also supports certain command-line arguments that augment the `log` comman
 
 You can use these modifiers as follows:
 
-
 ```shell
 dokku logs node-js-app -t -p web
 ```
 will show logs continually from the web process.
+
+### Failed Deploy Logs
+
+> Warning: The default `docker-local` scheduler will "store" these until the next deploy or until the old containers are garbage collected - whichever runs first. If you require the logs beyond this point in time, please ship the logs to a centralized log server.
+
+In some cases, it may be useful to retrieve the logs from a previously failed deploy.
+
+You can retrieve these logs by using the `logs:failed` command
+
+```shell
+dokku logs:failed node-js-app
+```
+
+You can also retrieve the failed logs for each app:
+
+```shell
+dokku logs:failed node-js-app
+```

docs/deployment/methods/git.md

@@ -51,7 +51,7 @@ dokku git:set --global deploy-branch SOME_BRANCH_NAME
 dokku git:set node-js-app deploy-branch SOME_BRANCH_NAME
 ```
 
-Pushing multiple branches can also be supportec by creating a [receive-branch](/docs/development/plugin-triggers.md#receive-branch) plugin trigger in a custom plugin.
+Pushing multiple branches can also be supported by creating a [receive-branch](/docs/development/plugin-triggers.md#receive-branch) plugin trigger in a custom plugin.
 
 ### Configuring the GIT_REV Environment Variable
 

docs/deployment/methods/images.md

@@ -65,7 +65,9 @@ dokku/node-js-app   v1                  936a42f25901        About a minute ago
 
 ### Deploying an image tag
 
-Finally, you can also deploy a local image using the `tags:deploy` command.
+Finally, you can also deploy a local image using the `tags:deploy` command. When specifying a tag that is not `latest`, the released image will be retagged as the `latest` image tag for the app.
+
+> Warning: For images based on herokuish, using the `tags:deploy` command will reset environment variables written into the image, causing a retag to occur. This will - on average - add two extra layers to your deployed image. Note that this does not affect dockerfile-based images, which are the majority of images deployed via the `tags` command.
 
 ```shell
 dokku tags:deploy node-js-app v1
@@ -161,7 +163,7 @@ docker build -t dokku/test-app:v12 .
 # copy the image to the dokku host
 docker save dokku/test-app:v12 | bzip2 | ssh my.dokku.host "bunzip2 | docker load"
 # tag and deploy the image
-ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12 && dokku tags:create test-app latest"
+ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-app v12"
 ```
 
 ## Related articles

docs/deployment/process-management.md

@@ -4,6 +4,7 @@
 
 ```
 ps <app>                                       # List processes running in app container(s)
+ps:inspect <app>                               # Displays a sanitized version of docker inspect for an app
 ps:rebuild <app>                               # Rebuild an app from source
 ps:rebuildall                                  # Rebuild all apps from source
 ps:report [<app>] [<flag>]                     # Displays a process report for one or more apps
@@ -32,6 +33,18 @@ To find out if your application's containers are running the commands you expect
 dokku ps node-js-app
 ```
 
+### Inspecting app containers
+
+> New as of 0.13.0
+
+A common administrative task to perform is calling `docker inspect` on the containers that are running for an application. This can be an error-prone task to perform, and may also reveal sensitive environment variables if not done correctly. Dokku provides a wrapper around this command via the `ps:inspect` command:
+
+```shell
+dokku ps:inspect node-js-app
+```
+
+This command will gather all the running container IDs for your application and call `docker inspect`, sanitizing the output data so it can be copy-pasted elsewhere safely.
+
 ### Rebuilding applications
 
 There are some Dokku commands which will not automatically rebuild an application's environment, or which can be told to skip a rebuild.  For instance, you may wish to run multiple `config:set` commands without a restart so as to speed up configuration. In these cases, you can ultimately trigger an application rebuild using `ps:rebuild`

docs/development/plugin-triggers.md

@@ -373,6 +373,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `network-clear-config`
+
+- Description: Clears network configuration
+- Invoked by: `internally triggered by proxy-clear-config within proxy implementations`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `network-compute-ports`
 
 - Description: Computes the ports for a given app container
@@ -544,6 +559,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `post-app-clone-setup`
+
+- Description: Allows you to run commands after an app is setup, and before it is rebuild. This is useful for cleaning up tasks, or ensuring configuration from an old app is copied to the new app
+- Invoked by: `dokku apps:clone`
+- Arguments: `$OLD_APP_NAME $NEW_APP_NAME`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `post-app-rename`
 
 - Description: Allows you to run commands after an app was renamed.
@@ -1040,6 +1070,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `proxy-clear-config`
+
+- Description: Clears the proxy implementation configuration for a given app
+- Invoked by: `internally triggered by apps:rename`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `proxy-enable`
 
 - Description: Enables the configured proxy implementation for an app
@@ -1147,9 +1192,12 @@ APP="$1";
 
 ### `scheduler-deploy`
 
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
 - Description: Allows you to run scheduler commands when an app is deployed
 - Invoked by: `dokku deploy`
-- Arguments: `$DOKKU_SCHEDULER APP IMAGE_TAG`
+- Arguments: `$DOKKU_SCHEDULER $APP $IMAGE_TAG`
 - Example:
 
 ```shell
@@ -1163,9 +1211,12 @@ DOKKU_SCHEDULER="$1"; APP="$2"; IMAGE_TAG="$3";
 
 ### `scheduler-docker-cleanup`
 
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
 - Description: Allows you to run scheduler commands when dokku cleanup is invoked
 - Invoked by: `dokku deploy, dokku cleanup`
-- Arguments: `$DOKKU_SCHEDULER APP FORCE_CLEANUP`
+- Arguments: `$DOKKU_SCHEDULER $APP $FORCE_CLEANUP`
 - Example:
 
 ```shell
@@ -1177,11 +1228,52 @@ DOKKU_SCHEDULER="$1"; APP="$2"; FORCE_CLEANUP="$3";
 # TODO
 ```
 
+### `scheduler-inspect`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run inspect commands for all containers for a given app
+- Invoked by: `dokku ps:inspect`
+- Arguments: `$DOKKU_SCHEDULER $APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2";
+
+# TODO
+```
+
+### `scheduler-logs-failed`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to run scheduler commands when retrieving failed container logs
+- Invoked by: `dokku logs:failed`
+- Arguments: `$DOKKU_SCHEDULER $APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; ARGS="${@:3}";
+
+# TODO
+```
+
 ### `scheduler-run`
 
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
 - Description: Allows you to run scheduler commands when a command is executed for your app
 - Invoked by: `dokku run`
-- Arguments: `$DOKKU_SCHEDULER APP ...ARGS`
+- Arguments: `$DOKKU_SCHEDULER $APP ...ARGS`
 - Example:
 
 ```shell
@@ -1195,9 +1287,12 @@ DOKKU_SCHEDULER="$1"; APP="$2"; ARGS="${@:3}";
 
 ### `scheduler-stop`
 
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
 - Description: Allows you to run scheduler commands when a tag is destroyed
 - Invoked by: `dokku apps:destroy, dokku ps:stop`
-- Arguments: `$DOKKU_SCHEDULER APP REMOVE_CONTAINERS`
+- Arguments: `$DOKKU_SCHEDULER $APP $REMOVE_CONTAINERS`
 - Example:
 
 ```shell
@@ -1211,9 +1306,12 @@ DOKKU_SCHEDULER="$1"; APP="$2"; REMOVE_CONTAINERS="$3";
 
 ### `scheduler-tags-create`
 
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
 - Description: Allows you to run scheduler commands when a tag is created
 - Invoked by: `dokku tags:create`
-- Arguments: `$DOKKU_SCHEDULER APP SOURCE_IMAGE TARGET_IMAGE`
+- Arguments: `$DOKKU_SCHEDULER $APP $SOURCE_IMAGE $TARGET_IMAGE`
 - Example:
 
 ```shell
@@ -1227,9 +1325,12 @@ DOKKU_SCHEDULER="$1" APP="$2" SOURCE_IMAGE="$3" TARGET_IMAGE="$4"
 
 ### `scheduler-tags-destroy`
 
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
 - Description: Allows you to run scheduler commands when a tag is destroyed
 - Invoked by: `dokku tags:destroy`
-- Arguments: `$DOKKU_SCHEDULER APP IMAGE_REPO IMAGE_TAG`
+- Arguments: `$DOKKU_SCHEDULER $APP $IMAGE_REPO $IMAGE_TAG`
 - Example:
 
 ```shell

docs/development/release-process.md

@@ -5,13 +5,12 @@ Dokku is released in intervals *at most* three weeks apart, though may be releas
 To propose a release, the following tasks need to be performed:
 
 ```shell
-export PACKAGECLOUD_API_TOKEN=SOME_TOKEN
+export PACKAGECLOUD_TOKEN=SOME_TOKEN
 # supports major/minor/patch/betafish
 contrib/release
 ```
 
-> If you are a maintainer and need the PACKAGECLOUD_API_TOKEN in order to make a release, please contact @josegonzalez to get this information.
-
+> If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.
 
 As well, the ArchLinux package description *must* be updated via `vagrant up build-arch` (needs to be done after the tag is pushed to GitHub, because it is based on that)
 
@@ -30,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.12.8-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.14.2-2 (Mon Feb 22 23:20:37 CET 2016)"
 cd ../dokku-arch
 git add PKGBUILD .SRCINFO
 git commit -m 'Update to dokku 0.9.9'

docs/development/testing.md

@@ -46,3 +46,39 @@ make deploy-test-nodejs-express
 ```
 
 For a full list of test make targets check out `tests.mk` in the root of the Dokku repository.
+
+## Executing a single test suite
+
+When working on a particular plugin, it may be useful to run _only_ a particular test suite. This can be done by specifying the test suite path:
+
+```shell
+bats tests/unit/10_apps.bats
+```
+
+It is also possible to target multiple test suites at a time.
+
+```shell
+bats tests/unit/10_apps.bats tests/unit/10_certs.bats
+```
+
+## Executing a single test
+
+In order to increase testing velocity, a wrapper script around bats is available that can be used to run a single testcase within a suite.
+
+Tests within a suite may be listed by specifying the suite as a parameter to the `tests/bats-exec-test-single` script.
+
+```shell
+tests/bats-exec-test-single tests/unit/10_apps.bats
+```
+
+A single test can be specified as a second parameter. The test is selected by fuzzy-match, and only the first match is executed.
+
+```shell
+tests/bats-exec-test-single tests/unit/10_apps.bats clone
+```
+
+Some special characters are translated in the test listing - specifically the characters `( ) :` - while others are not. The fuzzy matching happens on the test names listed when no second character is invoked, so executing a test with a more specific name will work as expected.
+
+```shell
+tests/bats-exec-test-single tests/unit/10_apps.bats clone_-2d-2dskip-2ddeploy
+```

docs/getting-started/advanced-installation.md

@@ -62,7 +62,7 @@ Follow the [user management documentation](/docs/deployment/user-management.md)
 
 ## VMs with less than 1GB of memory
 
-Having less than 1GB of system memory available for Dokku and its containers, for example Digital Ocean's small 512MB machines, might result in unexpected errors, such as **! [remote rejected] master -> master (pre-receive hook declined)** during installation of NPM dependencies (https://github.com/npm/npm/issues/3867).
+Having less than 1GB of system memory available for Dokku and its containers may result in unexpected errors, such as **! [remote rejected] master -> master (pre-receive hook declined)** during installation of NPM dependencies (https://github.com/npm/npm/issues/3867).
 
 To work around this issue, it might suffice to augment the linux swap file size to a maximum of twice the physical memory size.
 
@@ -80,4 +80,5 @@ free
 
 echo "/var/swap.img    none    swap    sw    0    0" >> /etc/fstab
 ```
-Reference: https://www.digitalocean.com/community/tutorials/how-to-configure-virtual-memory-swap-file-on-a-vps
+
+[Reference](https://www.digitalocean.com/community/tutorials/how-to-configure-virtual-memory-swap-file-on-a-vps)

docs/getting-started/install/azure.md

@@ -2,10 +2,10 @@
 
 - If you don't already have one [generate an SSH key pair](https://help.github.com/articles/generating-ssh-keys/).
 
-- Go to the [Dokku on azure deployment page](https://github.com/azure/azure-quickstart-templates/tree/master/dokku-vm) and click **Deploy to Azure**.
+- Go to the [Dokku on Azure deployment page](https://github.com/azure/azure-quickstart-templates/tree/master/dokku-vm) and click **Deploy to Azure**.
 
-- You'll be prompted to enter a few parameters, including a unique storage account name and a unique name for the sub-domain used for your public IP address. For the `sshKeyData` parameter, copy and paste the contents of the **public** key file you just created. After a few minutes the Dokku instance will be deployed.
+- You'll be prompted to enter a few parameters, including a unique storage account name and a unique name for the sub-domain used for your public IP address. For the `sshKeyData` parameter, copy and paste the contents of the *public* key file you just created. After a few minutes the Dokku instance will be deployed.
 
-- In your browser of choice, navigate to `http://[[dnsNameForPublicIP]].[[location]].cloudapp.azure.com`. Where `[[dnsNameForPublicIP]]` and `[[location]]` are template parameters you used to deploy the template.
+- In your browser of choice, navigate to `http://[dnsNameForPublicIP].[location].cloudapp.azure.com`. Where `[dnsNameForPublicIP]` and `[location]` are template parameters you used to deploy the template.
 
-- Finish your Dokku setup like you normally would by creating a **new** public/private key pair for your deployments using `ssh-keygen` (don't use the same one as you created in the first step). You should select 'Use Virtual Host Naming' and set the `Hostname` to a **public dns name** that you own such as one you would purchase from [namecheap](http://namecheap.com). Alternatively thanks to [xip.io]( http://xip.io/) you can just use yourAzurePublicIP.xip.io for free. For example, if your public IP is `44.44.44.44` then you would set it to `44.44.44.44.xip.io`.
+- Finish your Dokku setup like you normally would by creating a *new* public/private key pair for your deployments using `ssh-keygen` (don't use the same one as you created in the first step). You should select **Use Virtual Host Naming** and set the **Hostname** to a *public DNS name* that you own such as one you would purchase from [Namecheap](http://namecheap.com). Alternatively thanks to [xip.io](http://xip.io/) you can just use `[yourAzurePublicIP].xip.io` for free. For example, if your public IP is `44.44.44.44` then you would set it to `44.44.44.44.xip.io`.

docs/getting-started/install/debian.md

@@ -1,6 +1,6 @@
 # Debian Package Installation Notes
 
-As of 0.3.18, Dokku defaults to being installed via debian package. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` bash script. The following are the steps run by said script:
+As of 0.3.18, Dokku defaults to being installed via Debian package. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` Bash script. The following are the steps run by said script:
 
 ```shell
 # install prerequisites
@@ -11,7 +11,7 @@ sudo apt-get install -qq -y apt-transport-https
 wget -nv -O - https://get.docker.com/ | sh
 
 # install dokku
-wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -
+wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
 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
@@ -22,7 +22,7 @@ sudo dokku plugin:install-dependencies --core
 
 ## Unattended installation
 
-In case you want to perform an unattended installation of dokku, this is made possible through [debconf](https://en.wikipedia.org/wiki/Debconf_%28software_package%29), which allows you to configure a package before installing it.
+In case you want to perform an unattended installation of Dokku, this is made possible through [debconf](https://en.wikipedia.org/wiki/Debconf_%28software_package%29), which allows you to configure a package before installing it.
 
 You can set any of the below options through the `debconf-set-selections` command, for example to enable vhost-based deployments:
 
@@ -37,7 +37,8 @@ After setting the desired options, proceed with the installation as described ab
 | Name               | Type    | Default               | Description                                                              |
 | ------------------ | ------- | --------------------- | ------------------------------------------------------------------------ |
 | dokku/web_config   | boolean | true                  | Use web-based config for below options                                   |
-| dokku/vhost_enable | boolean | false                 | Use vhost-based deployments (e.g., <app>.dokku.me)                        |
+| dokku/vhost_enable | boolean | false                 | Use vhost-based deployments (e.g. `[yourapp].dokku.me`)                        |
 | dokku/hostname     | string  | dokku.me              | Hostname, used as vhost domain and for showing app URL after deploy      |
 | dokku/skip_key_file| boolean | false                 | Don't check for the existence of the dokku/key_file. Warning: Setting this to true, will require you to manually add an SSH key later on. |
 | dokku/key_file     | string  | /root/.ssh/id_rsa.pub | Path on disk to an SSH key to add to the Dokku user (Will be ignored on `dpkg-reconfigure`) |
+| dokku/nginx_enable | boolean | true                  | Enable nginx-vhosts plugin |

docs/getting-started/install/digitalocean.md

@@ -1,22 +1,22 @@
 # Digital Ocean Droplet
 
-[Digital Ocean](https://www.digitalocean.com/products/compute/) offers a pre-installed Dokku image. You can run this image on any sized droplet, although larger droplets will allow you to run larger applications.
+[Digital Ocean](https://www.digitalocean.com/products/compute/) offers a pre-installed Dokku image. You can run this image on any sized Droplet, although larger Droplets will allow you to run larger applications.
 
 > **Please disable IPv6**. There are known issues with IPv6 on Digital Ocean and Docker. If you would like to run Dokku on an IPv6 Digital Ocean Droplet, please consult [this guide](https://jeffloughridge.wordpress.com/2015/01/17/native-ipv6-functionality-in-docker/).
 
-1. Login to your [Digital Ocean](https://m.do.co/c/fe06b043a083) account
+1. Login to your [Digital Ocean](https://m.do.co/c/fe06b043a083) account.
 2. Click **Create a Droplet**.
 3. Under **Choose an image > One-click apps** and choose the latest **Dokku** release for 16.04 _(version numbers may vary)_.
 4. Under **Choose a size** and select your a machine spec. We recommend a machine with _at least_ 1GB of memory.
 5. Under **Choose a datacenter region** select your region.
-6. Add an SSH Key
+6. Add an SSH Key.
    * New Keys
-     1. Under **Add your SSH keys** click **New SSH Key** _(this opens a dialog)_
-     2. From your terminal, execute `cat $HOME/.ssh/id_rsa.pub`
-     3. Copy the output and paste it into the **New SSH Key** dialog, provide a name and click **Add SSH Key**
+     1. Under **Add your SSH keys** click **New SSH Key** _(this opens a dialog)_.
+     2. From your terminal, execute `cat $HOME/.ssh/id_rsa.pub`.
+     3. Copy the output and paste it into the **New SSH Key** dialog, provide a name and click **Add SSH Key**.
    * Existing Keys
      1. Simply add a checkmark next to the existing keys you'd like to add.
-7. Under **Finalize and create**, give your droplet a hostname _(not required)_ and click **Create**.
+7. Under **Finalize and create**, give your Droplet a hostname _(not required)_ and click **Create**.
 8. Once created, copy the IP address to your clipboard.
-9. In a browser, go to the IP address you copied above and fill out the presented form to complete configuration. **Failure to do so may allow others to reconfigure SSH access on your server.**
-10. Once the web ui has been submitted, you will be redirected to our [application deployment tutorial](/docs/deployment/application-deployment.md), which will guide you through deploying a sample application to your Dokku server.
+9. In a browser, go to the IP address you copied above and fill out the presented form to complete configuration. _Failure to do so may allow others to reconfigure SSH access on your server._
+10. Once the web UI has been submitted, you will be redirected to our [application deployment tutorial](/docs/deployment/application-deployment.md), which will guide you through deploying a sample application to your Dokku server.

docs/getting-started/install/dreamhost.md

@@ -5,9 +5,9 @@ Dreamhost (or any other OpenStack-compatible cloud with minimal
 changes).
 
 A new server instance can be created on DreamHost Cloud from the command line
-using openstack client or from the web UI and with the same command
-use a cloud-init script to install Dokku. Install the [openstack
-cli](https://help.dreamhost.com/hc/en-us/articles/216185658-How-to-Install-the-OpenStack-command-line-clients),
+using OpenStack client or from the web UI and with the same command
+use a cloud-init script to install Dokku. Install the [OpenStack
+CLI](https://help.dreamhost.com/hc/en-us/articles/216185658-How-to-Install-the-OpenStack-command-line-clients),
 download the [DreamHost Cloud credentials
 file](https://iad2.dreamcompute.com/project/access_and_security/api_access/openrc/)
 before proceeding and make sure your public SSH key is added to the
@@ -17,10 +17,10 @@ cloud.
 source openrc.sh # Set the environment variables for DreamHost Cloud
 ```
 
-This allows openstack client to connect to DreamHost API endpoints.
+This allows OpenStack client to connect to DreamHost API endpoints.
 The command below creates a new server instance named `my-dokku-instance`
 based on Ubuntu 14.04, with 2GB RAM and 1CPU (the flavor called
-`supersonic`), opening network port access to http and ssh (the
+`supersonic`), opening network port access to HTTP and SSH (the
 `default` security group), and the name of the chosen SSH key. This
 key will be automatically added to the new server in the
 `authorized_keys` for the default SSH user (`ubuntu`), and it will

docs/getting-started/install/rpm.md

@@ -4,7 +4,7 @@
 
 >**Warning:** Web installer is not available on CentOS. You will need to configure [SSH keys](/docs/deployment/user-management.md#adding-ssh-keys) and [virtual hosts](/docs/configuration/domains.md#customizing-hostnames) using dokku command line interface.
 
-Dokku defaults to being installed via RPM package on CentOS 7. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` bash script. The following are the steps run by said script:
+Dokku defaults to being installed via RPM package on CentOS 7. While certain hosts may require extra work to get running, you may optionally wish to automate the installation of Dokku without the use of our `bootstrap.sh` Bash script. The following are the steps run by said script:
 
 ```shell
 # Install docker

docs/getting-started/install/vagrant.md

@@ -34,11 +34,10 @@
         Port 22
     ```
 
-    > For users that have customized the IP address of their VM - either in a custom `Vagrantfile` or via the `DOKKU_IP` environment variable - and are not using `10.0.0.2` for the Vagrant IP, you'll need to instead use the output of `vagrant ssh-config dokku` for your ~/.ssh/config entry. 
+    > For users that have customized the IP address of their VM - either in a custom `Vagrantfile` or via the `DOKKU_IP` environment variable - and are not using `10.0.0.2` for the Vagrant IP, you'll need to instead use the output of `vagrant ssh-config dokku` for your `~/.ssh/config` entry. 
 
-- Copy your SSH key via `cat ~/.ssh/id_rsa.pub | pbcopy` and paste it into the dokku-installer at http://dokku.me . Change the `Hostname` field on the Dokku Setup screen to your domain and then check the box that says `Use virtualhost naming`. Then click *Finish Setup* to install your key. You'll be directed to application deployment instructions from here.
+- Copy your SSH key via `cat ~/.ssh/id_rsa.pub | pbcopy` and paste it into the dokku-installer at http://dokku.me . Change the `Hostname` field on the Dokku Setup screen to your domain and then check the box that says **Use virtualhost naming**. Then click **Finish Setup** to install your key. You'll be directed to application deployment instructions from here.
 
-Please note, the `dokku.me` domain is setup to point to `10.0.0.2` along with all subdomains (ie yourapp.dokku.me). If you change the `DOKKU_IP` in your vagrant setup you'll need to update your `/etc/hosts` file to point your reconfigured ip address.
+Please note, the `dokku.me` domain is setup to point to `10.0.0.2` along with all subdomains (i.e. `yourapp.dokku.me`). If you change the `DOKKU_IP` in your Vagrant setup you'll need to update your `/etc/hosts` file to point your reconfigured ip address.
 
 You are now ready to deploy an app or install plugins.
-

docs/getting-started/installation.md

@@ -17,12 +17,12 @@ Dokku is designed for usage on a fresh VM installation, and should install all n
 
 #### 1. Install dokku
 
-To install the latest stable version of dokku, you can run the following shell commands:
+To install the latest stable version of Dokku, you can run the following shell commands:
 
 ```shell
 # for debian systems, installs Dokku via apt-get
-wget https://raw.githubusercontent.com/dokku/dokku/v0.12.8/bootstrap.sh;
-sudo DOKKU_TAG=v0.12.8 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh;
+sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.

docs/home.html

@@ -10,32 +10,61 @@
     <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.12.8/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/favicon.ico">
+    <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">
     <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.12.8/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/favicons/browserconfig.xml">
+    <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="theme-color" content="#ffffff">
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.rawgit.com/dokku/dokku/v0.12.8/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
+      .sponsors {
+        background-color: #272822;
+        color: #FCFCFC;
+      }
+      .sponsors a {
+        color: #f0ad4e;
+      }
+      .sponsors .backer img,
+      .sponsors .sponsor img {
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+        border: 8px solid gray;
+        margin: 20px auto 20px auto;
+        max-width: 192px;
+      }
+      .sponsors .backer img {
+        -webkit-border-radius: 50%;
+        border-radius: 50%;
+        border: 0;
+      }
+      .sponsors img:hover {
+        -moz-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+        -webkit-box-shadow: 4px 4px 8px 0px rgba(0,0,0,0.75);
+        box-shadow: 0px 0px 32px 0px rgba(0,0,0,0.75);
+      }
+      .sponsors .fund-link {
+        display: block;
+        font-size: .8em;
+      }
     </style>
   </head>
   <body>
@@ -98,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.12.8/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.12.8 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="output">&nbsp;# go to your server's IP and follow the web installer</span>
@@ -125,7 +154,7 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget -nv -O - https://packagecloud.io/gpg.key | apt-key add -</span>
+            <span class="command">wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -</span>
           </p>
           <p class="line">
             <span class="path"></span>
@@ -236,40 +265,54 @@
       </div>
     </div>
 
-    <div class="container-fluid slack-channel team-members">
-      <h3>Meet the core team</h3>
+    <div class="container-fluid slack-channel sponsors">
+      <h3>Sponsor Dokku</h3>
 
       <div class="row">
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/progrium-hidden.jpg" alt="Jeff Lindsay">
-            <img src="./assets/team/progrium.jpg" alt="Jeff Lindsay">
-          </div>
-          Jeff Lindsay
-          <a class="fund-link" href="https://www.patreon.com/progrium">Sponsor people they sponsor</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-0 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/josegonzalez-hidden.jpg" alt="Morris Jobke">
-            <img src="./assets/team/josegonzalez.jpg" alt="Morris Jobke">
-          </div>
-          Jose Diaz-Gonzalez
-          <a class="fund-link" href="http://www.amazon.com/registry/wishlist/36RYHSXCFYDTG/">Buy him something nice</a>
-        </div>
-        <div class="team-member col-md-offset-0 col-md-4 col-sm-offset-2 col-sm-4 col-xs-offset-3 col-xs-6">
-          <div class="team-member-image">
-            <img src="./assets/team/michaelshobbs-hidden.jpg" alt="Michael Hobbs">
-            <img src="./assets/team/michaelshobbs.jpg" alt="Michael Hobbs">
-          </div>
-          Michael Hobbs
-          <a class="fund-link" href="https://gratipay.com/~michaelshobbs/">Fund on gratipay</a>
+        <div class="col-md-12">
+
+          <p>Here are a few of our sponsors and backers. Join them and <a href="https://opencollective.com/dokku#sponsor" target="_blank">become a sponsor</a> on OpenCollective!</p>
+
+          <p class="sponsor">
+            <a href="https://opencollective.com/dokku/sponsor/0/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/0/avatar.svg" style="max-width: 192px"></a>
+            <a href="https://opencollective.com/dokku/sponsor/1/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/1/avatar.svg" style="max-width: 192px"></a>
+            <a href="https://opencollective.com/dokku/sponsor/2/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/2/avatar.svg" style="max-width: 192px"></a>
+            <a href="https://opencollective.com/dokku/sponsor/3/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/3/avatar.svg" style="max-width: 192px"></a>
+          </p>
+
+          <p class="backer">
+            <a href="https://opencollective.com/dokku/backer/0/website" target="_blank"><img src="https://opencollective.com/dokku/backer/0/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/1/website" target="_blank"><img src="https://opencollective.com/dokku/backer/1/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/2/website" target="_blank"><img src="https://opencollective.com/dokku/backer/2/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/3/website" target="_blank"><img src="https://opencollective.com/dokku/backer/3/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/4/website" target="_blank"><img src="https://opencollective.com/dokku/backer/4/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/5/website" target="_blank"><img src="https://opencollective.com/dokku/backer/5/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/6/website" target="_blank"><img src="https://opencollective.com/dokku/backer/6/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/7/website" target="_blank"><img src="https://opencollective.com/dokku/backer/7/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/8/website" target="_blank"><img src="https://opencollective.com/dokku/backer/8/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/9/website" target="_blank"><img src="https://opencollective.com/dokku/backer/9/avatar.svg"></a>
+          </p>
+          <p class="backer">
+            <a href="https://opencollective.com/dokku/backer/10/website" target="_blank"><img src="https://opencollective.com/dokku/backer/10/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/11/website" target="_blank"><img src="https://opencollective.com/dokku/backer/11/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/12/website" target="_blank"><img src="https://opencollective.com/dokku/backer/12/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/13/website" target="_blank"><img src="https://opencollective.com/dokku/backer/13/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/14/website" target="_blank"><img src="https://opencollective.com/dokku/backer/14/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/15/website" target="_blank"><img src="https://opencollective.com/dokku/backer/15/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/16/website" target="_blank"><img src="https://opencollective.com/dokku/backer/16/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/17/website" target="_blank"><img src="https://opencollective.com/dokku/backer/17/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/18/website" target="_blank"><img src="https://opencollective.com/dokku/backer/18/avatar.svg"></a>
+            <a href="https://opencollective.com/dokku/backer/19/website" target="_blank"><img src="https://opencollective.com/dokku/backer/19/avatar.svg"></a>
+          </p>
+
+          <p>You can also <a href="https://www.patreon.com/dokku" target="_blank">back us anonymously</a> on Patreon.</p>
         </div>
       </div>
     </div>
 
     <div class="container">
       <footer>
-        <p>&copy; 2013-2017 Dokku</p>
+        <p>&copy; 2013-2019 Dokku</p>
       </footer>
     </div>
     <script>

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

dokku

@@ -31,7 +31,10 @@ export DOKKU_HOST_ROOT=${DOKKU_HOST_ROOT:=$DOKKU_ROOT}
 
 export DOKKU_DISTRO
 # shellcheck disable=SC1091
-DOKKU_DISTRO=$(. /etc/os-release > /dev/null 2>&1 || true ; echo "$ID")
+DOKKU_DISTRO=$(
+  . /etc/os-release >/dev/null 2>&1 || true
+  echo "$ID"
+)
 
 export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
 export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
@@ -42,6 +45,8 @@ export PLUGIN_ENABLED_PATH=${PLUGIN_ENABLED_PATH:="$PLUGIN_PATH/enabled"}
 export PLUGIN_CORE_PATH=${PLUGIN_CORE_PATH:="$DOKKU_LIB_ROOT/core-plugins"}
 export PLUGIN_CORE_AVAILABLE_PATH=${PLUGIN_CORE_AVAILABLE_PATH:="$PLUGIN_CORE_PATH/available"}
 export PLUGIN_CORE_ENABLED_PATH=${PLUGIN_CORE_ENABLED_PATH:="$PLUGIN_CORE_PATH/enabled"}
+export DOKKU_SYSTEM_GROUP=${DOKKU_SYSTEM_GROUP:="dokku"}
+export DOKKU_SYSTEM_USER=${DOKKU_SYSTEM_USER:="dokku"}
 
 export DOKKU_API_VERSION=1
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
@@ -101,7 +106,7 @@ if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
   fi
 fi
 
-if ! dokku_auth "$@" ; then
+if ! dokku_auth "$@"; then
   dokku_log_fail "Access denied"
   exit 1
 fi
@@ -110,25 +115,26 @@ execute_dokku_cmd() {
   declare desc="executes dokku sub-commands"
   local PLUGIN_NAME="$1"
   local PLUGIN_CMD=$PLUGIN_NAME
-  local implemented=0; local script
+  local implemented=0
+  local script
   local argv=("$@")
 
   case "$PLUGIN_NAME" in
-    events|events:*)
+    events | events:*)
       local PLUGIN_NAME=${PLUGIN_NAME/events/20_events}
       ;;
-    nginx|nginx:*)
+    nginx | nginx:*)
       local PLUGIN_NAME=${PLUGIN_NAME/nginx/nginx-vhosts}
       ;;
-    deploy|delete|ls|run|cleanup)
+    deploy | delete | ls | run | cleanup)
       local PLUGIN_NAME="00_dokku-standard"
       ;;
-    trace|url|urls|report|version)
+    trace | url | urls | report | version)
       local PLUGIN_NAME="00_dokku-standard"
       ;;
   esac
 
-  if [[ "$(readlink -f "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}")" == *core-plugins* ]] ; then
+  if [[ "$(readlink -f "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}")" == *core-plugins* ]]; then
     [[ ${argv[0]} == "$PLUGIN_CMD" ]] && shift 1
     if [[ ! -z $DOKKU_APP_NAME ]]; then
       if [[ "$PLUGIN_CMD" == config* ]] && [[ ${argv[1]} == "--no-restart" ]]; then
@@ -152,9 +158,12 @@ execute_dokku_cmd() {
     implemented=1
   fi
 
-  if [[ $implemented -eq 0 ]];then
+  if [[ $implemented -eq 0 ]]; then
     for script in $PLUGIN_ENABLED_PATH/*/commands; do
-      set +e; $script "$@" ; exit_code=$? ; set -e
+      set +e
+      $script "$@"
+      exit_code=$?
+      set -e
       if [[ "$exit_code" -eq "$DOKKU_NOT_IMPLEMENTED_EXIT" ]]; then
         continue
       fi
@@ -173,18 +182,18 @@ execute_dokku_cmd() {
 }
 
 case "$1" in
-  help|'')
+  help | '')
     export LC_ALL=C # so sort will respect non alpha characters
-    ALL_PLUGIN_COMMANDS=$(find -L "$PLUGIN_PATH/enabled" -name commands 2> /dev/null || true)
+    ALL_PLUGIN_COMMANDS=$(find -L "$PLUGIN_PATH/enabled" -name commands 2>/dev/null || true)
 
     # build list of core plugin command files
-    for plugin_command in $ALL_PLUGIN_COMMANDS;do
+    for plugin_command in $ALL_PLUGIN_COMMANDS; do
       if [[ "$(readlink -f "$plugin_command")" == *core-plugins* ]]; then
         CORE_PLUGIN_COMMANDS+="$plugin_command "
       fi
     done
     # build list of non-core plugin command files
-    for plugin_command in $ALL_PLUGIN_COMMANDS;do
+    for plugin_command in $ALL_PLUGIN_COMMANDS; do
       if [[ "$(readlink -f "$plugin_command")" != *core-plugins* ]]; then
         COMMUNITY_PLUGIN_COMMANDS+="$plugin_command "
       fi
@@ -198,7 +207,7 @@ case "$1" in
     dokku_log_quiet "Commands:"
     dokku_log_quiet ""
 
-    if [[ "$2" == "--all" ]] ; then
+    if [[ "$2" == "--all" ]]; then
       for core_plugin_command in $CORE_PLUGIN_COMMANDS; do
         $core_plugin_command help
       done | sort | column -c2 -t -s,
@@ -211,7 +220,7 @@ case "$1" in
     else
       for core_plugin_command in $CORE_PLUGIN_COMMANDS; do
         $core_plugin_command help
-      # When done, sort, sed cuts arugments out of strings and colum make it pretty
+        # When done, sort, sed cuts arugments out of strings and colum make it pretty
       done | sort | sed -e '/^.*:/d' -e 's/\s[\[\<\-\(].*,/,/' | column -c2 -t -s,
       if [[ -n "$COMMUNITY_PLUGIN_COMMANDS" ]]; then
         dokku_log_quiet ""

plugins/00_dokku-standard/commands

@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 [[ " help help:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
-  help|run:help|trace:help|url:help|urls:help|version:help)
+  help | run:help | trace:help | url:help | urls:help | version:help)
     [[ $(echo "$1" | sed '/.*:help/!d') ]] && help_topic="${1%\:help}"
-    help_content_func () {
+    help_content_func() {
       declare desc="return standard plugin help content"
-      cat<<help_content
+      cat <<help_content
     run <app> <cmd>, Run a command in a new container using the current application image
     trace [on/off], Enable dokku tracing
     url <app>, Show the first URL for an application (compatibility)
@@ -17,10 +18,10 @@ case "$1" in
 help_content
     }
 
-    if [[ $help_topic ]] ; then
-        help_content_func | sed "/^\s*$help_topic\s/!d" | sort | sed '/^.*:/d' | column -c2 -t -s,
+    if [[ $help_topic ]]; then
+      help_content_func | sed "/^\s*$help_topic\s/!d" | sort | sed '/^.*:/d' | column -c2 -t -s,
     else
-        help_content_func
+      help_content_func
     fi
     ;;
 

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

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 app_user_docker_args() {

plugins/00_dokku-standard/exec-app-json-scripts

@@ -1,93 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/config/functions"
-
-get_phase_script() {
-  declare desc="extracts app.json from app image and returns the appropriate json key/value"
-  local IMAGE="$1"; local 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
-
-  copy_from_image "$IMAGE" "app.json" "$GET_PHASE_SCRIPT_TMP_WORK_DIR" 2>/dev/null || true
-
-  if [[ -f "$APP_JSON_FILE" ]];then
-    local VALUE=$(get_json_value "scripts.dokku.${PHASE_SCRIPT_KEY}" < "$APP_JSON_FILE")
-  else
-    return 0
-  fi
-
-  echo "$VALUE"
-}
-
-execute_script() {
-  declare desc="executes appropriate phase script key from app.json"
-  local APP="$1"; local IMAGE_TAG="$2"; local PHASE_SCRIPT_KEY="$3"
-  local IMAGE id
-
-  IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
-  local SCRIPT_CMD=$(get_phase_script "$IMAGE" "$PHASE_SCRIPT_KEY" 2>/dev/null)
-  if [[ -n "$SCRIPT_CMD" ]];then
-    dokku_log_info1 "Running '$SCRIPT_CMD' in app container"
-    local COMMAND
-    COMMAND="set -eo pipefail; [[ \$DOKKU_TRACE ]] && set -x ; "
-    COMMAND+=" if [[ -d '/app' ]]; then "
-    COMMAND+="   export HOME=/app ; "
-    COMMAND+="   cd \$HOME ; "
-    COMMAND+=" fi ; "
-    COMMAND+=" if [[ -d '/app/.profile.d' ]]; then "
-    COMMAND+="   for file in /app/.profile.d/*; do source \$file; done ; "
-    COMMAND+=" fi ; "
-    COMMAND+=" if [[ -d '/cache' ]]; then "
-    COMMAND+="   echo restoring installation cache... ; "
-    COMMAND+="   rm -rf /tmp/cache ; "
-    COMMAND+="   ln -sf /cache /tmp/cache ; "
-    COMMAND+=" fi ; "
-    COMMAND+=" $SCRIPT_CMD || exit 1;"
-    COMMAND+=" if [[ -d '/cache' ]]; then "
-    COMMAND+="   echo removing installation cache... ; "
-    COMMAND+="   rm -f /tmp/cache ; "
-    COMMAND+=" fi "
-
-    local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
-    local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
-    [[ -d $CACHE_DIR ]] || mkdir -p "$CACHE_DIR"
-
-    local DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
-    # strip --restart args from DOCKER_ARGS
-    local DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<< "$DOCKER_ARGS")
-
-    # eval args as array to respect escapes
-    declare -a ARG_ARRAY
-    eval "ARG_ARRAY=($DOCKER_ARGS)"
-
-    local DOKKU_APP_SHELL="/bin/bash"
-    DOKKU_APP_SHELL="$(config_get --global DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
-    DOKKU_APP_SHELL="$(config_get "$APP" DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
-    [[ -z "$DOKKU_APP_SHELL" ]] && DOKKU_APP_SHELL="/bin/bash"
-
-    id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_HOST_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" "$DOKKU_APP_SHELL" -c "$COMMAND")
-    if test "$(docker wait "$id")" -eq 0; then
-      dokku_container_log_verbose_quiet "$id"
-      if [[ "$PHASE_SCRIPT_KEY" != "postdeploy" ]];then
-        if ! is_image_herokuish_based "$IMAGE"; then
-          local DOKKU_DOCKERFILE_ENTRYPOINT=$(config_get "$APP" DOKKU_DOCKERFILE_ENTRYPOINT)
-          local DOKKU_DOCKERFILE_CMD=$(config_get "$APP" DOKKU_DOCKERFILE_CMD)
-          [[ -z "$DOKKU_DOCKERFILE_ENTRYPOINT" ]] && DOKKU_DOCKERFILE_ENTRYPOINT="$(get_entrypoint_from_image "$IMAGE")"
-          [[ -z "$DOKKU_DOCKERFILE_CMD" ]] && DOKKU_DOCKERFILE_CMD="$(get_cmd_from_image "$IMAGE")"
-
-          [[ -n "$DOKKU_DOCKERFILE_ENTRYPOINT" ]] && local DOCKER_COMMIT_ENTRYPOINT_CHANGE_ARG="--change='$DOKKU_DOCKERFILE_ENTRYPOINT'"
-          [[ -n "$DOKKU_DOCKERFILE_CMD" ]] && local DOCKER_COMMIT_CMD_CHANGE_ARG="--change='$DOKKU_DOCKERFILE_CMD'"
-
-          local DOCKER_COMMIT_ARGS="$DOCKER_COMMIT_ENTRYPOINT_CHANGE_ARG $DOCKER_COMMIT_CMD_CHANGE_ARG"
-        fi
-        # shellcheck disable=SC2086
-        eval docker commit $DOCKER_COMMIT_ARGS "$id" "$IMAGE" > /dev/null
-      fi
-    else
-      dokku_container_log_verbose_quiet "$id"
-      dokku_log_fail "execution of '$SCRIPT_CMD' failed!"
-    fi
-  fi
-}

plugins/00_dokku-standard/install

@@ -1,20 +1,21 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 
-if [[ ! -f  "$DOKKU_ROOT/HOSTNAME" ]]; then
-  hostname -f > "$DOKKU_ROOT/HOSTNAME"
+if [[ ! -f "$DOKKU_ROOT/HOSTNAME" ]]; then
+  hostname -f >"$DOKKU_ROOT/HOSTNAME"
 fi
 
-if [[ ! -f  "$DOKKU_ROOT/VHOST" ]]; then
-  [[ $(dig +short "$(< "$DOKKU_ROOT/HOSTNAME")") ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST"
+if [[ ! -f "$DOKKU_ROOT/VHOST" ]]; then
+  [[ $(dig +short "$(<"$DOKKU_ROOT/HOSTNAME")") ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST"
 fi
 
-dokku_path=$(which dokku)
+dokku_path="$(which dokku)"
 
 # temporary hack for https://github.com/dokku/dokku/issues/82
 # redeploys all apps after a reboot
-if [[ $(/sbin/init --version 2> /dev/null) =~ upstart ]]; then
-  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
@@ -26,8 +27,8 @@ end script
 EOF
 fi
 
-if [[ $(systemctl 2> /dev/null) =~ -\.mount ]]; then
-  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
 Requires=docker.service
@@ -47,7 +48,7 @@ EOF
 fi
 
 mkdir -p /etc/update-motd.d
-cat<<EOF > /etc/update-motd.d/99-dokku
+cat <<EOF >/etc/update-motd.d/99-dokku
 #!/bin/sh
 
 if [ ! -f "/home/dokku/HOSTNAME" ]; then
@@ -63,6 +64,6 @@ chmod +x /etc/update-motd.d/99-dokku
 
 chown dokku:dokku "$DOKKU_ROOT/HOSTNAME"
 
-if [[ -f  "$DOKKU_ROOT/VHOST" ]]; then
+if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
   chown dokku:dokku "$DOKKU_ROOT/VHOST"
 fi

plugins/00_dokku-standard/plugin.toml

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

plugins/00_dokku-standard/post-deploy

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_CORE_AVAILABLE_PATH/00_dokku-standard/exec-app-json-scripts"
-
-exec_app_json_scripts() {
-  declare desc="core app.json scripts execution"
-  local trigger="post-deploy app_json_scripts"
-  local APP="$1"; local IMAGE_TAG="$4"; local PHASE_SCRIPT_KEY="postdeploy"
-
-  dokku_log_info1 "Attempting to run scripts.dokku.$PHASE_SCRIPT_KEY from app.json (if defined)"
-  execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
-}
-
-exec_app_json_scripts "$@"

plugins/00_dokku-standard/pre-deploy

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_CORE_AVAILABLE_PATH/00_dokku-standard/exec-app-json-scripts"
-
-exec_app_json_scripts() {
-  declare desc="core app.json scripts execution"
-  local trigger="pre-deploy app_json_scripts"
-  local APP="$1"; local IMAGE_TAG="$2"; local PHASE_SCRIPT_KEY="predeploy"
-
-  dokku_log_info1 "Attempting to run scripts.dokku.$PHASE_SCRIPT_KEY from app.json (if defined)"
-  execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
-}
-
-exec_app_json_scripts "$@"

plugins/00_dokku-standard/subcommands/cleanup

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 dokku_cleanup_cmd() {
@@ -8,8 +9,11 @@ dokku_cleanup_cmd() {
   [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
 
+  if [[ -z "$APP" ]]; then
+    APP="--global"
+  fi
+
   docker_cleanup "$APP" "true"
 }
 
-
 dokku_cleanup_cmd "$@"

plugins/00_dokku-standard/subcommands/deploy

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 shift 1

plugins/00_dokku-standard/subcommands/report

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 dokku_report_cmd() {
@@ -16,12 +17,16 @@ dokku_report_cmd() {
   docker -D info | sed "s/^/       /"
   dokku_log_info1 "sigil version: $(sigil -v)"
   dokku_log_info1 "herokuish version: "
-  docker run --rm -ti gliderlabs/herokuish:latest herokuish version | sed "s/^/       /"
+  docker run --rm gliderlabs/herokuish:latest herokuish version | sed "s/^/       /"
   dokku_log_info1 "dokku version: $(dokku version)"
   dokku_log_info1 "dokku plugins: "
   dokku plugin:list | sed "s/^/       /"
 
-  if [[ -n "$APP" ]]; then
+  if [[ "$APP" == "--all" ]]; then
+    for app in $(dokku_apps); do
+      plugn trigger report "$app"
+    done
+  elif [[ -n "$APP" ]]; then
     plugn trigger report "$APP"
   fi
 }

plugins/00_dokku-standard/subcommands/run

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
@@ -9,7 +10,7 @@ dokku_run_cmd() {
   verify_app_name "$APP"
   shift 2
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-run "$DOKKU_SCHEDULER" "$APP" "$@"
 }
 

plugins/00_dokku-standard/subcommands/trace

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 dokku_trace_cmd() {
@@ -12,7 +13,7 @@ dokku_trace_cmd() {
 
   if [[ "$2" == "on" ]]; then
     echo "Enabling dokku trace"
-    echo "export DOKKU_TRACE=1" > "$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
+    echo "export DOKKU_TRACE=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_TRACE"
   fi
 
   if [[ "$2" == "off" ]]; then

plugins/00_dokku-standard/subcommands/urls

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 dokku_urls_cmd() {

plugins/00_dokku-standard/subcommands/version

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 dokku_version_cmd() {

plugins/20_events/commands

@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 [[ " help events:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
   help | events:help)
-    help_content_func () {
+    help_content_func() {
       declare desc="return events plugin help content"
-      cat<<help_content
+      cat <<help_content
     events [-t], Show the last events (-t follows)
     events:list, List logged events
     events:on, Enable events logger
@@ -14,15 +15,15 @@ case "$1" in
 help_content
     }
 
-    if [[ $1 = "events:help" ]] ; then
-        echo 'Usage: dokku events:COMMAND [-t]'
-        echo ''
-        echo 'Interact with Dokku event logger.'
-        echo ''
-        echo 'Additional commands:'
-        help_content_func | sort | column -c2 -t -s,
+    if [[ $1 == "events:help" ]]; then
+      echo 'Usage: dokku events:COMMAND [-t]'
+      echo ''
+      echo 'Interact with Dokku event logger.'
+      echo ''
+      echo 'Additional commands:'
+      help_content_func | sort | column -c2 -t -s,
     else
-        help_content_func
+      help_content_func
     fi
     ;;
 
@@ -31,4 +32,3 @@ help_content
     ;;
 
 esac
-

plugins/20_events/hook

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 [[ ! "$DOKKU_EVENTS" ]] || dokku_log_plugn_trigger_call "$(basename "$0")" "$@"

plugins/20_events/install

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 DOKKU_RSYSLOG_FILTER_DIR=/etc/rsyslog.d
@@ -13,7 +14,7 @@ flag_rsyslog_needs_restart=n
 # shellcheck disable=SC2174
 mkdir -m 775 -p "$DOKKU_LOGS_DIR"
 case "$DOKKU_DISTRO" in
-  arch|debian|centos|rhel)
+  arch | debian | centos | rhel)
     chgrp dokku "$DOKKU_LOGS_DIR"
     ;;
   *)
@@ -21,10 +22,10 @@ case "$DOKKU_DISTRO" in
     ;;
 esac
 
-if [[ ! -f  "$DOKKU_EVENTS_LOGFILE" ]]; then
+if [[ ! -f "$DOKKU_EVENTS_LOGFILE" ]]; then
   touch "$DOKKU_EVENTS_LOGFILE"
   case "$DOKKU_DISTRO" in
-    arch|debian|centos|rhel)
+    arch | debian | centos | rhel)
       chgrp dokku "$DOKKU_EVENTS_LOGFILE"
       ;;
     *)
@@ -35,7 +36,7 @@ if [[ ! -f  "$DOKKU_EVENTS_LOGFILE" ]]; then
   chmod 664 "$DOKKU_EVENTS_LOGFILE"
 fi
 
-if [[ -d "$DOKKU_RSYSLOG_FILTER_DIR" && ! -f  "$DOKKU_RSYSLOG_FILTER" ]]; then
+if [[ -d "$DOKKU_RSYSLOG_FILTER_DIR" && ! -f "$DOKKU_RSYSLOG_FILTER" ]]; then
   cat >"$DOKKU_RSYSLOG_FILTER" <<EOF
 :syslogtag, contains, "dokku" $DOKKU_EVENTS_LOGFILE
 EOF
@@ -59,7 +60,7 @@ $DOKKU_LOGS_DIR/*.log {
 }
 EOF
 
-  if [[ "$DOKKU_DISTRO" = "debian" ]]; then
+  if [[ "$DOKKU_DISTRO" == "debian" ]]; then
     sed -i 's/ syslog dokku$/ root dokku/g' $DOKKU_LOGROTATE_FILE
   fi
 

plugins/20_events/network-clear-config

@@ -0,0 +1 @@
+hook

plugins/20_events/plugin.toml

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

plugins/20_events/post-app-clone-setup

@@ -0,0 +1 @@
+hook

plugins/20_events/proxy-clear-config

@@ -0,0 +1 @@
+hook

plugins/20_events/subcommands/default

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 events_main_cmd() {

plugins/20_events/subcommands/list

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 events_list_cmd() {

plugins/20_events/subcommands/off

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 events_off_cmd() {

plugins/20_events/subcommands/on

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 events_on_cmd() {
@@ -7,7 +8,7 @@ events_on_cmd() {
   local cmd="events:on"
   echo "Enabling dokku events logger"
   [[ -d $DOKKU_ROOT/.dokkurc ]] || mkdir -p "$DOKKU_ROOT/.dokkurc"
-  echo "export DOKKU_EVENTS=1" > "$DOKKU_ROOT/.dokkurc/DOKKU_EVENTS"
+  echo "export DOKKU_EVENTS=1" >"$DOKKU_ROOT/.dokkurc/DOKKU_EVENTS"
 }
 
 events_on_cmd "$@"

plugins/app-json/internal-functions

@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
+source "$PLUGIN_AVAILABLE_PATH/ps/functions"
+
+get_phase_script() {
+  declare desc="extracts app.json from app image and returns the appropriate json key/value"
+  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
+
+  copy_from_image "$IMAGE" "app.json" "$GET_PHASE_SCRIPT_TMP_WORK_DIR" 2>/dev/null || true
+
+  if [[ ! -f "$APP_JSON_FILE" ]]; then
+    return 0
+  fi
+
+  get_json_value "scripts.dokku.${PHASE_SCRIPT_KEY}" <"$APP_JSON_FILE"
+}
+
+get_release_cmd() {
+  declare desc="extracts the release command from a given app's procfile"
+  declare APP="$1" IMAGE_TAG="$2"
+
+  extract_procfile "$APP" "$IMAGE_TAG" >/dev/null
+  trap 'remove_procfile $APP' RETURN INT TERM EXIT
+
+  get_cmd_from_procfile "$APP" "release" "5000"
+}
+
+execute_script() {
+  declare desc="executes appropriate phase script key from app.json"
+  declare APP="$1" IMAGE_TAG="$2" PHASE_SCRIPT_KEY="$3"
+  local IMAGE id SCRIPT_CMD
+
+  IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
+  if [[ "$PHASE_SCRIPT_KEY" == "release" ]]; then
+    SCRIPT_CMD=$(get_release_cmd "$APP" "$IMAGE" 2>/dev/null || true)
+  else
+    SCRIPT_CMD=$(get_phase_script "$IMAGE" "$PHASE_SCRIPT_KEY" 2>/dev/null || true)
+  fi
+
+  if [[ -z "$SCRIPT_CMD" ]]; then
+    return
+  fi
+
+  dokku_log_info1 "Running '$SCRIPT_CMD' in app container"
+  local COMMAND
+  COMMAND="set -eo pipefail; [[ \$DOKKU_TRACE ]] && set -x ; "
+  COMMAND+=" if [[ -d '/app' ]]; then "
+  COMMAND+="   export HOME=/app ; "
+  COMMAND+="   cd \$HOME ; "
+  COMMAND+=" fi ; "
+  COMMAND+=" if [[ -d '/app/.profile.d' ]]; then "
+  COMMAND+="   for file in /app/.profile.d/*; do source \$file; done ; "
+  COMMAND+=" fi ; "
+  COMMAND+=" if [[ -d '/cache' ]]; then "
+  COMMAND+="   echo restoring installation cache... ; "
+  COMMAND+="   rm -rf /tmp/cache ; "
+  COMMAND+="   ln -sf /cache /tmp/cache ; "
+  COMMAND+=" fi ; "
+
+  if [[ "$SCRIPT_CMD" == /* ]]; then
+    local SCRIPT_BIN="$(echo "$SCRIPT_CMD" | cut -d' ' -f1)"
+    COMMAND+=" if [[ ! -x \"$SCRIPT_BIN\" ]]; then "
+    COMMAND+="   echo specified binary is not executable ; "
+    COMMAND+="   exit 1 ; "
+    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 "
+
+  local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+  local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
+  [[ -d $CACHE_DIR ]] || mkdir -p "$CACHE_DIR"
+
+  local DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG")
+  # strip --restart args from DOCKER_ARGS
+  local DOCKER_ARGS=$(sed -e "s/--restart=[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
+
+  # eval args as array to respect escapes
+  declare -a ARG_ARRAY
+  eval "ARG_ARRAY=($DOCKER_ARGS)"
+
+  local DOKKU_APP_SHELL="/bin/bash"
+  DOKKU_APP_SHELL="$(config_get --global DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
+  DOKKU_APP_SHELL="$(config_get "$APP" DOKKU_APP_SHELL || echo "$DOKKU_APP_SHELL")"
+  [[ -z "$DOKKU_APP_SHELL" ]] && DOKKU_APP_SHELL="/bin/bash"
+
+  id=$(docker run "$DOKKU_GLOBAL_RUN_ARGS" -e DOKKU_TRACE="$DOKKU_TRACE" --label=dokku_phase_script="${PHASE_SCRIPT_KEY}" -d -v "$CACHE_HOST_DIR:/cache" "${ARG_ARRAY[@]}" "$IMAGE" "$DOKKU_APP_SHELL" -c "$COMMAND")
+  if test "$(docker wait "$id")" -ne 0; then
+    dokku_container_log_verbose_quiet "$id"
+    dokku_log_fail "execution of '$SCRIPT_CMD' failed!"
+  fi
+
+  dokku_container_log_verbose_quiet "$id"
+  if [[ "$PHASE_SCRIPT_KEY" != "predeploy" ]]; then
+    return
+  fi
+
+  if ! is_image_herokuish_based "$IMAGE"; then
+    local DOKKU_DOCKERFILE_ENTRYPOINT=$(config_get "$APP" DOKKU_DOCKERFILE_ENTRYPOINT)
+    local DOKKU_DOCKERFILE_CMD=$(config_get "$APP" DOKKU_DOCKERFILE_CMD)
+    [[ -z "$DOKKU_DOCKERFILE_ENTRYPOINT" ]] && DOKKU_DOCKERFILE_ENTRYPOINT="$(get_entrypoint_from_image "$IMAGE")"
+    [[ -z "$DOKKU_DOCKERFILE_CMD" ]] && DOKKU_DOCKERFILE_CMD="$(get_cmd_from_image "$IMAGE")"
+
+    [[ -n "$DOKKU_DOCKERFILE_ENTRYPOINT" ]] && local DOCKER_COMMIT_ENTRYPOINT_CHANGE_ARG="--change='$DOKKU_DOCKERFILE_ENTRYPOINT'"
+    [[ -n "$DOKKU_DOCKERFILE_CMD" ]] && local DOCKER_COMMIT_CMD_CHANGE_ARG="--change='$DOKKU_DOCKERFILE_CMD'"
+
+    local DOCKER_COMMIT_ARGS="$DOCKER_COMMIT_ENTRYPOINT_CHANGE_ARG $DOCKER_COMMIT_CMD_CHANGE_ARG"
+  fi
+
+  # shellcheck disable=SC2086
+  eval docker commit $DOCKER_COMMIT_ARGS "$id" "$IMAGE" >/dev/null
+}

plugins/app-json/plugin.toml

@@ -0,0 +1,4 @@
+[plugin]
+description = "dokku core app-json plugin"
+version = "0.14.2"
+[plugin.config]

plugins/app-json/post-deploy

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/app-json/internal-functions"
+
+app_json_post_deploy() {
+  declare desc="app-json scripts execution"
+  local trigger="app_json_post_deploy"
+  local APP="$1"
+  local IMAGE_TAG="$4"
+  local PHASE_SCRIPT_KEY="postdeploy"
+
+  execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
+}
+
+app_json_post_deploy "$@"

plugins/app-json/pre-deploy

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+source "$PLUGIN_CORE_AVAILABLE_PATH/app-json/internal-functions"
+
+app_json_pre_deploy() {
+  declare desc="app-json scripts execution"
+  local trigger="app_json_pre_deploy"
+  local APP="$1"
+  local IMAGE_TAG="$2"
+  local PHASE_SCRIPT_KEY="predeploy"
+
+  execute_script "$APP" "$IMAGE_TAG" "$PHASE_SCRIPT_KEY"
+  execute_script "$APP" "$IMAGE_TAG" "release"
+}
+
+app_json_pre_deploy "$@"

plugins/apps/commands

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 [[ " help apps:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
   help | apps:help)

plugins/apps/functions

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
@@ -8,7 +9,7 @@ apps_create() {
   declare APP="$1"
   is_valid_app_name "$APP"
 
-  apps_exists "$APP" > /dev/null 2>&1 && dokku_log_fail "Name is already taken"
+  apps_exists "$APP" >/dev/null 2>&1 && dokku_log_fail "Name is already taken"
 
   mkdir -p "$DOKKU_ROOT/$APP"
   dokku_log_info1_quiet "Creating $APP... done"
@@ -17,7 +18,7 @@ apps_create() {
 
 apps_destroy() {
   declare desc="destroys an app"
-  declare APP="$1";
+  declare APP="$1"
   verify_app_name "$APP"
   local IMAGE_TAG=$(get_running_image_tag "$APP")
 
@@ -36,7 +37,7 @@ apps_destroy() {
   echo "Destroying $APP (including all add-ons)"
   plugn trigger pre-delete "$APP" "$IMAGE_TAG"
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   local REMOVE_CONTAINERS="true"
   plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP" "$REMOVE_CONTAINERS"
   plugn trigger post-delete "$APP" "$IMAGE_TAG"
@@ -54,7 +55,7 @@ apps_maybe_create() {
   declare desc="creates an app dir if allowed"
   declare APP="$1"
 
-  if ! apps_exists "$APP" > /dev/null 2>&1; then
+  if ! apps_exists "$APP" >/dev/null 2>&1; then
     DOKKU_GLOBAL_DISABLE_AUTOCREATE="$(config_get --global DOKKU_DISABLE_APP_AUTOCREATION || true)"
     if [[ "$DOKKU_GLOBAL_DISABLE_AUTOCREATE" == "true" ]]; then
       dokku_log_warn "App auto-creation disabled."
@@ -63,4 +64,4 @@ apps_maybe_create() {
       suppress_output apps_create "$APP"
     fi
   fi
-}
+}

plugins/apps/internal-functions

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/apps/functions"
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 
 cmd-apps-report() {
   declare desc="displays the app report for one or more apps"
@@ -30,7 +31,7 @@ cmd-apps-report() {
 cmd-apps-report-single() {
   declare APP="$1" INFO_FLAG="$2"
   local APP_DIR="$DOKKU_ROOT/$APP"
-  local use_echo;
+  local use_echo
   if [[ "$INFO_FLAG" == "true" ]]; then
     use_echo=true
     INFO_FLAG=""
@@ -38,7 +39,7 @@ cmd-apps-report-single() {
   verify_app_name "$APP"
   local flag_map=(
     "--app-dir: $APP_DIR"
-    "--git-sha: $(GIT_DIR="$APP_DIR" git rev-parse --short HEAD 2> /dev/null || false)"
+    "--git-sha: $(GIT_DIR="$APP_DIR" git rev-parse --short HEAD 2>/dev/null || false)"
     "--deploy-source: $(: | plugn trigger deploy-source "$APP")"
     "--locked: $(apps_is_locked "$APP")"
   )
@@ -54,11 +55,12 @@ cmd-apps-report-single() {
       if [[ "$use_echo" ]]; then
         echo "not deployed"
       else
-        dokku_log_fail "not deployed"
+        dokku_log_exit "not deployed"
       fi
     fi
   else
-    local match=false; local value_exists=false
+    local match=false
+    local value_exists=false
     for flag in "${flag_map[@]}"; do
       valid_flags="${valid_flags} $(echo "$flag" | cut -d':' -f1)"
       if [[ "$flag" == "${INFO_FLAG}:"* ]]; then
@@ -76,24 +78,24 @@ cmd-apps-report-single() {
   fi
 }
 
-
 apps_help_content_func() {
   declare desc="return apps plugin help content"
-  cat<<help_content
+  cat <<help_content
     apps, [DEPRECATED] Alias for apps:list
     apps:clone <old-app> <new-app>, Clones an app
     apps:create <app>, Create a new app
     apps:destroy <app>, Permanently destroy an app
     apps:list, List your apps
-    apps:lock <app>, Creates a '.deploy.lock' file in an application's repo
+    apps:lock <app>, Locks an app for deployment
+    apps:locked <app>, Checks if an app is locked for deployment
     apps:rename <old-app> <new-app>, Rename an app
     apps:report [<app>] [<flag>], Display report about an app
-    apps:unlock <app>, Removes the '.deploy.lock' file from an application's repo
+    apps:unlock <app>, Unlocks an app for deployment
 help_content
 }
 
 apps_help_cmd() {
-  if [[ $1 = "apps:help" ]] ; then
+  if [[ $1 == "apps:help" ]]; then
     echo -e 'Usage: dokku apps[:COMMAND]'
     echo ''
     echo 'Manage Dokku apps'
@@ -110,7 +112,7 @@ apps_help_cmd() {
   elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
     apps_help_content_func
   else
-    cat<<help_desc
+    cat <<help_desc
     apps, Manage Dokku apps
 help_desc
   fi
@@ -137,4 +139,4 @@ apps_is_locked() {
   fi
 
   echo "$LOCKED"
-}
+}

plugins/apps/plugin.toml

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

plugins/apps/post-delete

@@ -1,16 +1,18 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 app_post_delete() {
   declare desc="apps post-delete plugin trigger"
   local trigger="app_post_delete"
-  local APP="$1"; local IMAGE_REPO=$(get_app_image_repo "$APP")
+  local APP="$1"
+  local IMAGE_REPO=$(get_app_image_repo "$APP")
   if [[ -n $APP ]]; then
     # remove contents for apps that are symlinks to other folders
-    rm -rf "${DOKKU_ROOT:?}/$APP/" > /dev/null
+    rm -rf "${DOKKU_ROOT:?}/$APP/" >/dev/null
     # then remove the folder and/or the symlink
-    rm -rf "${DOKKU_ROOT:?}/$APP" > /dev/null
+    rm -rf "${DOKKU_ROOT:?}/$APP" >/dev/null
   fi
 
   # shellcheck disable=SC2046

plugins/apps/pre-delete

@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 apps_pre_delete() {
   declare desc="apps pre-delete plugin trigger"
   local trigger="apps_pre_delete"
-  local APP="$1"; local IMAGE_TAG="$2"; local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG"); local CACHE_DIR="$DOKKU_ROOT/$APP/cache"; local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
+  local APP="$1"
+  local IMAGE_TAG="$2"
+  local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
+  local CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+  local CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$APP/cache"
   verify_app_name "$APP"
 
   if ! is_image_herokuish_based "$IMAGE"; then

plugins/apps/report

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 
 cmd-apps-report-single "$@"

plugins/apps/subcommands/clone

@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 source "$PLUGIN_AVAILABLE_PATH/ps/functions"
 
 apps_clone_cmd() {
   declare desc="clones an app"
-  declare cmd="apps:clone" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1
+  declare cmd="apps:clone" argv=("$@")
+  [[ ${argv[0]} == "$cmd" ]] && shift 1
   declare OLD_APP="$1" NEW_APP="$2"
   local IGNORE_EXISTING=false
   local SKIP_REBUILD=false
@@ -22,8 +24,8 @@ apps_clone_cmd() {
 
   is_valid_app_name "$OLD_APP"
   is_valid_app_name "$NEW_APP"
-  apps_exists "$OLD_APP" > /dev/null 2>&1 || dokku_log_fail "App does not exist"
-  if apps_exists "$NEW_APP" > /dev/null 2>&1; then
+  apps_exists "$OLD_APP" >/dev/null 2>&1 || dokku_log_fail "App does not exist"
+  if apps_exists "$NEW_APP" >/dev/null 2>&1; then
     if [[ "$IGNORE_EXISTING" == true ]]; then
       dokku_log_warn "Name is already taken"
       return
@@ -36,21 +38,20 @@ apps_clone_cmd() {
   local NEW_CACHE_HOST_DIR="$DOKKU_HOST_ROOT/$NEW_APP/cache"
 
   apps_create "$NEW_APP"
-  pushd "$DOKKU_ROOT/$OLD_APP/." > /dev/null
+  pushd "$DOKKU_ROOT/$OLD_APP/." >/dev/null
   find ./* -not \( -name .cache \) | grep -v "./cache" | cpio -pdmu --quiet "$DOKKU_ROOT/$NEW_APP"
-  popd > /dev/null 2>&1 || pushd "/tmp" > /dev/null
+  popd >/dev/null 2>&1 || pushd "/tmp" >/dev/null
+  plugn trigger post-app-clone-setup "$OLD_APP" "$NEW_APP"
 
   if [[ -d "$NEW_CACHE_DIR" ]] && ! rmdir "$NEW_CACHE_DIR"; then
     docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_HOST_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache
   fi
   rm -rf "$NEW_CACHE_DIR"
 
-  [[ -f "$DOKKU_ROOT/$NEW_APP/URLS" ]] && sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/URLS"
-  [[ -f "$DOKKU_ROOT/$NEW_APP/VHOST" ]] && sed -i -e "s/$OLD_APP/$NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/VHOST"
   [[ -f "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive" ]] && sed -i -e "s/git-hook $OLD_APP/git-hook $NEW_APP/g" "$DOKKU_ROOT/$NEW_APP/hooks/pre-receive"
   [[ "$SKIP_REBUILD" == "true" ]] || ps_rebuild "$NEW_APP"
   plugn trigger post-app-clone "$OLD_APP" "$NEW_APP"
-  echo "Cloning $OLD_APP to $NEW_APP... done"
+  dokku_log_info1_quiet "Cloning $OLD_APP to $NEW_APP... done"
 }
 
 apps_clone_cmd "$@"

plugins/apps/subcommands/create

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 
 apps_create_cmd() {

plugins/apps/subcommands/default

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
 
 dokku_log_warn "Deprecated: Please use apps:list"

plugins/apps/subcommands/destroy

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 

plugins/apps/subcommands/exists

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/apps/functions"
 
 apps_exists_cmd() {

plugins/apps/subcommands/list

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/apps/internal-functions"
 
 apps_list_cmd "$@"