Release 0.20.2

# History

## 0.20.2

Install/update via the bootstrap script:

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

### Bug Fixes

- #3921: @josegonzalez Correct container_type handling when entering containers
- #3919: @josegonzalez Fix bug with restarting containers not being routed to because of changing IP addresses

### New Features

- #3920: @josegonzalez Add the ability to list ssh keys for a specific user

.circleci/config.yml

@@ -1,23 +1,23 @@
 version: 2
 jobs:
   build:
-    machine: true
+    machine:
+      image: ubuntu-1604:201903-01
     parallelism: 4
     steps:
       - checkout
       - 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
       - run: |
-          # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
-          sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
+          # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to ens4
+          sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev ens4
       - run: |
           case $CIRCLE_NODE_INDEX in
-            0) sudo -E make -e lint go-tests ci-go-coverage ;;
+            0) sudo -E make -e lint-ci 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 ;;
@@ -26,6 +26,11 @@ jobs:
           shell: /bin/bash
           command: sudo -E make -e test-ci
           no_output_timeout: 60m
+      - run: |
+          if [ "${CIRCLE_NODE_INDEX}" == "0" ]; then
+            ./tests/ci/setup.sh docker
+            DOKKU_SSH_PORT=3022 sudo -E make -e test-ci-docker
+          fi
       - store_artifacts:
           path: ./coverage.out
       - store_artifacts:

.dockerignore

@@ -6,6 +6,10 @@ contrib
 build
 docs
 tests
+!build/dokku.deb
+!tests/dhparam.pem
 !contrib/dokku-installer.py
 !contrib/dokku-update
 !contrib/bash-completion
+!contrib/docker
+vendor

.stickler.yml

@@ -1,3 +1,4 @@
+---
 linters:
   shellcheck:
     shell: bash
@@ -5,6 +6,8 @@ linters:
   golint:
 
 files:
-    ignore:
-      - './debian/*'
-      - '*/vendor/*'
+  ignore:
+    - 'debian/*'
+    - 'docs/*'
+    - 'tests/*'
+    - '*/vendor/*'

CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at dokku@josediazgonzalez.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -55,22 +55,10 @@ doesn't already include that problem or suggestion before submitting an issue.
 If you find a match, add a quick "+1" or "I have this problem too." Doing this
 helps prioritize the most common problems and requests.
 
-When reporting issues, please include your host OS (Ubuntu 14.04, CentOS 7,
-etc). Please include:
-
-* The output of `uname -a`.
-* The output of `free -m`
-* The output of `docker version`.
-* The output of `docker -D info`.
-* The output of `sigil -v`.
-* The output of `docker run --rm -ti gliderlabs/herokuish:latest herokuish version`
-* The output of `dokku version`.
-* The output of `dokku plugin`.
-
-Please also include the steps required to reproduce the problem if possible and
-applicable. This information will help us review and fix your issue faster.
-
-Our Issue Report Template is available [here](https://github.com/dokku/dokku/blob/master/ISSUE_TEMPLATE.md)
+When reporting issues, please include all the information we ask for in our
+[issue template](https://github.com/dokku/dokku/blob/master/ISSUE_TEMPLATE.md).
+Not doing so will prolongue the support period, making it more difficult to support
+you.
 
 ## Contributing
 
@@ -126,7 +114,7 @@ Be patient! The Dokku maintainers will review all pull requests and comment as
 quickly as possible. There may be some back and forth while the details of your
 pull request are discussed.
 
-In the unlikely event that your pull request does not get merged, the dokku
+In the unlikely event that your pull request does not get merged, the Dokku
 maintainers will either provide an alternative patch or guide you towards a
 better solution to the problem at hand.
 

Dockerfile

@@ -0,0 +1,56 @@
+FROM phusion/baseimage:0.11
+
+CMD ["/sbin/my_init"]
+
+ARG DOKKU_TAG=0.17.7
+ARG DOKKU_GID=200
+ARG DOKKU_UID=200
+ARG DOKKU_HOSTNAME=dokku.invalid
+ARG DOKKU_SKIP_KEY_FILE=true
+ARG DOKKU_VHOST_ENABLE=false
+ARG DOKKU_WEB_CONFIG=false
+
+RUN addgroup --gid $DOKKU_GID dokku \
+      && adduser --uid $DOKKU_UID --gid $DOKKU_GID --disabled-password --gecos "" "dokku"
+
+COPY ./tests/dhparam.pem /tmp/dhparam.pem
+COPY ./build/dokku.deb /tmp/dokku.deb
+RUN echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | debconf-set-selections \
+      && echo "dokku dokku/skip_key_file boolean $DOKKU_SKIP_KEY_FILE" | debconf-set-selections \
+      && echo "dokku dokku/vhost_enable boolean $DOKKU_VHOST_ENABLE" | debconf-set-selections \
+      && echo "dokku dokku/web_config boolean $DOKKU_WEB_CONFIG" | debconf-set-selections \
+      && curl -sSL https://packagecloud.io/dokku/dokku/gpgkey | apt-key add - \
+      && echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ bionic main" | tee /etc/apt/sources.list.d/dokku.list \
+      && mkdir -p /etc/nginx/ \
+      && cp /tmp/dhparam.pem /etc/nginx/dhparam.pem \
+      && apt-get update -qq \
+      && apt-get upgrade -qq -y \
+      && apt-get install --no-install-recommends --only-upgrade -qq -y openssl openssh-server \
+      && apt install --no-install-recommends -qq -y rsync /tmp/dokku.deb \
+      && apt-get purge -qq -y syslog-ng-core \
+      && apt-get autoremove -qq -y \
+      && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+WORKDIR /tmp
+
+COPY ./docker .
+
+RUN \
+    rsync -a /tmp/ / \
+      && rm -rf /tmp/* \
+      && rm /etc/runit/runsvdir/default/sshd/down \
+      && chown -R dokku:dokku /home/dokku/ \
+      && mkdir -p /skel/etc /skel/home /skel/var/lib/dokku /var/log/services \
+      && mv /etc/ssh /skel/etc/ssh \
+      && mv /home/dokku /skel/home/dokku \
+      && mv /var/lib/dokku/config /skel/var/lib/dokku/config \
+      && mv /var/lib/dokku/data /skel/var/lib/dokku/data \
+      && ln -sf /mnt/dokku/etc/ssh /etc/ssh \
+      && ln -sf /mnt/dokku/home/dokku /home/dokku \
+      && ln -sf /mnt/dokku/var/lib/dokku/config /var/lib/dokku/config \
+      && ln -sf /mnt/dokku/var/lib/dokku/data /var/lib/dokku/data \
+      && mv /etc/my_init.d/00_regen_ssh_host_keys.sh /etc/my_init.d/15_regen_ssh_host_keys \
+      && rm -f /etc/nginx/sites-enabled/default /usr/share/nginx/html/index.html /etc/my_init.d/10_syslog-ng.init \
+      && rm -f /usr/local/openresty/nginx/conf/sites-enabled/default /usr/share/openresty/html/index.html \
+      && sed -i '/imklog/d' /etc/rsyslog.conf \
+      && rm -f /var/log/btmp /var/log/wtmp /var/log/*log /var/log/apt/* /var/log/dokku/* /var/log/nginx/* /var/log/openresty/*

ISSUE_TEMPLATE.md

@@ -1,6 +1,10 @@
 > 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'd like to sponsor specific functionality, see the project's [Sponsoring](https://github.com/dokku/.github/blob/master/SPONSORING.md) document.
+>
 > 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.
+>
+> If you need support for a version of Dokku that is more than a year old, your issue may be closed without an answer. Please upgrade to a recent version.
 
 ## Description of problem
 
@@ -16,6 +20,8 @@
 
 #### Expected Results
 
+<-- Please replace APP_NAME with the name of your app -->
+
 ## Environment Information
 
 ### `dokku report APP_NAME` output
@@ -23,16 +29,14 @@
 > This is required! Issues missing this information may be closed.
 >
 > For problems affecting all applications, the report output for a broken application is useful for our debugging.
-> You may also run `dokku report` without any arguments to display the top-level reporting information.
+> In these cases, you may run `dokku report` without any arguments to display the top-level reporting information.
 
 ### How (deb/make/rpm) and where (AWS, VirtualBox, physical, etc.) was Dokku installed?:
 
 ### Additional information
 
-- 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):
+- Container Inspect Output (if applicable) via `dokku ps:inspect APP_NAME`
+- The nginx configuration (if applicable) via `dokku nginx:show-config APP_NAME`
 - Link to the exact repository being deployed (if possible/applicable):
 - If a deploy is failing or behaving unexpectedly:
   - Application name
@@ -40,5 +44,5 @@
   - If using buildpacks, which custom buildpacks are in use
   - If using a `Dockerfile`, the contents of that file
   - If it exists, the contents of your `Procfile`.
-- Output of failing Dokku commands after running `dokku trace on`
-  (BEWARE: `trace on` 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):
+- Output of failing Dokku commands after running `dokku trace:on`
+  (BEWARE: `trace:on` 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 XXXXXX):

Makefile

@@ -1,9 +1,11 @@
 DOKKU_VERSION ?= master
 
-PROCFILE_VERSION ?= 0.4.0
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.7.0/sshcommand
+PROCFILE_VERSION ?= 0.6.0
+PLUGN_VERSION ?= 0.3.2
+SSHCOMMAND_VERSION ?= 0.10.0
+SSHCOMMAND_URL ?= https://github.com/dokku/sshcommand/releases/download/v${SSHCOMMAND_VERSION}/sshcommand_${SSHCOMMAND_VERSION}_linux_x86_64.tgz
 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
+PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v${PLUGN_VERSION}/plugn_${PLUGN_VERSION}_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
 PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
@@ -31,6 +33,7 @@ include common.mk
 .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 package.mk
 include deb.mk
 include rpm.mk
 include arch.mk
@@ -105,10 +108,11 @@ addman: help2man man-db
 	mandb
 
 version:
+	mkdir -p ${DOKKU_LIB_ROOT}
 ifeq ($(DOKKU_VERSION),master)
-	git describe --tags > ~dokku/VERSION  2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ~dokku/VERSION
+	git describe --tags > ${DOKKU_LIB_ROOT}/VERSION  2>/dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ${DOKKU_LIB_ROOT}/VERSION
 else
-	echo $(DOKKU_VERSION) > ~dokku/VERSION
+	echo $(DOKKU_VERSION) > ${DOKKU_LIB_ROOT}/STABLE_VERSION
 endif
 
 plugin-dependencies: plugn procfile-util
@@ -117,12 +121,18 @@ plugin-dependencies: plugn procfile-util
 plugins: plugn procfile-util docker
 	sudo -E dokku plugin:install --core
 
-dependencies: apt-update sshcommand plugn procfile-util docker help2man man-db sigil
+dependencies: apt-update sshcommand plugn procfile-util docker help2man man-db sigil dos2unix jq
 	$(MAKE) -e stack
 
 apt-update:
 	apt-get update -qq
 
+jq:
+	apt-get install -qq -y jq
+
+dos2unix:
+	apt-get install -qq -y dos2unix
+
 help2man:
 	apt-get install -qq -y help2man
 
@@ -130,8 +140,8 @@ man-db:
 	apt-get install -qq -y man-db
 
 sshcommand:
-	wget -qO /usr/local/bin/sshcommand ${SSHCOMMAND_URL}
-	chmod +x /usr/local/bin/sshcommand
+	wget -qO /tmp/sshcommand_latest.tgz ${SSHCOMMAND_URL}
+	tar xzf /tmp/sshcommand_latest.tgz -C /usr/local/bin
 	sshcommand create dokku /usr/local/bin/dokku
 
 procfile-util:
@@ -148,7 +158,7 @@ sigil:
 
 docker:
 	apt-get install -qq -y curl
-	egrep -i "^docker" /etc/group || groupadd docker
+	grep -i -E "^docker" /etc/group || groupadd docker
 	usermod -aG docker dokku
 ifndef CI
 	wget -nv -O - https://get.docker.com/ | sh
@@ -164,7 +174,7 @@ ifdef BUILD_STACK
 	@echo "Start building herokuish from source"
 	docker images | grep gliderlabs/herokuish || (git clone ${STACK_URL} /tmp/herokuish && cd /tmp/herokuish && IMAGE_NAME=gliderlabs/herokuish BUILD_TAG=latest VERSION=master make -e ${BUILD_STACK_TARGETS} && rm -rf /tmp/herokuish)
 else
-ifeq ($(shell echo ${PREBUILT_STACK_URL} | egrep -q 'http.*://|file://' && echo $$?),0)
+ifeq ($(shell echo ${PREBUILT_STACK_URL} | grep -q -E 'http.*://|file://' && echo $$?),0)
 	@echo "Start importing herokuish from ${PREBUILT_STACK_URL}"
 	docker images | grep gliderlabs/herokuish || wget -nv -O - ${PREBUILT_STACK_URL} | gunzip -cd | docker import - gliderlabs/herokuish
 else

README.md

@@ -13,8 +13,6 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.
 
 ## Sponsors
 
-See our list of past sponsors in the [SPONSORS](https://github.com/dokku/dokku/blob/master/SPONSORS.md) file.
-
 Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/dokku#sponsor)]
 
 <a href="https://opencollective.com/dokku/sponsor/0/website" target="_blank"><img src="https://opencollective.com/dokku/sponsor/0/avatar.svg"></a>
@@ -88,18 +86,21 @@ Support us with a monthly donation and help us continue our activities. [[Become
 
 A fresh VM running any of the following operating systems:
 
-- Ubuntu x64 - Any currently supported release
-- Debian 8.2+ x64
+- Ubuntu 16.04/18.04 x64 - Any currently supported release
+- Debian 9+ x64
 - CentOS 7 x64 *(experimental)*
 - Arch Linux x64 *(experimental)*
 
+An SSH keypair that can be used for application deployment. If this exists before installation, it will be automatically imported into dokku.
+Otherwise, you will need to import the keypair manually after installation using `dokku ssh-keys:add`.
+
 ## Installation
 
 To install the latest stable release, run the following commands as a user who has access to `sudo`:
 
 ```shell
-wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh
-sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.20.2/bootstrap.sh
+sudo DOKKU_TAG=v0.20.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.

SPONSORS.md

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

Vagrantfile

@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-14.04"
+BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-18.04"
 BOX_CPUS = ENV["BOX_CPUS"] || "1"
 BOX_MEMORY = ENV["BOX_MEMORY"] || "1024"
 DOKKU_DOMAIN = ENV["DOKKU_DOMAIN"] || "dokku.me"
@@ -33,6 +33,10 @@ Vagrant::configure("2") do |config|
     v.vmx["memsize"] = BOX_MEMORY
   end
 
+  config.vm.provider :vmware_desktop do |v, override|
+    v.vmx["memsize"] = BOX_MEMORY
+  end
+
   config.vm.define "empty", autostart: false
 
   config.vm.define "dokku", primary: true do |vm|
@@ -49,7 +53,7 @@ Vagrant::configure("2") do |config|
       vb.customize ["modifyvm", :id, "--cableconnected1", "on"]
     end
 
-    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
+    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update >/dev/null && apt-get -qq -y install git >/dev/null && cd /root/dokku && #{make_cmd}"
     vm.vm.provision :shell, :inline => "cd /root/dokku && make dokku-installer"
     vm.vm.provision :shell do |s|
       s.inline = <<-EOT
@@ -66,7 +70,7 @@ Vagrant::configure("2") do |config|
     vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
-    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git dos2unix > /dev/null"
+    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update >/dev/null && apt-get -qq -y install git dos2unix >/dev/null"
     vm.vm.provision :shell, :inline => "cd /vagrant/ && export DOKKU_BRANCH=`git symbolic-ref -q --short HEAD 2>/dev/null` && export DOKKU_TAG=`git describe --tags --exact-match 2>/dev/null` && cd /root/ && cp /vagrant/bootstrap.sh ./ && dos2unix bootstrap.sh && bash bootstrap.sh"
   end
 
@@ -92,7 +96,7 @@ Vagrant::configure("2") do |config|
     vm.vm.network :forwarded_port, guest: 80, host: FORWARDED_PORT
     vm.vm.hostname = "#{DOKKU_DOMAIN}"
     vm.vm.network :private_network, ip: DOKKU_IP
-    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update > /dev/null && apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
+    vm.vm.provision :shell, :inline => "export DEBIAN_FRONTEND=noninteractive && apt-get update >/dev/null && apt-get -qq -y install git >/dev/null && cd /root/dokku && #{make_cmd}"
     vm.vm.provision :shell, :inline => "export IS_RELEASE=true && cd /root/dokku && make deb-all rpm-all"
   end
 

bootstrap.sh

@@ -3,7 +3,7 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 # A script to bootstrap dokku.
-# It expects to be run on Ubuntu 14.04 via 'sudo'
+# It expects to be run on Ubuntu 16.04/18.04, or CentOS 7 via 'sudo'
 # If installing a tag higher than 0.3.13, it may install dokku via a package (so long as the package is higher than 0.3.13)
 # It checks out the dokku source code from Github into ~/dokku and then runs 'make install' from dokku source.
 
@@ -12,13 +12,20 @@ set -eo pipefail
 # That's good because it prevents our output overlapping with wget's.
 # It also means that we can't run a partially downloaded script.
 
+SUPPORTED_VERSIONS="Debian [9, 10], CentOS [7], Ubuntu [16.04, 18.04]"
+
+log-fail() {
+  declare desc="log fail formatter"
+  echo "$@" 1>&2
+  exit 1
+}
+
 ensure-environment() {
   local FREE_MEMORY
   echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
 
   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
+    log-fail "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"
   }
 
   FREE_MEMORY=$(grep MemTotal /proc/meminfo | awk '{print $2}')
@@ -32,7 +39,13 @@ install-requirements() {
   echo "--> Ensuring we have the proper dependencies"
 
   case "$DOKKU_DISTRO" in
-    debian | ubuntu)
+    debian)
+      if ! dpkg -l | grep -q software-properties-common; then
+        apt-get update -qq >/dev/null
+        apt-get -qq -y install software-properties-common
+      fi
+      ;;
+    ubuntu)
       if ! dpkg -l | grep -q software-properties-common; then
         apt-get update -qq >/dev/null
         apt-get -qq -y install software-properties-common
@@ -84,8 +97,7 @@ install-dokku-from-source() {
   local DOKKU_CHECKOUT="$1"
 
   if ! command -v apt-get &>/dev/null; then
-    echo "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
-    exit 1
+    log-fail "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
   fi
 
   apt-get -qq -y install git make software-properties-common
@@ -109,8 +121,7 @@ install-dokku-from-package() {
       install-dokku-from-rpm-package "$@"
       ;;
     *)
-      echo "Unsupported Linux distribution. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
-      exit 1
+      log-fail "Unsupported Linux distribution. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
       ;;
   esac
 }
@@ -130,6 +141,10 @@ install-dokku-from-deb-package() {
   local NO_INSTALL_RECOMMENDS=${DOKKU_NO_INSTALL_RECOMMENDS:=""}
   local OS_ID
 
+  if ! in-array "$DOKKU_DISTRO_VERSION" "16.04" "18.04" "9" "10"; then
+    log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS"
+  fi
+
   if [[ -n $DOKKU_DOCKERFILE ]]; then
     NO_INSTALL_RECOMMENDS=" --no-install-recommends "
   fi
@@ -150,26 +165,21 @@ install-dokku-from-deb-package() {
     wget -nv -O - https://get.docker.com/ | sh
   fi
 
-  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 "bionic")"
   if ! in-array "$DOKKU_DISTRO" "debian" "ubuntu"; then
     DOKKU_DISTRO="ubuntu"
-    OS_ID="trusty"
+    OS_ID="bionic"
   fi
 
   if [[ "$DOKKU_DISTRO" == "ubuntu" ]]; then
-    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
+    OS_IDS=("xenial" "bionic")
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
-      OS_ID="trusty"
+      OS_ID="bionic"
     fi
   elif [[ "$DOKKU_DISTRO" == "debian" ]]; then
-    OS_IDS=("wheezy" "jessie" "stretch" "buster")
+    OS_IDS=("stretch" "buster")
     if ! in-array "$OS_ID" "${OS_IDS[@]}"; then
-      OS_ID="stretch"
+      OS_ID="buster"
     fi
   fi
 
@@ -197,9 +207,8 @@ install-dokku-from-deb-package() {
 install-dokku-from-rpm-package() {
   local DOKKU_CHECKOUT="$1"
 
-  if [[ "$DOKKU_DISTRO_VERSION" != "7" ]]; then
-    echo "Only CentOS version 7 is supported."
-    exit 1
+  if ! in-array "$DOKKU_DISTRO_VERSION" "7"; then
+    log-fail "Unsupported Linux distribution. Only the following versions are supported: $SUPPORTED_VERSIONS"
   fi
 
   echo "--> Installing docker"

common.mk

@@ -1,4 +1,41 @@
+GO_ARGS ?= -a
 GO_REPO_ROOT := /go/src/github.com/dokku/dokku
-BUILD_IMAGE := golang:1.9.1
+BUILD_IMAGE := golang:1.12
 
 .PHONY: build-in-docker build clean src-clean
+
+build: $(BUILD)
+
+build-in-docker: clean
+	mkdir -p /tmp/dokku-go-build-cache
+	docker run --rm \
+		-v $$PWD/../..:$(GO_REPO_ROOT) \
+		-v /tmp/dokku-go-build-cache:/root/.cache/go-build \
+		-e PLUGIN_NAME=$(PLUGIN_NAME) \
+		-w $(GO_REPO_ROOT)/plugins/$(PLUGIN_NAME) \
+		$(BUILD_IMAGE) \
+		bash -c "GO_ARGS='$(GO_ARGS)' make -j4 build" || exit $$?
+
+clean:
+	rm -rf commands subcommands triggers prop
+	find . -xtype l -delete
+
+commands: **/**/commands.go
+	go build -ldflags="-s -w" $(GO_ARGS) -o commands src/commands/commands.go
+
+subcommands:
+	go build -ldflags="-s -w" $(GO_ARGS) -o subcommands/subcommands src/subcommands/subcommands.go
+	$(MAKE) $(SUBCOMMANDS)
+
+subcommands/%:
+	ln -sf subcommands $@
+
+src-clean:
+	rm -rf .gitignore src vendor Makefile *.go glide.*
+
+triggers:
+	go build -ldflags="-s -w" $(GO_ARGS) -o triggers src/triggers/triggers.go
+	$(MAKE) $(TRIGGERS)
+
+triggers/%:
+	ln -sf triggers $(shell echo $@ | cut -d '/' -f2)

contrib/bash-completion

@@ -1,4 +1,4 @@
-# bash completion for dd                                   -*- shell-script -*-
+# bash completion for dokku                                -*- shell-script -*-
 
 _dokku_complete_verify() {
   declare desc="shows bash completion"

contrib/build-base.Dockerfile

@@ -0,0 +1,6 @@
+FROM ubuntu:18.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc

contrib/build-dokku-update.Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM dokku/build-base:0.0.1
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
 
 ARG WORKDIR=/go/src/github.com/dokku/dokku
 

contrib/build-dokku.Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM dokku/build-base:0.0.1
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
 
 ARG GOLANG_VERSION
 
@@ -35,8 +35,7 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \
     IS_RELEASE=${IS_RELEASE} \
     SKIP_GO_CLEAN=true \
     make version copyfiles \
-    && rm -rf plugins/common/*.go  plugins/common/glide*  plugins/common/vendor/ \
-    && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update \
-            rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil rpm-dokku-update
+    && make deb-dokku deb-sigil \
+            rpm-dokku rpm-sigil
 
 RUN ls -lha /tmp/

contrib/build-herokuish.Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:14.04
+FROM dokku/build-base:0.0.1
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db
-RUN command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
 
 ARG WORKDIR=/go/src/github.com/dokku/dokku
 

contrib/copy-packages

@@ -16,7 +16,7 @@ def download_file(filename, url):
 
 def upload_file(filename):
     versions = [
-        "bionic",
+        "xenial"
     ]
     cmd_template = "package_cloud push dokku/dokku/ubuntu/{0} {1}"
     for version in versions:
@@ -26,7 +26,7 @@ def upload_file(filename):
 
 def main():
     auth = HTTPBasicAuth(PACKAGECLOUD_TOKEN, '')
-    base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/trusty.json',
+    base = requests.get('https://packagecloud.io/api/v1/repos/dokku/dokku/packages/deb/ubuntu/bionic.json',
                         auth=auth)
     data = base.json()
     urls = []
@@ -42,7 +42,7 @@ def main():
             download_urls['downloads/' + version['filename']] = version['download_url']
 
     for filename, download_url in download_urls.items():
-        print "downloading", filename
+        print("downloading {0}".format(filename))
         download_file(filename, download_url)
         upload_file(filename)
 

contrib/dokku-docker-bin.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x && DOKKU_DOCKER_ENV="--env DOKKU_TRACE=on"
+DOKKU_DOCKER_CONTAINER_NAME=${DOKKU_DOCKER_CONTAINER_NAME:=dokku}
+
+# TODO: handle cases where we need a tty
+# shellcheck disable=SC2086
+docker exec $DOKKU_DOCKER_ENV -i "$DOKKU_DOCKER_CONTAINER_NAME" dokku "$@"

contrib/dokku-installer.py

@@ -1,23 +1,44 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 
 import cgi
 import json
 import os
 import re
-import SimpleHTTPServer
-import SocketServer
+try:
+    import SimpleHTTPServer
+    import SocketServer
+except ImportError:
+    import http.server as SimpleHTTPServer
+    import socketserver as SocketServer
 import subprocess
 import sys
 import threading
 
-VERSION = 'v0.14.2'
+VERSION = 'v0.20.2'
+
+def bytes_to_string(b):
+    if type(b) == bytes:
+        encoding = sys.stdout.encoding
+        if encoding is None:
+            encoding = 'utf-8'
+        b = b.decode(encoding)
+    b = b.strip()
+    return b
+
+
+def string_to_bytes(s):
+    if type(s) == str:
+        encoding = sys.stdout.encoding
+        if encoding is None:
+            encoding = 'utf-8'
+        s = s.encode(encoding)
+    return s
+
 
 hostname = ''
 try:
     command = "bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || wget -q -O - icanhazip.com'"
-    hostname = subprocess.check_output(command, shell=True)
-    if ':' in hostname:
-        hostname = ''
+    hostname = bytes_to_string(subprocess.check_output(command, shell=True))
 except subprocess.CalledProcessError:
     pass
 
@@ -33,17 +54,37 @@ admin_keys = []
 if os.path.isfile(key_file):
     try:
         command = "cat {0}".format(key_file)
-        admin_keys = subprocess.check_output(command, shell=True).strip().split("\n")
+        admin_keys = bytes_to_string(subprocess.check_output(command, shell=True)).strip().split("\n")
     except subprocess.CalledProcessError:
         pass
 
+ufw_display = 'block'
+try:
+    command = "sudo ufw status"
+    ufw_output = bytes_to_string(subprocess.check_output(command, shell=True).strip())
+    if "inactive" in ufw_output:
+        ufw_display = 'none'
+except subprocess.CalledProcessError:
+    ufw_display = 'none'
+
+
+nginx_dir = '/etc/nginx'
+nginx_init = '/etc/init.d/nginx'
+try:
+    command = "test -x /usr/bin/openresty"
+    subprocess.check_output(command, shell=True)
+    nginx_dir = '/usr/local/openresty/nginx/conf'
+    nginx_init = '/etc/init.d/openresty'
+except subprocess.CalledProcessError:
+    pass
+
 
 def check_boot():
     if 'onboot' not in sys.argv:
         return
     init_dir = os.getenv('INIT_DIR', '/etc/init')
     systemd_dir = os.getenv('SYSTEMD_DIR', '/etc/systemd/system')
-    nginx_dir = os.getenv('NGINX_DIR', '/etc/nginx/conf.d')
+    nginx_conf_dir = os.getenv('NGINX_CONF_DIR', '{0}/conf.d'.format(nginx_dir))
 
     if os.path.exists(init_dir):
         with open('{0}/dokku-installer.conf'.format(init_dir), 'w') as f:
@@ -60,8 +101,8 @@ def check_boot():
             f.write("[Install]\n")
             f.write("WantedBy=multi-user.target\n")
             f.write("WantedBy=graphical.target\n")
-    if os.path.exists(nginx_dir):
-        with open('{0}/dokku-installer.conf'.format(nginx_dir), 'w') as f:
+    if os.path.exists(nginx_conf_dir):
+        with open('{0}/dokku-installer.conf'.format(nginx_conf_dir), 'w') as f:
             f.write("upstream dokku-installer { server 127.0.0.1:2000; }\n")
             f.write("server {\n")
             f.write("  listen      80;\n")
@@ -70,19 +111,27 @@ def check_boot():
             f.write("  }\n")
             f.write("}\n")
 
-    subprocess.call('rm -f /etc/nginx/sites-enabled/*', shell=True)
+    subprocess.call('rm -f {0}/sites-enabled/*'.format(nginx_dir), shell=True)
     sys.exit(0)
 
 
 class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+    def write_content(self, content):
+        try:
+            self.wfile.write(content)
+        except TypeError:
+            self.wfile.write(string_to_bytes(content))
+
+
     def do_GET(self):
         content = PAGE.replace('{VERSION}', VERSION)
+        content = content.replace('{UFW_DISPLAY}', ufw_display)
         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()
-        self.wfile.write(content)
+        self.write_content(content)
 
     def do_POST(self):
         if self.path not in ['/setup', '/setup/']:
@@ -123,7 +172,10 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
             user = user + str(index)
             command = ['sshcommand', 'acl-add', 'dokku', user]
             proc = subprocess.Popen(command, stdin=subprocess.PIPE)
-            proc.stdin.write(key)
+            try:
+                proc.stdin.write(key)
+            except TypeError:
+                proc.stdin.write(string_to_bytes(key))
             proc.stdin.close()
             proc.wait()
 
@@ -136,9 +188,11 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         if 'selfdestruct' in sys.argv:
             DeleteInstallerThread()
 
+        content = json.dumps({'status': 'ok'})
+
         self.send_response(200)
         self.end_headers()
-        self.wfile.write(json.dumps({'status': 'ok'}))
+        self.write_content(content)
 
     def web_admin_user_exists(self):
         return self.user_exists('web-admin(\d+)')
@@ -153,11 +207,11 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         max_num = 0
         exists = False
         for line in proc.stdout:
-            m = pattern.search(line)
+            m = pattern.search(bytes_to_string(line))
             if m:
                 # User of the form `user` or `user#` exists
                 exists = True
-                max_num = max(max_num, m.group(1))
+                max_num = max(max_num, int(m.group(1)))
         if exists:
             return max_num
         else:
@@ -193,7 +247,7 @@ class DeleteInstallerThread(object):
         thread.start()
 
     def run(self):
-        command = "rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start"
+        command = "rm {0}/conf.d/dokku-installer.conf && {1} stop && {1} start".format(nginx_dir, nginx_init)
         try:
             subprocess.call(command, shell=True)
         except:
@@ -211,16 +265,16 @@ def main():
 
     port = int(os.getenv('PORT', 2000))
     httpd = SocketServer.TCPServer(("", port), GetHandler)
-    print "Listening on 0.0.0.0:{0}, CTRL+C to stop".format(port)
+    print("Listening on 0.0.0.0:{0}, CTRL+C to stop".format(port))
     httpd.serve_forever()
 
 
 PAGE = """
 <html>
 <head>
+  <meta charset="utf-8" />
   <title>Dokku Setup</title>
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
-  <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
   <style>
     .bd-callout {
       padding: 1.25rem;
@@ -294,6 +348,9 @@ PAGE = """
             <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="alert alert-warning small mt-3 d-{UFW_DISPLAY}" role="alert">
+            <strong>Warning:</strong> UFW is active. To allow traffic to specific ports, run <code>sudo ufw allow PORT</code> for the port in question.
+          </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>
@@ -306,44 +363,59 @@ PAGE = """
 
   <div id="error-output"></div>
   <script>
+    var $ = document.querySelector.bind(document)
+
     function setup() {
-      if ($.trim($("#key").val()) == "") {
+      if ($("#key").value.trim() == "") {
         alert("Your admin public key cannot be blank.")
         return
       }
-      if ($.trim($("#hostname").val()) == "") {
+      if ($("#hostname").value.trim() == "") {
         alert("Your hostname cannot be blank.")
         return
       }
-      data = $("#form").serialize()
-      $("input,textarea,button").prop("disabled", true);
-      $.post('/setup', data)
-        .done(function() {
-          $(".result").addClass('text-success');
-          $(".result").html("Success! Redirecting in 3 seconds. ..")
+      var data = new FormData($("#form"))
+
+      var inputs = [].slice.call(document.querySelectorAll("input, textarea, button"))
+      inputs.forEach(function (input) {
+        input.disabled = true
+      })
+
+      var result = $(".result")
+      fetch("/setup", {method: "POST", body: data})
+        .then(function(response) {
+            if (response.ok) {
+                return response.json()
+            } else {
+                throw new Error('Server returned error')
+            }
+        })
+        .then(function(response) {
+          result.classList.add("text-success");
+          result.textContent = "Success! Redirecting in 3 seconds. .."
           setTimeout(function() {
             window.location.href = "http://dokku.viewdocs.io/dokku~{VERSION}/deployment/application-deployment/";
           }, 3000);
         })
-        .fail(function(data) {
-          $(".result").addClass('text-danger');
-          $(".result").html("Something went wrong...")
-          $("#error-output").html(data.responseText)
-        });
+        .catch(function (error) {
+          result.classList.add("text-danger");
+          result.textContent = "Could not send the request"
+        })
     }
+
     function update() {
-      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
+      if ($("#vhost").matches(":checked") && $("#hostname").value.match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
         alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
-        $("#vhost").prop('checked', false);
+        $("#vhost").checked = false;
       }
-      if ($("#vhost").is(':checked')) {
-        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
+      if ($("#vhost").matches(':checked')) {
+        $("#example").textContent = "http://<app-name>."+$("#hostname").value
       } else {
-        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
+        $("#example").textContent = "http://"+$("#hostname").value+":<app-port>"
       }
     }
-    $("#vhost").change(update);
-    $("#hostname").change(update);
+    $("#vhost").addEventListener("change", update);
+    $("#hostname").addEventListener("input", update);
     update();
   </script>
 </body>

contrib/packer.json

@@ -19,7 +19,7 @@
         "sleep 30",
 
         "echo '--> Updating apt repositories'",
-        "sudo apt-get update -qq > /dev/null",
+        "sudo apt-get update -qq >/dev/null",
 
         "echo '--> Installing make requirement'",
         "sudo apt-get -qq -y install build-essential",

contrib/release-dokku

@@ -3,10 +3,10 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
-readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXX")"
+readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"
 
-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034
@@ -24,7 +24,7 @@ log-fail() {
   # shellcheck disable=SC2034
   declare desc="Log fail formatter"
   log-error "$*"
-  exit -1
+  exit 1
 }
 
 fn-build-dokku() {
@@ -49,7 +49,7 @@ fn-build-dokku() {
     --build-arg IS_RELEASE="$IS_RELEASE" \
     --build-arg PLUGIN_MAKE_TARGET="build" \
     --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
-    -f "contrib/build.Dockerfile" \
+    -f "contrib/build-dokku.Dockerfile" \
     -t "$NAME" .
   return "$?"
 }
@@ -136,7 +136,7 @@ fn-publish-package() {
   [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
 
   if [[ "$DIST" == "ubuntu" ]]; then
-    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
+    OS_IDS=("xenial" "bionic")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
@@ -147,7 +147,7 @@ fn-publish-package() {
     done
 
     DIST=debian
-    OS_IDS=("wheezy" "jessie" "stretch" "buster")
+    OS_IDS=("stretch" "buster")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
@@ -206,20 +206,22 @@ fn-repo-update() {
 
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" contrib/dokku-installer.py
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" debian/control
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" Dockerfile
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/advanced-usage/plugin-management.md
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/favicons/browserconfig.xml
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/favicons/manifest.json
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/style.css
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/development/release-process.md
-  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/home.html
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/install/docker.md
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/getting-started/installation.md
+  fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/home.html
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/template.html
   fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" README.md
 
   if [[ "$RELEASE" == 'patch' ]]; then
     fn-replace-version "$CURRENT_VERSION" "$NEXT_VERSION" docs/assets/versions.json
   else
-    versions=$(python -c 'import json,sys;d=json.load(sys.stdin);d["max-versions"].append("'"${NEXT_VERSION}"'"); print json.dumps(d, indent=2, sort_keys=True)' <docs/assets/versions.json)
+    versions=$(python -c 'import json,sys;d=json.load(sys.stdin);d["max-versions"].append("'"${NEXT_VERSION}"'"); print(json.dumps(d, indent=2, sort_keys=True))' <docs/assets/versions.json)
     echo "$versions" >docs/assets/versions.json
     git add docs/assets/versions.json
   fi
@@ -317,6 +319,12 @@ fn-require-bin() {
   fi
 }
 
+fn-build-docker-image() {
+  declare desc="Builds the dokku docker image and tags it with the given version"
+  declare VERSION="$1"
+  docker build -t "dokku/dokku:$VERSION" .
+}
+
 main() {
   declare RELEASE="$1"
   local CURRENT_VERSION NEXT_VERSION IS_RELEASE
@@ -354,10 +362,20 @@ main() {
   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"
+  cp -f "build/dokku_${NEXT_VERSION}_amd64.deb" build/dokku.deb
 
-  if [[ "$RELEASE" != "build" ]]; then
+  if [[ "$RELEASE" == "build" ]]; then
+    fn-build-docker-image "latest" || log-fail "Error building docker image"
+  else
     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-build-docker-image "$NEXT_VERSION" || log-fail "Error building docker image"
+
+    if [[ "$IS_RELEASE" == "true" ]]; then
+      docker tag "dokku/dokku:$NEXT_VERSION" "dokku/dokku:latest"
+      docker push "dokku/dokku:$NEXT_VERSION"
+      docker push "dokku/dokku:latest"
+    fi
     fn-repo-push-tags "$IS_RELEASE"
   fi
 

contrib/release-dokku-update

@@ -3,10 +3,10 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
-readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXX")"
+readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"
 
-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034
@@ -24,7 +24,7 @@ log-fail() {
   # shellcheck disable=SC2034
   declare desc="Log fail formatter"
   log-error "$*"
-  exit -1
+  exit 1
 }
 
 fn-build-dokku() {
@@ -32,7 +32,7 @@ fn-build-dokku() {
 
   pushd "$ROOT_DIR" >/dev/null
   docker build \
-    -f "contrib/update-build.Dockerfile" \
+    -f "contrib/build-dokku-update.Dockerfile" \
     -t dokku-update:build .
   return "$?"
 }
@@ -61,7 +61,7 @@ fn-publish-package() {
   [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
 
   if [[ "$DIST" == "ubuntu" ]]; then
-    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
+    OS_IDS=("xenial" "bionic")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
@@ -72,7 +72,7 @@ fn-publish-package() {
     done
 
     DIST=debian
-    OS_IDS=("wheezy" "jessie" "stretch" "buster")
+    OS_IDS=("stretch" "buster")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-dokku-update) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"

contrib/release-herokuish

@@ -3,10 +3,10 @@ set -eo pipefail
 [[ $TRACE ]] && set -x
 
 readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
-readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXX")"
+readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"
 
-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034
@@ -24,7 +24,7 @@ log-fail() {
   # shellcheck disable=SC2034
   declare desc="Log fail formatter"
   log-error "$*"
-  exit -1
+  exit 1
 }
 
 fn-build-dokku() {
@@ -32,7 +32,7 @@ fn-build-dokku() {
 
   pushd "$ROOT_DIR" >/dev/null
   docker build \
-    -f "contrib/herokuish-build.Dockerfile" \
+    -f "contrib/build-herokuish.Dockerfile" \
     -t herokuish:build .
   return "$?"
 }
@@ -61,7 +61,7 @@ fn-publish-package() {
   [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7
 
   if [[ "$DIST" == "ubuntu" ]]; then
-    OS_IDS=("trusty" "utopic" "vivid" "wily" "xenial" "yakkety" "zesty" "artful" "bionic")
+    OS_IDS=("xenial" "bionic")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"
@@ -72,7 +72,7 @@ fn-publish-package() {
     done
 
     DIST=debian
-    OS_IDS=("wheezy" "jessie" "stretch" "buster")
+    OS_IDS=("stretch" "buster")
     for OS_ID in "${OS_IDS[@]}"; do
       log-info "(release-herokuish) pushing ${RELEASE_TYPE} to packagecloud.com/${REPOSITORY}/${DIST}"
       package_cloud push "${REPOSITORY}/${DIST}/${OS_ID}" "$PACKAGE_NAME"

contrib/release-plugin

@@ -2,9 +2,9 @@
 set -eo pipefail
 [[ $TRACE ]] && set -x
 
-readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXX")"
+readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXXXX")"
 
-trap 'rm -rf "$TMP_WORK_DIR" > /dev/null' RETURN INT TERM EXIT
+trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034
@@ -22,7 +22,7 @@ log-fail() {
   # shellcheck disable=SC2034
   declare desc="Log fail formatter"
   log-error "$*"
-  exit -1
+  exit 1
 }
 
 fn-github-download-release() {
@@ -53,7 +53,7 @@ fn-require-bin() {
 }
 
 main() {
-  local RELEASE="$1"
+  local RELEASE="$1" AWS_RELEASE="$2"
   local CURRENT_VERSION FILENAME NEXT_VERSION ORG_REPO_NAME REPO_NAME major minor patch
 
   if [[ -z "$RELEASE" ]]; then
@@ -91,6 +91,10 @@ EOF
 
   fn-require-bin "git"
 
+  if [[ "$AWS_RELEASE" != "true" ]] && [[ "$AWS_RELEASE" != "false" ]]; then
+    local AWS_RELEASE=true
+  fi
+
   if [[ "$CI" != "true" ]] && [[ -z "$DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN" ]]; then
     log-info "You are running this without a DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN environment variable."
     log-info "Doing so disables uploading releases to S3, which may be necessary for installing private plugins."
@@ -104,7 +108,7 @@ EOF
     done
   fi
 
-  if [[ -n "$DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN" ]]; then
+  if [[ "$AWS_RELEASE" == "true" ]]; then
     fn-require-bin "aws"
     fn-require-bin "curl"
     if [[ -z "$DOKKU_PLUGIN_S3_BUCKET" ]]; then
@@ -156,7 +160,7 @@ EOF
   REPO_NAME="$(echo "$ORG_REPO_NAME" | cut -d'/' -f2)"
   FILENAME="${REPO_NAME}-${NEXT_VERSION}.tar.gz"
 
-  if [[ -n "$DOKKU_PLUGIN_GITHUB_ACCESS_TOKEN" ]]; then
+  if [[ "$AWS_RELEASE" == "true" ]]; then
     DOKKU_PLUGIN_S3_BUCKET="${DOKKU_PLUGIN_S3_BUCKET%/}"
     DOKKU_PLUGIN_S3_PATH="${DOKKU_PLUGIN_S3_PATH%/}"
     if [[ "$DOKKU_PLUGIN_S3_PATH" != "/" ]]; then

deb.mk

@@ -2,7 +2,7 @@ BUILD_DIRECTORY ?= /tmp
 
 HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HEROKUISH_REPO_NAME ?= gliderlabs/herokuish
-HEROKUISH_VERSION ?= 0.4.6
+HEROKUISH_VERSION ?= 0.5.11
 HEROKUISH_ARCHITECTURE = amd64
 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb
 
@@ -16,29 +16,6 @@ DOKKU_UPDATE_VERSION ?= 0.1.0
 DOKKU_UPDATE_ARCHITECTURE = amd64
 DOKKU_UPDATE_PACKAGE_NAME = dokku-update_$(DOKKU_UPDATE_VERSION)_$(DOKKU_UPDATE_ARCHITECTURE).deb
 
-define PLUGN_DESCRIPTION
-Hook system that lets users extend your application with plugins
-Plugin triggers are simply scripts that are executed by the system.
-You can use any language you want, so long as the script is
-executable and has the proper language requirements installed
-endef
-PLUGN_REPO_NAME ?= dokku/plugn
-PLUGN_VERSION ?= 0.3.0
-PLUGN_ARCHITECTURE = amd64
-PLUGN_PACKAGE_NAME = plugn_$(PLUGN_VERSION)_$(PLUGN_ARCHITECTURE).deb
-PLUGN_URL = https://github.com/dokku/plugn/releases/download/v$(PLUGN_VERSION)/plugn_$(PLUGN_VERSION)_linux_x86_64.tgz
-
-define SSHCOMMAND_DESCRIPTION
-Turn SSH into a thin client specifically for your app
-Simplifies running a single command over SSH, and
-manages authorized keys (ACL) and users in order to do so.
-endef
-SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
-SSHCOMMAND_VERSION ?= 0.7.0
-SSHCOMMAND_ARCHITECTURE = amd64
-SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v$(SSHCOMMAND_VERSION)/sshcommand
-
 define SIGIL_DESCRIPTION
 Standalone string interpolator and template processor
 Sigil is a command line tool for template processing
@@ -56,15 +33,13 @@ ifndef IS_RELEASE
 	IS_RELEASE = true
 endif
 
-export PLUGN_DESCRIPTION
 export SIGIL_DESCRIPTION
-export SSHCOMMAND_DESCRIPTION
 
-.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-dokku-update deb-plugn deb-setup deb-sshcommand deb-sigil
+.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-dokku-update deb-setup deb-sigil
 
 install-from-deb:
 	@echo "--> Initial apt-get update"
-	sudo apt-get update -qq > /dev/null
+	sudo apt-get update -qq >/dev/null
 	sudo apt-get install -qq -y apt-transport-https
 
 	@echo "--> Installing docker"
@@ -72,19 +47,19 @@ install-from-deb:
 
 	@echo "--> Installing dokku"
 	wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
-	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2> /dev/null || echo "trusty") main" | sudo tee /etc/apt/sources.list.d/dokku.list
-	sudo apt-get update -qq > /dev/null
+	@echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ $(shell lsb_release -cs 2>/dev/null || echo "bionic") 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
+deb-all: deb-setup deb-herokuish deb-dokku deb-sigil deb-dokku-update
 	mv $(BUILD_DIRECTORY)/*.deb .
 	@echo "Done"
 
 deb-setup:
 	@echo "-> Updating deb repository and installing build requirements"
-	@sudo apt-get update -qq > /dev/null
-	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -qq -y gcc git build-essential wget ruby-dev ruby1.9.1 lintian > /dev/null 2>&1
-	@command -v fpm > /dev/null || sudo gem install fpm --no-ri --no-rdoc
+	@sudo apt-get update -qq >/dev/null
+	@sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -qq -y gcc git build-essential wget ruby-dev ruby1.9.1 lintian >/dev/null 2>&1
+	@command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc
 	@ssh -o StrictHostKeyChecking=no git@github.com || true
 
 deb-herokuish:
@@ -95,9 +70,9 @@ deb-herokuish:
 	@echo "#!/usr/bin/env bash" >> /tmp/tmp/post-install
 	@echo "sleep 5" >> /tmp/tmp/post-install
 	@echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
-	@echo 'if [[ ! -z $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
+	@echo 'if [[ -n $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install
 	@echo "sudo docker pull gliderlabs/herokuish:v${HEROKUISH_VERSION} && sudo docker tag gliderlabs/herokuish:v${HEROKUISH_VERSION} gliderlabs/herokuish:latest" >> /tmp/tmp/post-install
 
 	@echo "-> Creating $(HEROKUISH_PACKAGE_NAME)"
@@ -113,53 +88,20 @@ deb-herokuish:
 		--license 'MIT License' \
 		.
 
-deb-dokku:
-	rm -rf /tmp/tmp /tmp/build dokku_*_$(DOKKU_ARCHITECTURE).deb
-	mkdir -p /tmp/tmp /tmp/build
+deb-dokku: /tmp/build-dokku/var/lib/dokku/GIT_REV
+	rm -f $(BUILD_DIRECTORY)/dokku_*_$(DOKKU_ARCHITECTURE).deb
 
-	cp -r debian /tmp/build/DEBIAN
-	mkdir -p /tmp/build/usr/share/bash-completion/completions
-	mkdir -p /tmp/build/usr/bin
-	mkdir -p /tmp/build/usr/share/doc/dokku
-	mkdir -p /tmp/build/usr/share/dokku/contrib
-	mkdir -p /tmp/build/usr/share/lintian/overrides
-	mkdir -p /tmp/build/usr/share/man/man1
-	mkdir -p /tmp/build/var/lib/dokku/core-plugins/available
-
-	cp dokku /tmp/build/usr/bin
-	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
-	cp contrib/bash-completion /tmp/build/usr/share/bash-completion/completions/dokku
-	find . -name ".DS_Store" -depth -exec rm {} \;
-	$(MAKE) go-build
-	cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
-	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
-	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
-	rm /tmp/build/var/lib/dokku/core-plugins/common.mk
-	$(MAKE) help2man
-	$(MAKE) addman
-	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1
-	gzip -9 /tmp/build/usr/share/man/man1/dokku.1
-	cp contrib/dokku-installer.py /tmp/build/usr/share/dokku/contrib
-ifeq ($(DOKKU_VERSION),master)
-	git describe --tags > /tmp/build/var/lib/dokku/VERSION
-else
-	echo $(DOKKU_VERSION) > /tmp/build/var/lib/dokku/VERSION
-endif
-	cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION
+	cat /tmp/build-dokku/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build-dokku/var/lib/dokku/STABLE_VERSION
 ifneq (,$(findstring false,$(IS_RELEASE)))
-	sed -i.bak -e "s/^/`date +%s`:/" /tmp/build/var/lib/dokku/STABLE_VERSION && rm /tmp/build/var/lib/dokku/STABLE_VERSION.bak
+	sed -i.bak -e "s/^/`date +%s`:/" /tmp/build-dokku/var/lib/dokku/STABLE_VERSION && rm /tmp/build-dokku/var/lib/dokku/STABLE_VERSION.bak
 endif
-	rm -f /tmp/build/DEBIAN/lintian-overrides
-	cp debian/lintian-overrides /tmp/build/usr/share/lintian/overrides/dokku
-ifdef DOKKU_GIT_REV
-	echo "$(DOKKU_GIT_REV)" > /tmp/build/var/lib/dokku/GIT_REV
-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 "$(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"
+
+	cp -r debian /tmp/build-dokku/DEBIAN
+	rm -f /tmp/build-dokku/DEBIAN/lintian-overrides
+	cp debian/lintian-overrides /tmp/build-dokku/usr/share/lintian/overrides/dokku
+	sed -i.bak "s/^Version: .*/Version: `cat /tmp/build-dokku/var/lib/dokku/STABLE_VERSION`/g" /tmp/build-dokku/DEBIAN/control && rm /tmp/build-dokku/DEBIAN/control.bak
+	dpkg-deb --build /tmp/build-dokku "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
+	lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build-dokku/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb"
 
 deb-dokku-update:
 	rm -rf /tmp/dokku-update*.deb dokku-update*.deb
@@ -175,53 +117,6 @@ deb-dokku-update:
 			 contrib/dokku-update=/usr/local/bin/dokku-update \
 			 contrib/dokku-update-version=/var/lib/dokku-update/VERSION
 
-deb-plugn:
-	rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME)
-	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin
-
-	@echo "-> Downloading package"
-	wget -q -O /tmp/tmp/plugn-$(PLUGN_VERSION).tgz $(PLUGN_URL)
-	cd /tmp/tmp/ && tar zxf /tmp/tmp/plugn-$(PLUGN_VERSION).tgz
-
-	@echo "-> Copying files into place"
-	cp /tmp/tmp/plugn /tmp/build/usr/bin/plugn && chmod +x /tmp/build/usr/bin/plugn
-
-	@echo "-> Creating $(PLUGN_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n plugn \
-			 --version $(PLUGN_VERSION) \
-			 --architecture $(PLUGN_ARCHITECTURE) \
-			 --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' \
-			 .
-
-deb-sshcommand:
-	rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME)
-	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin
-
-	@echo "-> Downloading package"
-	wget -q -O /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) $(SSHCOMMAND_URL)
-
-	@echo "-> Copying files into place"
-	mkdir -p "/tmp/build/usr/local/bin"
-	cp /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) /tmp/build/usr/local/bin/sshcommand
-	chmod +x /tmp/build/usr/local/bin/sshcommand
-
-	@echo "-> Creating $(SSHCOMMAND_PACKAGE_NAME)"
-	sudo fpm -t deb -s dir -C /tmp/build -n sshcommand \
-			 --version $(SSHCOMMAND_VERSION) \
-			 --architecture $(SSHCOMMAND_ARCHITECTURE) \
-			 --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' \
-			 .
-
 deb-sigil:
 	rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME)
 	mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin

debian/control

@@ -1,11 +1,11 @@
 Package: dokku
-Version: 0.14.2
+Version: 0.20.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.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
+Depends: locales, git, cpio, curl, man-db, netcat, sshcommand (>= 0.10.0), gliderlabs-sigil, docker-engine-cs (>= 1.13.0) | docker-engine (>= 1.13.0) | docker-io (>= 1.13.0) | docker.io (>= 1.13.0) | docker-ce (>= 1.13.0) | docker-ee (>= 1.13.0), net-tools, software-properties-common, procfile-util, python-software-properties | python3-software-properties, rsyslog, dos2unix, jq
+Recommends: herokuish (>= 0.3.4), parallel, dokku-update, dokku-event-listener
+Pre-Depends: nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn (>= 0.3.0), sudo, python3, debconf
 Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
 Description: Docker-powered PaaS that helps build and manage the lifecycle of applications
  Dokku is an extensible, open source Platform as a Service

debian/lintian-overrides

@@ -1,5 +1,5 @@
-dokku: command-with-path-in-maintainer-script postinst:16 /usr/bin/sshcommand
-dokku: maintainer-script-calls-systemctl postinst:87
+dokku: command-with-path-in-maintainer-script postinst:22 /usr/bin/sshcommand
+dokku: maintainer-script-calls-systemctl postinst:98
 dokku: changelog-file-missing-in-native-package
 dokku: statically-linked-binary
 dokku: unstripped-binary-or-object
@@ -10,3 +10,6 @@ dokku: hardening-no-relro
 
 # Built golang binaries link to libc
 dokku: missing-dependency-on-libc
+
+# Temporary python dependency until #2247 is resolved
+dokku: python-script-but-no-python-dep usr/share/dokku/contrib/dokku-installer.py

debian/postinst

@@ -26,6 +26,124 @@ call-sshcommand() {
   fi
 }
 
+setup-user() {
+  echo "Setting up dokku user"
+  call-sshcommand create dokku /usr/bin/dokku
+  grep -i -E "^docker" /etc/group || groupadd docker
+  usermod -aG docker dokku
+  mkdir -p "$DOKKU_ROOT/.ssh" "$DOKKU_ROOT/.dokkurc"
+  touch "$DOKKU_ROOT/.ssh/authorized_keys"
+  chown -R dokku:dokku "$DOKKU_ROOT/.ssh" "${DOKKU_ROOT}/.dokkurc"
+}
+
+setup-storage() {
+  echo "Setting up storage directories"
+  mkdir -p "${DOKKU_LIB_ROOT}/data" "${DOKKU_LIB_ROOT}/data/storage"
+  chown dokku:dokku "${DOKKU_LIB_ROOT}/data"
+}
+
+setup-plugins() {
+  echo "Setting up plugin directories"
+  # should be replaced by `plugn init`
+  mkdir -p "${DOKKU_LIB_ROOT}/core-plugins/available" "${DOKKU_LIB_ROOT}/plugins/available"
+  mkdir -p "${DOKKU_LIB_ROOT}/core-plugins/enabled" "${DOKKU_LIB_ROOT}/plugins/enabled"
+  touch "${DOKKU_LIB_ROOT}/core-plugins/config.toml" "${DOKKU_LIB_ROOT}/plugins/config.toml"
+
+  echo "Migrating old plugins"
+  find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
+    if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
+      continue
+    elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
+      rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
+    elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
+      mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available
+    fi
+  done
+
+  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 [ "$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
+  done
+  find -L "${DOKKU_LIB_ROOT}" -type l -delete
+  chown dokku:dokku -R "${DOKKU_LIB_ROOT}/plugins" "${DOKKU_LIB_ROOT}/core-plugins"
+
+  echo "Install all core plugins"
+  dokku plugin:install --core
+}
+
+setup-sshcommand() {
+  echo "Ensure proper sshcommand path"
+  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"
+  fi
+}
+
+setup-dokku-installer() {
+  NGINX_ROOT="/etc/nginx"
+  [[ -x /usr/bin/openresty ]] && NGINX_ROOT="/usr/local/openresty/nginx/conf"
+
+  if command -v "python3" &>/dev/null; then
+    sed -i '1 s/^.*$/#!\/usr\/bin\/env python3/' /usr/share/dokku/contrib/dokku-installer.py
+  elif command -v "python2.7" &>/dev/null; then
+    sed -i '1 s/^.*$/#!\/usr\/bin\/env python2.7/' /usr/share/dokku/contrib/dokku-installer.py
+  fi
+
+  if [[ -f "$NGINX_ROOT/conf.d/dokku-installer.conf" ]]; then
+    echo "Setting up dokku-installer"
+    /usr/share/dokku/contrib/dokku-installer.py onboot
+
+    if command -v systemctl &>/dev/null; then
+      echo "Enabling dokku-installer"
+      systemctl enable dokku-installer
+    fi
+
+    installer_status="$(service dokku-installer status 2>/dev/null || true)"
+    if echo $installer_status | grep -Eq "(inactive|waiting)" >/dev/null; then
+      echo "Starting dokku-installer"
+      service dokku-installer start || echo "Unable to start dokku-installer"
+    fi
+  fi
+}
+
+dpkg-handling() {
+  db_get "dokku/web_config"
+  if [ "$RET" = "true" ]; then
+    db_stop
+    exit 0
+  fi
+
+  if [ -f "${DOKKU_ROOT}/VHOST" ]; then
+    echo "VHOST file detected, skipping modification"
+  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"
+    fi
+  fi
+
+  db_get "dokku/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
+    fi
+  fi
+}
+
 case "$1" in
   abort-upgrade | abort-remove | abort-deconfigure) ;;
 
@@ -33,103 +151,16 @@ case "$1" in
     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!"
-    call-sshcommand create dokku /usr/bin/dokku
-
-    egrep -i "^docker" /etc/group || groupadd docker
-    usermod -aG docker dokku
-
-    echo "Setting up storage directories"
-    mkdir -p ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
-    chown dokku:dokku ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
-
-    echo "Setting up plugin directories"
-    # should be replaced by `plugn init`
-    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/available ${DOKKU_LIB_ROOT}/plugins/available
-    mkdir -p ${DOKKU_LIB_ROOT}/core-plugins/enabled ${DOKKU_LIB_ROOT}/plugins/enabled
-    touch ${DOKKU_LIB_ROOT}/core-plugins/config.toml ${DOKKU_LIB_ROOT}/plugins/config.toml
-
-    echo "Migrating old plugins"
-    find ${DOKKU_LIB_ROOT}/plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read -r plugin; do
-      if [ "$plugin" = "available" ] || [ "$plugin" = "enabled" ]; then
-        continue
-      elif [ -f ${DOKKU_LIB_ROOT}/plugins/$plugin/.core ]; then
-        rm -rf ${DOKKU_LIB_ROOT}/plugins/$plugin
-      elif [ ! -d ${DOKKU_LIB_ROOT}/plugins/available/$plugin ]; then
-        mv ${DOKKU_LIB_ROOT}/plugins/$plugin ${DOKKU_LIB_ROOT}/plugins/available
-      fi
-    done
-
-    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 [ "$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
-    done
-    find -L ${DOKKU_LIB_ROOT} -type l -delete
-    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"
-    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"
+    if [[ -f /sbin/modprobe ]]; then
+      modprobe aufs || echo "WARNING: Restart server to finish installing dokku!"
     fi
 
-    echo "Install all core plugins"
-    dokku plugin:install --core
-
-    rm -f ${DOKKU_ROOT}/VERSION
-    cp ${DOKKU_LIB_ROOT}/STABLE_VERSION ${DOKKU_ROOT}/VERSION
-
-    if [[ -f /etc/nginx/conf.d/dokku-installer.conf ]]; then
-      echo "Setting up dokku-installer"
-      /usr/share/dokku/contrib/dokku-installer.py onboot
-
-      if command -v systemctl &>/dev/null; then
-        echo "Enabling dokku-installer"
-        systemctl enable dokku-installer
-      fi
-
-      installer_status="$(service dokku-installer status 2>/dev/null || true)"
-      if echo $installer_status | grep -Eq "(inactive|waiting)" >/dev/null; then
-        echo "Starting dokku-installer"
-        service dokku-installer start || echo "Unable to start dokku-installer"
-      fi
-    fi
-
-    db_get "dokku/web_config"
-    if [ "$RET" = "true" ]; then
-      db_stop
-      exit 0
-    fi
-
-    if [ -f "${DOKKU_ROOT}/VHOST" ]; then
-      echo "VHOST file detected, skipping modification"
-    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"
-      fi
-    fi
-
-    db_get "dokku/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
-      fi
-    fi
+    setup-user
+    setup-storage
+    setup-plugins
+    setup-sshcommand
+    setup-dokku-installer
+    dpkg-handling
     ;;
 
   *)

debian/postrm

@@ -28,6 +28,8 @@ main() {
   fi
 
   if [[ "$1" == "purge" ]]; then
+    rm -f /usr/local/openresty/nginx/conf/conf.d/dokku.conf
+    rm -f /usr/local/openresty/nginx/conf/conf.d/dokku-installer.conf
     rm -f /etc/nginx/conf.d/dokku.conf
     rm -f /etc/nginx/conf.d/dokku-installer.conf
     rm -f ${DOKKU_ROOT}/.dokkurc ${DOKKU_ROOT}/dokkurc ${DOKKU_ROOT}/tls

debian/preinst

@@ -7,51 +7,62 @@ if [[ -e /usr/share/debconf/confmodule ]]; then
   . /usr/share/debconf/confmodule
 fi
 
+setup_dokku_installer() {
+  NGINX_BASE_PATH="$1"
+  NGINX_INIT_NAME="$2"
+
+  NGINX_CONF="${NGINX_BASE_PATH}/conf.d/dokku-installer.conf"
+
+  rm -f $NGINX_CONF
+  touch $NGINX_CONF
+
+  {
+    echo 'upstream dokku-installer { server 127.0.0.1:2000; }'
+    echo 'server {'
+    echo '  listen      80;'
+    echo '  location    / {'
+    echo '    proxy_pass  http://dokku-installer;'
+    echo '  }'
+    echo '}'
+  } >>$NGINX_CONF
+
+  rm -f $NGINX_BASE_PATH/sites-enabled/*
+  DOKKU_DISTRO="$(
+    . /etc/os-release >/dev/null 2>&1 || true
+    echo "$ID"
+  )"
+  case "$DOKKU_DISTRO" in
+    debian)
+      /usr/sbin/invoke-rc.d "$NGINX_INIT_NAME" reload || /usr/sbin/invoke-rc.d "$NGINX_INIT_NAME" start
+      ;;
+    ubuntu)
+      if [[ -x /usr/bin/sv ]]; then
+        /usr/bin/sv reload "$NGINX_INIT_NAME" || /usr/bin/sv start "$NGINX_INIT_NAME"
+      else
+        "/etc/init.d/$NGINX_INIT_NAME" reload || "/etc/init.d/$NGINX_INIT_NAME" start
+      fi
+      ;;
+  esac
+}
+
 case "$1" in
   install)
     db_get "dokku/web_config"
     if [ "$RET" = "true" ]; then
-      NGINX_CONF="/etc/nginx/conf.d/dokku-installer.conf"
-
-      rm -f $NGINX_CONF
-      touch $NGINX_CONF
-
-      {
-        echo 'upstream dokku-installer { server 127.0.0.1:2000; }'
-        echo 'server {'
-        echo '  listen      80;'
-        echo '  location    / {'
-        echo '    proxy_pass  http://dokku-installer;'
-        echo '  }'
-        echo '}'
-      } >>$NGINX_CONF
-
-      rm -f /etc/nginx/sites-enabled/*
-      DOKKU_DISTRO="$(
-        . /etc/os-release >/dev/null 2>&1 || true
-        echo "$ID"
-      )"
-      case "$DOKKU_DISTRO" in
-        debian)
-          NGINX_INIT="/usr/sbin/invoke-rc.d"
-          "$NGINX_INIT" nginx reload || "$NGINX_INIT" nginx start
-          ;;
-        ubuntu)
-          NGINX_INIT="/etc/init.d/nginx"
-          "$NGINX_INIT" reload || "$NGINX_INIT" start
-          ;;
-      esac
-      exit 0
+      if [[ -x /usr/bin/openresty ]]; then
+        setup_dokku_installer "/usr/local/openresty/nginx/conf" "openresty"
+      else
+        setup_dokku_installer "/etc/nginx" "nginx"
+      fi
     fi
 
     db_get "dokku/skip_key_file"
     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."
+        echo "Error: keyfile '$RET' not found." >&2
+        echo "       To deploy, you will need to generate a keypair and add with 'dokku ssh-keys:add'." >&2
         db_reset "dokku/key_file"
-        exit 1
       fi
     fi
     ;;

docker/etc/cron.d/dokku-retire

@@ -0,0 +1,4 @@
+PATH=/usr/local/bin:/usr/bin:/bin
+SHELL=/bin/bash
+
+*/5 * * * * root /usr/bin/dokku ps:retire >> /var/log/dokku/retire.log 2>&1

docker/etc/logrotate.d/services

@@ -0,0 +1,9 @@
+/var/log/services/* {
+  daily
+  missingok
+  rotate 7
+  compress
+  delaycompress
+  notifempty
+  copytruncate
+}

docker/etc/my_init.d/10_dokku_init

@@ -0,0 +1,73 @@
+#!/bin/bash
+set -eo pipefail
+
+log-info() {
+  declare desc="Log info formatter"
+  echo "    $*" 1>&2
+}
+
+log-fail() {
+  declare desc="Log fail formatter"
+  echo "!   $*" 1>&2
+  exit 1
+}
+
+main() {
+  local NGINX_ROOT
+
+  if [[ ! -d /mnt/dokku ]]; then
+    log-info "Creating missing /mnt/dokku"
+    mkdir -p /mnt/dokku
+  fi
+
+  directories=("/etc/ssh" "/home/dokku" "/var/lib/dokku/config" "/var/lib/dokku/data")
+  for dir in "${directories[@]}"; do
+    if [[ ! -e "$dir" ]]; then
+      log-info "Copying ${dir} skel into place"
+      mkdir -p "/mnt/dokku${dir}"
+      rsync -a "/skel${dir}/" "${dir}/" || log-fail "Unable to copy ${dir} skel into place"
+    fi
+
+    # chown mount directories to "dokku:dokku"
+    if [[ "$dir" != "/etc/ssh" ]]; then
+      find "$dir" -print0 | xargs -0 chown -h dokku:dokku
+    fi
+  done
+
+  if [[ -f /mnt/dokku/plugin-list ]]; then
+    while read line; do
+      dokku plugin:install "$(echo "$line" | awk '{print $2}')" "$(echo "$line" | cut -d':' -f1)"
+    done </mnt/dokku/plugin-list
+  fi
+
+  if [[ -n "$DOKKU_HOSTNAME" ]]; then
+    echo "dokku dokku/hostname string $DOKKU_HOSTNAME" | debconf-set-selections
+    echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
+    dokku --quiet domains:set-global "$DOKKU_HOSTNAME"
+  fi
+
+  if [[ -x /usr/local/bin/docker ]]; then
+    mkdir -p /home/dokku/.dokkurc
+    echo "export DOCKER_BIN=/usr/local/bin/docker" >"/home/dokku/.dokkurc/DOCKER_BIN"
+  fi
+
+  NGINX_ROOT="/etc/nginx"
+  if [[ -x /usr/bin/openresty ]]; then
+    NGINX_ROOT="/usr/local/openresty/nginx/conf"
+    rm -rf /etc/runit/runsvdir/default/nginx
+  else
+    rm -rf /etc/runit/runsvdir/default/openresty
+  fi
+
+  if [[ ! -f "/mnt/dokku${NGINX_ROOT}/dhparam.pem" ]]; then
+    mkdir -p "/mnt/dokku${NGINX_ROOT}"
+    openssl dhparam -out "/mnt/dokku${NGINX_ROOT}/dhparam.pem" 2048
+  fi
+
+  mkdir -p "${NGINX_ROOT}/conf.d"
+  cp -f "/mnt/dokku${NGINX_ROOT}/dhparam.pem" "${NGINX_ROOT}/dhparam.pem"
+  chown root:root "${NGINX_ROOT}/dhparam.pem"
+  chown root:root "${NGINX_ROOT}/conf.d"
+}
+
+main "$@"

docker/etc/runit/runsvdir/default/dokku-restore/finish

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+exec >>/var/log/services/dokku-restore
+exec 2>&1
+
+if [[ "$1" -ne 0 ]]; then
+  echo "Error restoring dokku apps! Retrying in 30 seconds..."
+  exec sleep 30
+  exit 0
+fi
+
+echo "Done restoring dokku apps."
+exec sleep infinity
+
+exit 0

docker/etc/runit/runsvdir/default/dokku-restore/run

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+exec >>/var/log/services/dokku-restore
+exec 2>&1
+
+echo "Running dokku-restore"
+cd /tmp || exit 1
+
+exec dokku ps:restore

docker/etc/runit/runsvdir/default/nginx/run

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+exec >>/var/log/services/nginx
+exec 2>&1
+
+echo "Running nginx"
+exec /usr/sbin/nginx -c /etc/nginx/nginx.conf -g "daemon off;"

docker/etc/runit/runsvdir/default/openresty/run

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+exec >>/var/log/services/openresty
+exec 2>&1
+
+echo "Running openresty"
+exec /usr/bin/openresty -c /usr/local/openresty/nginx/conf/nginx.conf -g "daemon off;"

docker/etc/runit/runsvdir/default/rsyslog/run

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+exec >>/var/log/services/rsyslog
+exec 2>&1
+
+echo "Running rsyslog"
+exec /usr/sbin/rsyslogd -n

docker/etc/sudoers.d/dokku-docker

@@ -0,0 +1 @@
+dokku    ALL=NOPASSWD:SETENV:/usr/bin/docker

docker/usr/local/bin/docker

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $TRACE ]] && set -x
+
+main() {
+  declare desc="re-runs docker commands as sudo"
+  local DOCKER_BIN=""
+  if [[ -x "/usr/bin/docker" ]]; then
+    DOCKER_BIN="/usr/bin/docker"
+  fi
+
+  if [[ -z "$DOCKER_BIN" ]]; then
+    echo "!   No docker binary found" 1>&2
+    exit 1
+  fi
+
+  sudo -E "$DOCKER_BIN" "$@"
+}
+
+main "$@"

docker/usr/local/openresty/nginx/conf/nginx.conf

@@ -0,0 +1,30 @@
+user www-data;
+worker_processes auto;
+pid /run/openresty.pid;
+include /usr/local/openresty/nginx/conf/modules-enabled/*.conf;
+
+events {
+  worker_connections 768;
+}
+
+http {
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 65;
+  types_hash_max_size 2048;
+
+  include /usr/local/openresty/nginx/conf/mime.types;
+  default_type application/octet-stream;
+
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_prefer_server_ciphers on;
+
+  access_log /var/log/openresty/access.log;
+  error_log /var/log/openresty/error.log;
+
+  gzip on;
+
+  include /usr/local/openresty/nginx/conf/conf.d/*.conf;
+  include /usr/local/openresty/nginx/conf/sites-enabled/*;
+}

docs/advanced-usage/deployment-tasks.md

@@ -34,7 +34,7 @@ Each "phase" has different expectations and limitations:
 
 Please keep the above in mind when utilizing deployment tasks.
 
-> 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.
+> To execute commands on the host during a release phase, see the [plugin creation documentation](/docs/development/plugin-creation.md) docs for more information on building your own custom plugin.
 
 ## `app.json` deployment tasks
 
@@ -43,7 +43,7 @@ Dokku provides limited support for the `app.json` manifest from Heroku (document
 - `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`.
+For buildpack-based deployments, the location of the `app.json` file should be at the root of your repository. Dockerfile-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.
 

docs/advanced-usage/docker-options.md

@@ -6,6 +6,7 @@ Pass [options](https://docs.docker.com/engine/reference/run/) to Docker during D
 
 ```
 docker-options:add <app> <phase(s)> OPTION    # Add Docker option to app for phase (comma-separated phase list)
+docker-options:clear <app> [<phase(s)>...]    # Clear a docker options from application
 docker-options:remove <app> <phase(s)> OPTION # Remove Docker option from app for phase (comma-separated phase list)
 docker-options:report [<app>] [<flag>]        # Displays a docker options report for one or more apps
 ```
@@ -44,7 +45,38 @@ dokku docker-options:add node-js-app run "-v /var/log/node-js-app:/app/logs"
 dokku docker-options:remove node-js-app run "-v /var/log/node-js-app:/app/logs"
 ```
 
-### Displaying docker-options reports about an app
+### Clear all Docker options for an app
+
+Docker options can be removed for a specific app using the `docker-options:clear` command.
+
+```shell
+dokku docker-options:clear node-js-app
+```
+
+```
+-----> Clearing docker-options for node-js-app on all phases
+```
+
+One or more valid phases can also be specified. Phases are comma delimited, and specifying an invalid phase will result in an error.
+
+```shell
+dokku docker-options:clear node-js-app run
+```
+
+```
+-----> Clearing docker-options for node-js-app on phase run
+```
+
+```shell
+dokku docker-options:clear node-js-app build,run
+```
+
+```
+-----> Clearing docker-options for node-js-app on phase build
+-----> Clearing docker-options for node-js-app on phase run
+```
+
+### Displaying docker-options reports for an app
 
 > New as of 0.8.1
 
@@ -77,9 +109,9 @@ dokku docker-options:report node-js-app
 
 ```
 =====> node-js-app docker options information
-       Storage build mounts:
-       Storage deploy mounts: -v /var/log/node-js-app:/app/logs
-       Storage run mounts:  -v /var/log/node-js-app:/app/logs
+       Docker options build:
+       Docker options deploy: -v /var/log/node-js-app:/app/logs
+       Docker options run:  -v /var/log/node-js-app:/app/logs
 ```
 
 You can pass flags which will output only the value of the specific information you want. For example:
@@ -88,7 +120,6 @@ You can pass flags which will output only the value of the specific information
 dokku docker-options:report node-js-app --docker-options-build
 ```
 
-
 ## Advanced usage
 
 In your applications folder `/home/dokku/app_name` create a file called `DOCKER_OPTIONS_RUN` (or `DOCKER_OPTIONS_BUILD` or `DOCKER_OPTIONS_DEPLOY`).

docs/advanced-usage/persistent-storage.md

@@ -65,7 +65,7 @@ dokku storage:mount app-name /var/lib/dokku/data/storage/node-js-app:/app/storag
 
 You can mount one or more directories as desired by following the above pattern.
 
-### Displaying storage reports about an app
+### Displaying storage reports for an app
 
 > New as of 0.8.1
 
@@ -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, 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.
+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 [docker-local scheduler documentation](/docs/advanced-usage/schedulers/docker-local.md#disabling-chown-of-persistent-storage) docs for more information.

docs/advanced-usage/plugin-management.md

@@ -6,8 +6,10 @@
 plugin:disable <name>                    # Disable an installed plugin (third-party only)
 plugin:enable <name>                     # Enable a previously disabled plugin
 plugin:install [--core|git-url [--committish tag|branch|commit|--name custom-plugin-name]]           # Optionally download git-url (with custom tag/committish) & run install trigger for active plugins (or only core ones)
+plugin:installed <name>                  # Checks if a plugin is installed
 plugin:install-dependencies [--core]     # Run install-dependencies trigger for active plugins (or only core ones)
 plugin:list                              # Print active plugins
+plugin:trigger <args...>.                # Trigger an arbitrary plugin hook
 plugin:uninstall <name>                  # Uninstall a plugin (third-party only)
 plugin:update [name [committish]]        # Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
 ```
@@ -23,39 +25,49 @@ dokku plugins-install
 
 ## Usage
 
-You can list all installed plugins using the `plugin` command:
+You can list all installed plugins using the `plugin:list` command:
 
 ```shell
-dokku plugin
+dokku plugin:list
 ```
 
 ```
 plugn: dev
-  00_dokku-standard    0.14.2 enabled    dokku core standard plugin
-  20_events            0.14.2 enabled    dokku core events logging plugin
-  apps                 0.14.2 enabled    dokku core apps plugin
-  build-env            0.14.2 enabled    dokku core build-env plugin
-  certs                0.14.2 enabled    dokku core certificate management plugin
-  checks               0.14.2 enabled    dokku core checks plugin
-  common               0.14.2 enabled    dokku core common plugin
-  config               0.14.2 enabled    dokku core config plugin
-  docker-options       0.14.2 enabled    dokku core docker-options plugin
-  domains              0.14.2 enabled    dokku core domains plugin
-  enter                0.14.2 enabled    dokku core enter plugin
-  git                  0.14.2 enabled    dokku core git plugin
-  logs                 0.14.2 enabled    dokku core logs plugin
-  named-containers     0.14.2 enabled    dokku core named containers plugin
-  network              0.14.2 enabled    dokku core network plugin
-  nginx-vhosts         0.14.2 enabled    dokku core nginx-vhosts plugin
-  plugin               0.14.2 enabled    dokku core plugin plugin
-  proxy                0.14.2 enabled    dokku core proxy plugin
-  ps                   0.14.2 enabled    dokku core ps plugin
-  repo                 0.14.2 enabled    dokku core repo plugin
-  shell                0.14.2 enabled    dokku core shell plugin
-  ssh-keys             0.14.2 enabled    dokku core ssh-keys plugin
-  storage              0.14.2 enabled    dokku core storage plugin
-  tags                 0.14.2 enabled    dokku core tags plugin
-  tar                  0.14.2 enabled    dokku core tar plugin
+  00_dokku-standard    0.20.2 enabled    dokku core standard plugin
+  20_events            0.20.2 enabled    dokku core events logging plugin
+  app-json             0.20.2 enabled    dokku core app-json plugin
+  apps                 0.20.2 enabled    dokku core apps plugin
+  build-env            0.20.2 enabled    dokku core build-env plugin
+  buildpacks           0.20.2 enabled    dokku core buildpacks plugin
+  certs                0.20.2 enabled    dokku core certificate management plugin
+  checks               0.20.2 enabled    dokku core checks plugin
+  common               0.20.2 enabled    dokku core common plugin
+  config               0.20.2 enabled    dokku core config plugin
+  docker-options       0.20.2 enabled    dokku core docker-options plugin
+  domains              0.20.2 enabled    dokku core domains plugin
+  enter                0.20.2 enabled    dokku core enter plugin
+  git                  0.20.2 enabled    dokku core git plugin
+  logs                 0.20.2 enabled    dokku core logs plugin
+  network              0.20.2 enabled    dokku core network plugin
+  nginx-vhosts         0.20.2 enabled    dokku core nginx-vhosts plugin
+  plugin               0.20.2 enabled    dokku core plugin plugin
+  proxy                0.20.2 enabled    dokku core proxy plugin
+  ps                   0.20.2 enabled    dokku core ps plugin
+  repo                 0.20.2 enabled    dokku core repo plugin
+  resource             0.20.2 enabled    dokku core resource plugin
+  scheduler-docker-local 0.20.2 enabled    dokku core scheduler-docker-local plugin
+  shell                0.20.2 enabled    dokku core shell plugin
+  ssh-keys             0.20.2 enabled    dokku core ssh-keys plugin
+  storage              0.20.2 enabled    dokku core storage plugin
+  tags                 0.20.2 enabled    dokku core tags plugin
+  tar                  0.20.2 enabled    dokku core tar plugin
+  trace                0.20.2 enabled    dokku core trace plugin
+```
+
+You can check if a plugin has been installed via the `plugin:installed` command:
+
+```shell
+dokku plugin:installed postgres
 ```
 
 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/resource-management.md

@@ -0,0 +1,306 @@
+# Resource Management
+
+> New as of 0.15.0
+
+```
+resource:limit [--process-type <process-type>] [RESOURCE_OPTS...] <app>    # Limit resources for a given app/process-type combination
+resource:limit-clear [--process-type <process-type>] <app>                 # Limit resources for a given app/process-type combination
+resource:report [<app>] [<flag>]                                           # Displays a resource report for one or more apps
+resource:reserve [--process-type <process-type>] [RESOURCE_OPTS...] <app>  # Reserve resources for a given app/process-type combination
+resource:reserve-clear [--process-type <process-type>] <app>               # Reserve resources for a given app/process-type combination
+```
+
+The resource plugin is meant to allow users to limit or reserve resources for a given app/process-type combination.
+
+## Usage
+
+By default, Dokku allows unlimited resource access to apps deployed on a server. In some cases, it may be desirable to limit this on a per-app or per-process-type basis. The `resource` plugin allows management of both resource "limits" and resource "reservations", where each resource request type has specific meaning to the scheduler in use for a given app.
+
+> The meaning of a values and it's units are specific to the scheduler in use for a given app. If a scheduler does not support a given resource type combination, it will be ignored. All resource commands require an app rebuild or deploy in order to take effect.
+
+Valid resource options include:
+
+- `--cpu`
+- `--memory`
+- `--memory-swap`
+- `--network`
+- `--network-ingress`
+- `--network-egress`
+
+See the [Supported Resource Management Properties](/docs/advanced-usage/schedulers/docker-local.md#supported-resource-management-properties) section of the docker local scheduler documentation for more information on how each resource limit maps to Docker.
+
+Resource limits and reservations are applied only during the `run` and `deploy` phases of an application, and will not impact the `build` phase of an application.
+
+### Resource Limits
+
+When specified and supported, a resource limit will ensure that your app does not go _over_ the specified value. If this occurs, the underlying scheduler may either cap resource utilization, or it may decide to terminate and reschedule your process.
+
+Resource limits may be set via the `resource:limit` command:
+
+```shell
+dokku resource:limit --memory 100 node-js-app
+```
+
+```
+=====> Setting resource limits for node-js-app
+       memory: 100
+```
+
+Multiple resources can be limited in a single call:
+
+```shell
+dokku resource:limit --cpu 100 --memory 100 node-js-app
+```
+
+```
+=====> Setting resource limits for node-js-app
+       cpu: 100
+       memory: 100
+```
+
+Resources can also be limited on a per-process type basis. If specified, this will override any generic limits set for the app.
+
+```shell
+dokku resource:limit --cpu 100 --memory 100 --process-type worker node-js-app
+```
+
+```
+=====> Setting resource limits for node-js-app (worker)
+       cpu: 100
+       memory: 100
+```
+
+#### Displaying Resource Limits
+
+Running the `resource:limit` command without any flags will display the currently configured default app limits.
+
+```shell
+dokku resource:limit node-js-app
+```
+
+```
+=====> resource limits node-js-app information [defaults]
+       cpu:
+       memory:
+       memory-swap: 100
+       network: 100
+       network-ingress:
+       network-egress:
+```
+
+This may also be combined with the `--process-type` flag to see app limits on a process-type level. Note that the displayed values are not merged with the defaults.
+
+
+```shell
+dokku resource:limit --process-type web node-js-app
+```
+
+```
+=====> resource limits node-js-app information (web)
+       cpu: 100
+       memory: 100
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
+```
+
+#### Clearing Resource Limits
+
+In cases where the values are incorrect - or there is no desire to limit resources - resource limits may be cleared using the `resource:limit-clear` command.
+
+```shell
+dokku resource:limit-clear node-js-app
+```
+
+```
+-----> Clearing resource limit for node-js-app
+```
+
+Defaults can also be cleared by leaving the app unspecified.
+
+```shell
+dokku resource:limit-clear
+```
+
+```
+-----> Clearing default resource limits
+```
+
+### Resource Reservations
+
+When specified and supported, a resource reservation will ensure that your server has _at least_ the specified resources before placing a given app's process. If there a resource exhaustion, future rebuilds and deploys may fail.
+
+Resource reservations may be set via the `resource:reserve` command:
+
+```shell
+dokku resource:reserve --memory 100 node-js-app
+```
+
+```
+=====> Setting resource reservation for node-js-app
+       memory: 100
+```
+
+Multiple resources can be limited in a single call:
+
+```shell
+dokku resource:reserve --cpu 100 --memory 100 node-js-app
+```
+
+```
+=====> Setting resource reservation for node-js-app
+       cpu: 100
+       memory: 100
+```
+
+Resources can also be limited on a per-process type basis. If specified, this will override any generic limits set for the app.
+
+```shell
+dokku resource:reserve --cpu 100 --memory 100 --process-type worker node-js-app
+```
+
+```
+=====> Setting resource reservation for node-js-app (worker)
+       cpu: 100
+       memory: 100
+```
+
+#### Displaying Resource Reservations
+
+Running the `resource:reserve` command without any flags will display the currently configured default app reservations.
+
+```shell
+dokku resource:reserve node-js-app
+```
+
+```
+=====> resource reservation node-js-app information [defaults]
+       cpu: 100
+       memory: 100
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
+```
+
+This may also be combined with the `--process-type` flag to see app reservations on a process-type level. Note that the displayed values are not merged with the defaults.
+
+```shell
+dokku resource:reserve --process-type web node-js-app
+```
+
+```
+=====> resource reservation node-js-app information (web)
+       cpu: 100
+       memory: 100
+       memory-swap:
+       network:
+       network-ingress:
+       network-egress:
+```
+
+#### Clearing Resource Reservations
+
+In cases where the values are incorrect - or there is no desire to reserve resources - resource reservations may be cleared using the `resource:reserve-clear` command.
+
+```shell
+dokku resource:reserve-clear node-js-app
+```
+
+```
+-----> Clearing resource reservation for node-js-app
+```
+
+Defaults can also be cleared by leaving the app unspecified.
+
+```shell
+dokku resource:reserve-clear
+```
+
+```
+-----> Clearing default resource reservation
+```
+
+### Displaying resource reports for an app
+
+You can get a report about the app's resource status using the `resource:report` command:
+
+```shell
+dokku resource:report
+```
+
+```
+=====> node-js-app resource information
+       web limit cpu:
+       web limit memory: 1024
+       web limit memory swap: 0
+       web limit network: 10
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory: 512
+       web reservation memory swap:
+       web reservation network: 8
+       web reservation network ingress:
+       web reservation network egress:
+=====> python-sample resource information
+       web limit cpu:
+       web limit memory:
+       web limit memory swap:
+       web limit network:
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory:
+       web reservation memory swap:
+       web reservation network:
+       web reservation network ingress:
+       web reservation network egress:
+=====> ruby-sample resource information
+       web limit cpu:
+       web limit memory:
+       web limit memory swap:
+       web limit network:
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory:
+       web reservation memory swap:
+       web reservation network:
+       web reservation network ingress:
+       web reservation network egress:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku resource:report node-js-app
+```
+
+```
+=====> node-js-app resource information
+       web limit cpu:
+       web limit memory: 1024
+       web limit memory swap: 0
+       web limit network: 10
+       web limit network ingress:
+       web limit network egress:
+       web reservation cpu:
+       web reservation memory: 512
+       web reservation memory swap:
+       web reservation network: 8
+       web reservation network ingress:
+       web reservation network egress:
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+# Note the periods in the flag name
+dokku resource:report node-js-app --resource-web.limit.memory
+```
+
+```
+1024
+```

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

@@ -43,13 +43,36 @@ This plugin implements various functionality through `plugn` triggers to integra
 
 - `check-deploy`
 - `core-post-deploy`
+- `post-app-clone-setup`
+- `post-create`
 - `post-delete`
 - `pre-deploy`
 - `pre-restore`
 - `scheduler-deploy`
 - `scheduler-docker-cleanup`
+- `scheduler-inspect`
 - `scheduler-logs-failed`
+- `scheduler-logs`
+- `scheduler-retire`
 - `scheduler-run`
 - `scheduler-stop`
 - `scheduler-tags-create`
 - `scheduler-tags-destroy`
+
+## Supported Resource Management Properties
+
+The `docker-local` scheduler supports a minimal list of resource _limits_ and _reservations_. The following properties are supported:
+
+### Resource Limits
+
+- cpu: (docker option: `--cpus`), and is specified in number of CPUs a process can access.
+  - See the ["CPU" section](https://docs.docker.com/config/containers/resource_constraints/#cpu) of the Docker Runtime Options documentation for more information.
+- memory: (docker option: `--memory`) and should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes).
+  - See the ["Memory" section](https://docs.docker.com/config/containers/resource_constraints/#memory) of the Docker Runtime Options documentation for more information.
+- memory-swap: (docker option: `--memory-swap`) and should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes)
+  - See the ["Memory" section](https://docs.docker.com/config/containers/resource_constraints/#memory) of the Docker Runtime Options documentation for more information.
+
+### Resource Reservations
+
+- memory: (docker option: `--memory-reservation`) and should be specified with a suffix of `b` (bytes), `k` (kilobytes), `m` (megabytes), `g` (gigabytes)
+  - See the ["Memory" section](https://docs.docker.com/config/containers/resource_constraints/#memory) of the Docker Runtime Options documentation for more information.

docs/appendices/0.20.0-migration-guide.md

@@ -0,0 +1,84 @@
+# 0.20.0 Migration Guide
+
+## Removals
+
+### Command removals
+
+The following commands were previously deprecated and were removed in this release.
+
+- `apps`: Use `apps:list` instead.
+- `certs`: Use `certs:report` instead.
+- `certs:info`: Use `certs:report` instead.
+- `checks`: Use `checks:report` instead.
+- `docker-options`: Use `docker-options:report` instead.
+- `domains`: Use `domains:report` instead.
+- `plugin`: Use `plugin:list` instead.
+- `proxy`: Use `proxy:report` instead.
+- `trace`: Use `trace:on` or `trace:off` instead.
+- `ps`: Use `enter` with a container ID instead to run `ps auxww` within a container.
+
+The refactor of the proxy plugin removes the following functions from being sourced in plugins:
+
+- `proxy#get_app_proxy_port_map()`
+- `proxy#list_app_proxy_ports()`
+- `proxy#filter_app_proxy_ports()`
+- `proxy#add_proxy_ports()`
+- `proxy#remove_proxy_ports()`
+- `proxy#set_proxy_ports()`
+
+The informal policy is to allow removal of functions within a `functions` file if they are not used in OSS plugins. Should you be affected by any such removals, please file an issue to expose the functionality via a plugin trigger.
+
+### Remove support for Unsupported Operating Systems
+
+Dokku will no longer distribute packages for Ubuntu versions that have reached either End of Life or End of Standard Support (for LTS releases). This currently includes the following releases:
+
+- Ubuntu 14.04 (trusty)
+- Ubuntu 14.10 (utopic)
+- Ubuntu 15.04 (vivid)
+- Ubuntu 15.10 (wily)
+- Ubuntu 16.10 (yakkety)
+- Ubuntu 17.04 (zesty)
+- Ubuntu 17.10 (artful)
+
+Dokku will no longer distribute packages for Debian versions that are not `stable` or `oldstable`. This currently includes the following releases:
+
+- Debian 7 (wheezy)
+- Debian 8 (jessie)
+
+### App report flags
+
+The `--git-sha` flag was moved from the `apps:report` command to the `git:report` command.
+
+## Changes
+
+### App report flags
+
+The following changes on the `apps:report` command were made in this release:
+
+- The `--deploy-source` flag was renamed to `--app-deploy-source`.
+- The `--locked` flag was renamed to `--app-locked`.
+
+### Network report flags
+
+The following changes on the `network:report` command were made in this release:
+
+- The `--network-listeners` flag was renamed to `--network-web-listeners`.
+
+### Plugin Triggers
+
+- The `network-get-port` trigger was incorrectly documented to have the `isHerokuishContainer` argument as the third argument. The code has been fixed to respect the documentation.
+- The `network-get-listeners` trigger now takes an additional `processType` argument. If not specified, it defaults to `web`. This default will be removed in an upcoming release.
+
+## Deprecations
+
+- `nginx:show-conf` has been deprecated in favor of `nginx:show-config`.
+- `proxy#is_app_proxy_enabled()` is deprecated in favor of `plugn trigger proxy-is-enabled`.
+- `proxy#get_app_proxy_type()` is deprecated in favor of `plugn trigger proxy-type`.
+- `apps#apps_create()` is deprecated in favor of `plugn trigger app-create`.
+- `apps#apps_destroy()` is deprecated in favor of `plugn trigger app-destroy`.
+- `apps#apps_exists()` is deprecated in favor of `plugn trigger app-exists`.
+- `apps#apps_maybe_create()` is deprecated in favor of `plugn trigger app-maybe-create`.
+- `plugin trigger network-get-listeners` usage without a second `processType` argument is deprecated.
+- `.NGINX_PORT` variable usage within `nginx.conf.sigil` templates is deprecated in favor of `.PROXY_PORT`.
+- `.NGINX_SSL_PORT` variable usage within `nginx.conf.sigil` templates is deprecated in favor of `.PROXY_SSL_PORT`.
+- `.DOKKU_APP_LISTENERS` variable usage within `nginx.conf.sigil` templates is deprecated in favor of `.DOKKU_APP_WEB_LISTENERS`.

docs/assets/favicons/browserconfig.xml

@@ -2,10 +2,10 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-70x70.png"/>
-      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-150x150.png"/>
-      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-310x310.png"/>
-      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-310x150.png"/>
+      <square70x70logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/mstile-70x70.png"/>
+      <square150x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/mstile-150x150.png"/>
+      <square310x310logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/mstile-310x310.png"/>
+      <wide310x150logo src="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.14.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.20.2\/docs\/assets\/favicons\/android-chrome-36x36.png",
             "sizes": "36x36",
             "type": "image\/png",
             "density": "0.75"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.20.2\/docs\/assets\/favicons\/android-chrome-48x48.png",
             "sizes": "48x48",
             "type": "image\/png",
             "density": "1.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.20.2\/docs\/assets\/favicons\/android-chrome-72x72.png",
             "sizes": "72x72",
             "type": "image\/png",
             "density": "1.5"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.20.2\/docs\/assets\/favicons\/android-chrome-96x96.png",
             "sizes": "96x96",
             "type": "image\/png",
             "density": "2.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.20.2\/docs\/assets\/favicons\/android-chrome-144x144.png",
             "sizes": "144x144",
             "type": "image\/png",
             "density": "3.0"
         },
         {
-            "src": "https:\/\/cdn.rawgit.com\/progrium\/dokku\/v0.14.2\/docs\/assets\/favicons\/android-chrome-192x192.png",
+            "src": "https:\/\/cdn.jsdelivr.net\/dokku\/dokku@v0.20.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.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/dokku.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/dokku.png);
   text-indent: 40px;
 }
 .blurb {
   color: #424242;
   background-color: #ededed;
-  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/gplaypattern.png);
+  background-image: url(https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/gplaypattern.png);
   padding: 45px 0;
   text-align: center;
 }

docs/assets/versions.json

@@ -1,16 +1,22 @@
 {
   "max-versions": [
-    "0.3.26", 
-    "0.4.14", 
-    "0.5.8", 
-    "0.6.5", 
-    "0.7.2", 
-    "0.8.2", 
-    "0.9.4", 
-    "0.10.5", 
-    "0.11.6", 
-    "0.12.13", 
-    "0.13.4", 
-    "0.14.2"
+    "0.3.26",
+    "0.4.14",
+    "0.5.8",
+    "0.6.5",
+    "0.7.2",
+    "0.8.2",
+    "0.9.4",
+    "0.10.5",
+    "0.11.6",
+    "0.12.13",
+    "0.13.4",
+    "0.14.6",
+    "0.15.5",
+    "0.16.4",
+    "0.17.9",
+    "0.18.5",
+    "0.19.13",
+    "0.20.2"
   ]
 }

docs/community/clients.md

@@ -6,9 +6,21 @@ While Dokku does not yet have an official client, there are a multitude of ways
 
 ## (bash, zsh, etc.) `dokku_client.sh`
 
-Of all methods, this is the *most* official method of interacting with your Dokku installation. It is a bash script that interacts with a remote Dokku installation via ssh. It is available in `contrib/dokku_client.sh` in the root of the Dokku repository.
+Of all methods, this is the *most* official method of interacting with your Dokku installation. It is a bash script that interacts with a remote Dokku installation via `ssh`. It is available in `contrib/dokku_client.sh` in the root of the Dokku repository.
 
-To install, simply clone the Dokku repository down and add the `dokku` alias pointing at the script:
+It can be installed either via the [Homebrew](https://brew.sh) package manager (macOS only), or manually.
+
+### Installation via Homebrew
+
+To install, simply run the following command:
+
+```shell
+brew install dokku/repo/dokku
+```
+
+### Manual installation
+
+To install manually, simply clone the Dokku repository down and add the `dokku` alias pointing at the script:
 
 ```shell
 git clone git@github.com:dokku/dokku.git ~/.dokku
@@ -35,6 +47,8 @@ alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
 alias dokku 'bash $HOME/.dokku/contrib/dokku_client.sh'
 ```
 
+### Usage
+
 Configure the `DOKKU_HOST` environment variable or run `dokku` from a repository with a git remote named `dokku` pointed at your Dokku host in order to use the script as normal.
 
 You can also configure a `DOKKU_PORT` environment variable if you are running ssh on a non-standard port. This defaults to `22`.
@@ -51,7 +65,7 @@ See [documentation here](https://www.npmjs.com/package/dokku-toolbelt) for more
 
 ## (python) dokku-client
 
-dokku-client is an extensible python-based cli wrapper for remote Dokku hosts.  You can install it via the following shell command (assuming you have python and pip installed):
+dokku-client is an extensible python-based cli wrapper for remote Dokku hosts. You can install it via the following shell command (assuming you have python and pip installed):
 
 ```shell
 pip install dokku-client

docs/community/plugins.md

@@ -57,6 +57,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 [Aluxian]: https://github.com/Aluxian
 [Aomitayo]: https://github.com/Aomitayo
 [apmorton]: https://github.com/apmorton
+[artofrawr]: https://github.com/artofrawr
 [basgys]: https://github.com/basgys
 [Benjamin-Dobell]: https://github.com/Benjamin-Dobell
 [blag]: https://github.com/blag
@@ -71,7 +72,6 @@ The following plugins are available and provided by Dokku maintainers. Where not
 [dokku]: https://github.com/dokku
 [dokku-community]: https://github.com/dokku-community
 [dyson]: https://github.com/dyson
-[F4-Group]: https://github.com/F4-Group
 [fermuch]: https://github.com/fermuch
 [fgrehm]: https://github.com/fgrehm
 [Flink]: https://github.com/Flink
@@ -126,6 +126,9 @@ The following plugins are available and provided by Dokku maintainers. Where not
 [Zenedith]: https://github.com/Zenedith
 [fteychene]: https://github.com/fteychene
 [sarendsen]: https://github.com/sarendsen
+[baikunz]: https://github.com/baikunz
+[lazyatom]: https://github.com/lazyatom
+[ollej]: https://github.com/ollej
 
 ### Datastores
 
@@ -165,6 +168,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 | [FakeSNS](https://github.com/cu12/dokku-fake_sns)                                                 | [cu12][]              | 0.5.0+                |
 | [InfluxDB](https://github.com/basgys/dokku-influxdb)                                              | [basgys][]            | 0.4.x                 |
 | [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 0.3.x                 |
+| [Headless Chrome](https://github.com/lazyatom/dokku-chrome)                                       | [lazyatom][]          | 0.8.1+                |
 
 [dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709
 [c77cbf1]: https://github.com/dokku/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
@@ -194,6 +198,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 | [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>3</sup>            | [cedricziel][]        | 0.4.0+                |
 | [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>4</sup>                   | [cedricziel][]        | 0.3.x                 |
 | [Application build hook](https://github.com/fteychene/dokku-build-hook)                           | [fteychene][]         | 0.4.0+                 |
+| [Post Deploy Script](https://github.com/baikunz/dokku-post-deploy-script)                         | [baikunz][]           | 0.4.0+                 |
 
 [217d00a]: https://github.com/dokku/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
 
@@ -210,7 +215,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 | Plugin                                                                                            | Author                | Compatibility         |
 | ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
 | [Airbrake deploy](https://github.com/Flink/dokku-airbrake-deploy)                                 | [Flink][]             | 0.4.0+                |
-| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          | 0.4.0+                |
+| [APT](https://github.com/dokku-community/dokku-apt)                                               | [dokku-community][]   | 0.18.x+               |
 | [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] | 0.3.x                 |
 | [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        | 0.3.x                 |
 | [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin)                            | [gdi2290][]           | 0.3.x                 |
@@ -225,6 +230,7 @@ The following plugins are available and provided by Dokku maintainers. Where not
 | [Long Timeout](https://github.com/investtools/dokku-long-timeout-plugin)                          | [investtools][]       | 0.4.0+                |
 | [Monit](https://github.com/cjblomqvist/dokku-monit)                                               | [cjblomqvist][]       | 0.3.x                 |
 | [Monorepo](https://github.com/iamale/dokku-monorepo)                                              | [iamale][]            | 0.4.0+                |
+| [Multi Dockerfile](https://github.com/artofrawr/dokku-multi-dockerfile)                           | [artofrawr][]         | 0.4.0+                |
 | [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            | 0.3.x                 |
 | [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         | 0.3.x                 |
 | [Rollbar](https://github.com/iloveitaly/dokku-rollbar)                                            | [iloveitaly][]        | 0.5.0+                |
@@ -236,6 +242,9 @@ The following plugins are available and provided by Dokku maintainers. Where not
 | [Wkhtmltopdf](https://github.com/mbriskar/dokku-wkhtmltopdf)                                      | [mbriskar][]          | 0.4.0+                |
 | [Dokku Wordpress](https://github.com/dokku-community/dokku-wordpress)                             | [dokku-community][]      | 0.4.0+                |
 | [Access](https://github.com/mainto/dokku-access)                                                  | [mainto](https://github.com/mainto)            | 0.4.0+                |
+| [Dokku Nginx Trust Proxy](https://github.com/kingsquare/dokku-nginx-vhost-trustproxy)             | [kingsquare](https://github.com/kingsquare)  | 0.4.0+ |
+| [Fonts](https://github.com/ollej/dokku-fonts)             | [ollej]  | 0.19.11+ |
+
 
 ### Deprecated Plugins
 

docs/community/tutorials/deploying-with-gitlab-ci.md

@@ -65,7 +65,7 @@ review_app:
   image: ilyasemenov/gitlab-ci-git-push
   stage: deploy
   environment:
-    name: review/$CI_ENVIRONMENT_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     url: https://$CI_ENVIRONMENT_SLUG.dokku.me/
     on_stop: stop_review_app
   only:
@@ -87,8 +87,10 @@ The above only runs for non-master branches, and will _also_ trigger an `on_stop
 stop_review_app:
   image: ilyasemenov/gitlab-ci-git-push
   stage: deploy
+  variables:
+    GIT_STRATEGY: none
   environment:
-    name: review/$CI_ENVIRONMENT_SLUG
+    name: review/$CI_COMMIT_REF_NAME
     action: stop
   when: manual
   script:

docs/configuration/domains.md

@@ -6,11 +6,12 @@
 domains:add <app> <domain> [<domain> ...]      # Add domains to app
 domains:add-global <domain> [<domain> ...]     # Add global domain names
 domains:clear <app>                            # Clear all domains for app
+domains:clear-global                           # Clear global domain names
 domains:disable <app>                          # Disable VHOST support
 domains:enable <app>                           # Enable VHOST support
 domains:remove <app> <domain> [<domain> ...]   # Remove domains from app
 domains:remove-global <domain> [<domain> ...]  # Remove global domain names
-domains:report [<app>] [<flag>]                # Displays a domains report for one or more apps
+domains:report [<app>|--global] [<flag>]       # Displays a domains report for one or more apps
 domains:set <app> <domain> [<domain> ...]      # Set domains for app
 domains:set-global <domain> [<domain> ...]     # Set global domain names
 ```
@@ -27,21 +28,10 @@ scheme://subdomain.domain.tld
 
 The `subdomain` is inferred from the pushed application name, while the `domain.tld` is set during initial dokku configuration. It can then be modified with `dokku domains:add-global` and `dokku domains:remove-global`. This value is used as a default TLD for all applications on a host.
 
-If a FQDN such as `other.tld` is used as the application name, the global virtualhost will be ignored and the resulting vhost URL for that application will be `other.tld`. The exception to this rule being that if the FQDN has the same ending as the default vhost (such as `subdomain.domain.tld`), then the entire FQDN will be treated as a subdomain. The application will therefore be deployed at `subdomain.domain.tld.domain.tld`.
+If an FQDN such as `dokku.org` is used as the application name, the global virtualhost will be ignored and the resulting vhost URL for that application will be `dokku.org`.
 
-You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. For example, you can reverse the subdomain with the following sample `nginx-hostname` plugin trigger:
+You can optionally override this in a plugin by implementing the `nginx-hostname` plugin trigger. If the `nginx-hostname` plugin has no output, the normal hostname algorithm will be executed. See the [plugin trigger documentation](/docs/development/plugin-triggers.md#nginx-hostname) for more information.
 
-```shell
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-APP="$1"; SUBDOMAIN="$2"; VHOST="$3"
-
-NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
-echo "$NEW_SUBDOMAIN.$VHOST"
-```
-
-If the `nginx-hostname` plugin has no output, the normal hostname algorithm will be executed.
 
 ## Disabling VHOSTS
 
@@ -63,7 +53,7 @@ The domains plugin allows you to specify custom domains for applications. This p
 dokku domains:add node-js-app dokku.me
 
 # list custom domains for app
-dokku domains node-js-app
+dokku domains:report node-js-app
 
 # clear all custom domains for app
 dokku domains:clear node-js-app
@@ -75,7 +65,7 @@ dokku domains:remove node-js-app dokku.me
 dokku domains:set node-js-app dokku.me dokku.org
 ```
 
-## Displaying domains reports about an app
+## Displaying domains reports for an app
 
 > New as of 0.8.1
 
@@ -88,17 +78,17 @@ dokku domains:report
 ```
 =====> node-js-app domains information
        Domains app enabled: true
-       Domains app vhosts:  ruby-sample.dokku.org
+       Domains app vhosts:  node-js-app.dokku.org
        Domains global enabled: true
        Domains global vhosts: dokku.org
-=====> python-sample domains information
+=====> python-app domains information
        Domains app enabled: true
-       Domains app vhosts:  ruby-sample.dokku.org
+       Domains app vhosts:  python-app.dokku.org
        Domains global enabled: true
        Domains global vhosts: dokku.org
-=====> ruby-sample domains information
+=====> ruby-app domains information
        Domains app enabled: true
-       Domains app vhosts:  ruby-sample.dokku.org
+       Domains app vhosts:  ruby-app.dokku.org
        Domains global enabled: true
        Domains global vhosts: dokku.org
 ```
@@ -132,6 +122,8 @@ Create the file at `/etc/nginx/conf.d/00-default-vhost.conf`:
 ```nginx
 server {
     listen 80 default_server;
+    listen [::]:80 default_server;
+
     server_name _;
     access_log off;
     return 410;
@@ -148,6 +140,7 @@ server {
 #
 # server {
 #     listen 443 ssl;
+#     listen [::]:443 ssl;
 #     server_name _;
 #     ssl_certificate /etc/nginx/ssl/cert.crt;
 #     ssl_certificate_key /etc/nginx/ssl/cert.key;

docs/configuration/environment-variables.md

@@ -6,12 +6,13 @@ The `config` plugin provides the following commands to manage your variables:
 
 ```
 config (<app>|--global)                                                               Pretty-print an app or global environment
+config:bundle (<app>|--global) [--merged]                                             Bundle environment into tarfile
+config:clear (<app>|--global)                                                         Clears environment variables
+config:export (<app>|--global) [--envfile]                                            Export a global or app environment
 config:get (<app>|--global) KEY                                                       Display a global or app-specific config value
+config:keys (<app>|--global) [--merged]                                               Show keys set in environment
 config:set [--encoded] [--no-restart] (<app>|--global) KEY1=VALUE1 [KEY2=VALUE2 ...]  Set one or more config vars
 config:unset [--no-restart] (<app>|--global) KEY1 [KEY2 ...]                          Unset one or more config vars
-config:export (<app>|--global) [--envfile]                                            Export a global or app environment
-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).
 
@@ -89,10 +90,11 @@ The following list config variables have special meaning and can be set in a var
 | `DOKKU_EVENTS_LOGFILE`         | `$DOKKU_LOGS_DIR/events.log`    | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | Where the events log file is written to. |
 | `DOKKU_APP_NAME`               | none                            | `--app APP` flag                                                                                                                                 | Name of application to work on. Respected by core plugins. |
 | `DOKKU_APPS_FORCE_DELETE`      | none                            | `--force` flag                                                                                                                                   | Whether to force delete an application. Also used by other plugins for destructive actions. |
+| `DOKKU_CHECKS_URL`             | `http://dokku.viewdocs.io/dokku/deployment/zero-downtime-deploys/` | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                        | Url displayed during deployment when no CHECKS file exists. |
 | `DOKKU_DETACH_CONTAINER`       | none                            | `--detach` flag                                                                                                                                  | Whether to detach a container started via `dokku run`. |
 | `DOKKU_QUIET_OUTPUT`           | none                            | `--quiet` flag                                                                                                                                   | Silences certain header output for `dokku` commands. |
 | `DOKKU_RM_CONTAINER`           | none                            | `dokku config:set` <br /> `--rm-container` flag <br /> `--rm` flag                                                                               | Whether to keep `dokku run` containers around or not. |
-| `DOKKU_TRACE`                  | none                            | `dokku trace on`   <br /> `dokku trace false` <br /> `--trace` flag                                                                              | Turn on very verbose debugging. |
+| `DOKKU_TRACE`                  | none                            | `dokku trace:on`   <br /> `dokku trace:off` <br /> `--trace` flag                                                                              | Turn on very verbose debugging. |
 | `DOKKU_APP_PROXY_TYPE`         | `nginx`                         | `dokku proxy:set`                                                                                                                                | |
 | `DOKKU_APP_RESTORE`            | `1`                             | `dokku config:set` <br /> `dokku ps:stop`                                                                                                        | |
 | `DOKKU_APP_SHELL`              | `/bin/bash`                     | `dokku config:set`                                                                                                                               | Allows users to change the default shell used by Dokku for `dokku enter` and execution of deployment tasks. |
@@ -113,13 +115,15 @@ The following list config variables have special meaning and can be set in a var
 | `DOKKU_DOCKERFILE_ENTRYPOINT`  | dockerfile entrypoint           | `dokku config:set`                                                                                                                               | |
 | `DOKKU_DOCKERFILE_PORTS`       | dockerfile ports                | `dokku config:set`                                                                                                                               | |
 | `DOKKU_DOCKERFILE_START_CMD`   | none                            | `dokku config:set`                                                                                                                               | |
-| `DOKKU_PROXY_PORT`             | automatically assigned          | `dokku config:set`                                                                                                                               | |
-| `DOKKU_PROXY_SSL_PORT`         | automatically assigned          | `dokku config:set`                                                                                                                               | |
+| `DOKKU_PARALLEL_ARGUMENTS`.    | none                            | `dokku config:set`                                                                                                                               | Allows passing custom arguments to parallel for `ps:*all` commands |
+| `DOKKU_PROXY_PORT`             | automatically assigned          | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*` <br /> `dokku config:set`                                                 | |
+| `DOKKU_PROXY_SSL_PORT`         | automatically assigned          | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*` <br /> `dokku config:set`                                                 | |
 | `DOKKU_PROXY_PORT_MAP`         | automatically assigned          | `dokku proxy:ports-add` <br /> `dokku proxy:ports-remove`, `dokku proxy:ports-clear`                                                             | |
 | `DOKKU_SKIP_ALL_CHECKS`        | none                            | `dokku config:set`                                                                                                                               | |
 | `DOKKU_SKIP_CLEANUP`           |                                 | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | When a deploy is triggered, if this is set to a non-empty value, then old docker containers and images will not be removed. |
 | `DOKKU_SKIP_DEFAULT_CHECKS`    |                                 | `dokku config:set`                                                                                                                               | |
 | `DOKKU_SKIP_DEPLOY`            |                                 | `dokku config:set`                                                                                                                               | |
+| `DOKKU_START_CMD`              | none                            | `dokku config:set`                                                                                                                               | Command to run instead of `/start $PROC_TYPE` |
 | `DOKKU_SYSTEM_GROUP`           | `dokku`                         | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | System group to chown files as. |
 | `DOKKU_SYSTEM_USER`            | `dokku`                         | `/etc/environment` <br /> `~dokku/.dokkurc` <br /> `~dokku/.dokkurc/*`                                                                           | System user to chown files as. |
 | `DOKKU_WAIT_TO_RETIRE`         | `60`                            | `dokku config:set`                                                                                                                               | After a successful deploy, the grace period given to old containers before they are stopped/terminated. This is useful for ensuring completion of long-running http connections. |

docs/configuration/nginx.md

@@ -6,9 +6,54 @@ 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
+nginx:report [<app>] [<flag>]            # Displays a nginx report for one or more apps
+nginx:set <app> <property> (<value>)     # Set or clear an nginx property for an app
+nginx:show-config <app>                  # Display app nginx config
+nginx:validate-config [<app>] [--clean]  # Validates and optionally cleans up invalid nginx configurations
 ```
 
+## Binding to specific addresses
+
+> New as of 0.19.2
+
+By default, nginx will listen to all interfaces (`[::]` for IPv6, `0.0.0.0` for IPv4) when proxying requests to applications. This may be changed using the `bind-address-ipv4` and `bind-address-ipv6` properties. This is useful in cases where the proxying should be internal to a network or if there are multiple network interfaces that should respond with different content.
+
+```shell
+dokku nginx:set node-js-app bind-address-ipv4 127.0.0.1
+dokku nginx:set node-js-app bind-address-ipv6 ::1
+```
+
+This may be reverted by setting an empty bind address.
+
+```shell
+dokku nginx:set node-js-app bind-address-ipv4
+dokku nginx:set node-js-app bind-address-ipv6
+```
+
+> Warning: Validation is not performed on either value.
+
+Users with apps that contain a custom `nginx.conf.sigil` file will need to modify the files to respect the new `NGINX_BIND_ADDRESS_IPV4` and `NGINX_BIND_ADDRESS_IPV6` variables.
+
+## HSTS Header
+
+> New as of 0.20.0
+
+If SSL certificates are present, HSTS will be automatically enabled. It can be toggled via `nginx:set`:
+
+```shell
+dokku nginx:set node-js-app hsts true
+dokku nginx:set node-js-app hsts false
+```
+
+The following options are also available via the `nginx:set` command:
+
+- `hsts` (type: boolean, default: `true`): Enables or disables HSTS for your application.
+- `hsts-include-subdomains` (type: boolean, default: `true`): Tells the browser that the HSTS policy also applies to all subdomains of the current domain.
+- `hsts-max-age` (type: integer, default: `15724800`): Time in seconds to cache HSTS configuration.
+- `hsts-preload` (type: boolean, default: `false`): Tells most major web browsers to include the domain in their HSTS preload lists.
+
+Beware that if you enable the header and a subsequent deploy of your application results in an HTTP deploy (for whatever reason), the way the header works means that a browser will not attempt to request the HTTP version of your site if the HTTPS version fails until the max-age is reached.
+
 ## 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`.
@@ -37,6 +82,31 @@ You may also follow the logs by specifying the `-t` flag.
 dokku nginx:error-logs node-js-app -t
 ```
 
+## Changing log path
+
+> New as of 0.20.1
+
+The path to where log files are stored can be changed by calling the `nginx:set` command with the following options:
+
+- `access-log-path` (type: string, default: `${NGINX_LOG_ROOT}/${APP}-access.log`): Log path for nginx access logs
+- `error-log-path` (type: string, default: `${NGINX_LOG_ROOT}/${APP}-error.log`): Log path for nginx error logs
+
+The defaults should not be changed without verifying that the paths will be writeable by nginx. However, this setting is useful for enabling or disabling logging by setting the values to `off`.
+
+```shell
+dokku nginx:set node-js-app access-log-path off
+dokku nginx:set node-js-app error-log-path off
+```
+
+The default value may be set by passing an empty value for the option:
+
+```shell
+dokku nginx:set node-js-app access-log-path
+dokku nginx:set node-js-app error-log-path
+```
+
+In all cases, the nginx config must be regenerated after setting the above values.
+
 ## 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.
@@ -45,28 +115,36 @@ In certain cases, your app nginx configs may drift from the correct config for y
 dokku nginx:build-config node-js-app
 ```
 
-## Validating nginx configs
+## Showing the nginx config
 
-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.
+For debugging purposes, it may be useful to show the nginx config. This can be achieved via the `nginx:show-config` command.
 
 ```shell
-dokku nginx:validate
+dokku nginx:show-config node-js-app
 ```
 
-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.
+## Validating nginx configs
 
-The `nginx:validate` command also takes an optional `--clean` flag. If specified, invalid nginx configs will be removed.
+It may be desired to validate an nginx config outside of the deployment process. To do so, run the `nginx:validate-config` 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-config
+```
+
+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-config` command is the exit code of `nginx -t` against the server's real nginx config.
+
+The `nginx:validate-config` 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
+dokku nginx:validate-config --clean
 ```
 
 The `--clean` flag may also be specified for a given app:
 
 ```shell
-dokku nginx:validate node-js-app --clean
+dokku nginx:validate-config node-js-app --clean
 ```
 
 ## Customizing the nginx configuration
@@ -90,7 +168,6 @@ Dokku uses a templating library by the name of [sigil](https://github.com/glider
 {{ .APP }}                          Application name
 {{ .APP_SSL_PATH }}                 Path to SSL certificate and key
 {{ .DOKKU_ROOT }}                   Global Dokku root directory (ex: app dir would be `{{ .DOKKU_ROOT }}/{{ .APP }}`)
-{{ .DOKKU_APP_LISTENERS }}          List of IP:PORT pairs of app containers
 {{ .PROXY_PORT }}                   Non-SSL nginx listener port (same as `DOKKU_PROXY_PORT` config var)
 {{ .PROXY_SSL_PORT }}               SSL nginx listener port (same as `DOKKU_PROXY_SSL_PORT` config var)
 {{ .NOSSL_SERVER_NAME }}            List of non-SSL VHOSTS
@@ -101,6 +178,8 @@ Dokku uses a templating library by the name of [sigil](https://github.com/glider
 {{ .SSL_SERVER_NAME }}              List of SSL VHOSTS
 ```
 
+Finally, each process type has it's network listeners - a list of IP:PORT pairs for the respective app containers - exposed via an `.DOKKU_APP_${PROCESS_TYPE}_LISTENERS` variable - the `PROCESS_TYPE` will be upper-cased with hyphens transformed into underscores. Users can use the new variables to expose non-web processes via the nginx proxy.
+
 > Note: Application config variables are available for use in custom templates. To do so, use the form of `{{ var "FOO" }}` to access a variable named `FOO`.
 
 ### Customizing via configuration files included by the default templates
@@ -166,10 +245,6 @@ See the [default site documentation](/docs/configuration/domains.md#default-site
 
 See the [load balancer documentation](/docs/configuration/ssl.md#running-behind-a-load-balancer).
 
-## HSTS Header
-
-See the [HSTS documentation](/docs/configuration/ssl.md#hsts-header).
-
 ## SSL Configuration
 
 See the [ssl documentation](/docs/configuration/ssl.md).

docs/configuration/ssl.md

@@ -56,7 +56,7 @@ If you decide to obtain a CA signed certificate, you can import that certificate
 
 The `certs:remove` command only works on app-specific certificates. It will `rm` the app-specific tls directory, rebuild the nginx configuration, and reload nginx.
 
-### Displaying certificate reports about an app
+### Displaying certificate reports for an app
 
 > New as of 0.8.1
 
@@ -67,17 +67,17 @@ dokku certs:report
 ```
 
 ```
-=====> node-js-sample
-       Ssl dir:             /home/dokku/node-js-sample/tls
+=====> node-js-app
+       Ssl dir:             /home/dokku/node-js-app/tls
        Ssl enabled:         true
-       Ssl hostnames:       *.node-js-sample.org node-js-sample.org
+       Ssl hostnames:       *.node-js-app.org node-js-app.org
        Ssl expires at:      Oct  5 23:59:59 2019 GMT
        Ssl issuer:          C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO RSA Domain Validation Secure Server CA
        Ssl starts at:       Oct  5 00:00:00 2016 GMT
-       Ssl subject:         OU=Domain Control Validated; OU=PositiveSSL Wildcard; CN=*.node-js-sample.org
+       Ssl subject:         OU=Domain Control Validated; OU=PositiveSSL Wildcard; CN=*.node-js-app.org
        Ssl verified:        self signed.
-=====> python-sample
-       Ssl dir:             /home/dokku/python-sample/tls
+=====> python-app
+       Ssl dir:             /home/dokku/python-app/tls
        Ssl enabled:         false
        Ssl hostnames:
        Ssl expires at:
@@ -90,12 +90,12 @@ dokku certs:report
 You can run the command for a specific app also.
 
 ```shell
-dokku certs:report node-js-sample
+dokku certs:report node-js-app
 ```
 
 ```
-=====> node-js-sample ssl information
-       Ssl dir:             /home/dokku/node-js-sample/tls
+=====> node-js-app ssl information
+       Ssl dir:             /home/dokku/node-js-app/tls
        Ssl enabled:         true
        Ssl hostnames:       *.dokku.org dokku.org
        Ssl expires at:      Oct  5 23:59:59 2019 GMT
@@ -108,14 +108,14 @@ dokku certs:report node-js-sample
 You can pass flags which will output only the value of the specific information you want. For example:
 
 ```shell
-dokku certs:report node-js-sample --ssl-enabled
+dokku certs:report node-js-app --ssl-enabled
 ```
 
 ## HSTS Header
 
-The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. Dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.
+The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. Dokku does not enables this header by default
 
-Beware that if you enable the header and a subsequent deploy of your application results in an HTTP deploy (for whatever reason), the way the header works means that a browser will not attempt to request the HTTP version of your site if the HTTPS version fails.
+See the [NGINX HSTS documentation](/docs/configuration/nginx.md#hsts-header) for more information.
 
 ## HTTP/2 support
 
@@ -125,7 +125,7 @@ Certain versions of nginx have bugs that prevent [HTTP/2](https://nginx.org/en/d
 
 Your application has access to the HTTP headers `X-Forwarded-Proto`, `X-Forwarded-Port` and `X-Forwarded-For`. These headers indicate the protocol of the original request (HTTP or HTTPS), the port number, and the IP address of the client making the request, respectively. The default configuration is for Nginx to set these headers.
 
-If your server runs behind an HTTP/S load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using the following [nginx custom template](/docs/configuration/nginx.md#customizing-the-nginx-configuration)
+If your server runs behind an HTTP(S) load balancer, then Nginx will see all requests as coming from the load balancer. If your load balancer sets the `X-Forwarded-` headers, you can tell Nginx to pass these headers from load balancer to your application by using a [custom nginx template](/docs/configuration/nginx.md#customizing-the-nginx-configuration). The following is a simple example of how to do so.
 
 ```go
 server {
@@ -139,7 +139,7 @@ server {
     proxy_pass  http://{{ .APP }};
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
+    proxy_set_header Connection $http_connection;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
     proxy_set_header X-Forwarded-For $http_x_forwarded_for;
@@ -150,7 +150,7 @@ server {
 }
 
 upstream {{ .APP }} {
-{{ range .DOKKU_APP_LISTENERS | split " " }}
+{{ range .DOKKU_APP_WEB_LISTENERS | split " " }}
   server {{ . }};
 {{ end }}
 }
@@ -160,7 +160,7 @@ Only use this option if:
 1. All requests are terminated at the load balancer, and forwarded to Nginx
 2. The load balancer is configured to send the `X-Forwarded-` headers (this may be off by default)
 
-If it's possible to make HTTP/S requests directly to Nginx, bypassing the load balancer, or if the load balancer is not configured to set these headers, then it becomes possible for a client to set these headers to arbitrary values.
+If it's possible to make HTTP(S) requests directly to Nginx, bypassing the load balancer, or if the load balancer is not configured to set these headers, then it becomes possible for a client to set these headers to arbitrary values.
 
 This could result in security issue, for example, if your application looks at the value of the `X-Forwarded-Proto` to determine if the request was made over HTTPS.
 

docs/deployment/application-deployment.md

@@ -1,30 +1,31 @@
 # Deploying to Dokku
 
-> Note: This document uses the hostname `dokku.me` in commands. For your server please
-> substitute your server's hostname instead.
+> Note: This walkthrough uses the hostname `dokku.me` in commands. When deploying to your own server, you should set the `DOKKU_DOMAIN` value in the `Vagrantfile` before you initialize the Vagrant VM.
 
 ## 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.
+Once you have configured Dokku with at least one user, you can deploy applications using `git push`. To quickly see Dokku deployment in action, try using [the Heroku Ruby on Rails "Getting Started" app](https://github.com/heroku/ruby-getting-started).
 
 ```shell
 # from your local machine
 # SSH access to github must be enabled on this host
-git clone git@github.com:heroku/ruby-rails-sample.git
+git clone https://github.com/heroku/ruby-getting-started
 ```
 
 ### Create the app
 
-Create the application on the Dokku host. You will need to ssh onto the host to run this command.
+SSH into the Dokku host and create the application as follows:
 
 ```shell
 # on the Dokku host
-dokku apps:create ruby-rails-sample
+dokku apps:create ruby-getting-started
 ```
 
 ### Create the backing services
 
-When you create a new app, Dokku by default *does not* provide any datastores such as MySQL or PostgreSQL. You will need to install plugins to handle that, but fortunately [Dokku has official plugins](/docs/community/plugins.md#official-plugins-beta) for common datastores. Our sample app requires a PostgreSQL service:
+Dokku by default **does not** provide datastores (e.g. MySQL, PostgreSQL) on a newly created app. You can add datastore support by installing plugins, and the Dokku project [provides official plugins](/docs/community/plugins.md#official-plugins-beta) for common datastores.
+
+The Getting Started app requires a PostgreSQL service, so install the plugin and create the related service as follows:
 
 ```shell
 # on the Dokku host
@@ -32,43 +33,45 @@ When you create a new app, Dokku by default *does not* provide any datastores su
 # plugin installation requires root, hence the user change
 sudo dokku plugin:install https://github.com/dokku/dokku-postgres.git
 
-# create a postgres service with the name rails-database
-dokku postgres:create rails-database
+# create a postgres service with the name railsdatabase
+dokku postgres:create railsdatabase
 ```
 
-> Each service may take a few moments to create.
+Each service may take a few moments to create.
 
 ### Linking backing services to applications
 
-Once the service creation is complete, set the `DATABASE_URL` environment variable by linking the service.
+Once the services have been created, you then set the `DATABASE_URL` environment variable by linking the service, as follows:
 
 ```shell
 # on the Dokku host
 # each official datastore offers a `link` method to link a service to any application
-dokku postgres:link rails-database ruby-rails-sample
+dokku postgres:link railsdatabase ruby-getting-started
 ```
 
-> You can link a single service to multiple applications or use one service per application.
+Dokku supports linking a single service to multiple applications as well as linking only one service per application.
 
 ### Deploy the app
 
-Now you can deploy the `ruby-rails-sample` app to your Dokku server. All you have to do is add a remote to name the app. Applications are created on-the-fly on the Dokku server.
+> Warning: Your app should respect the `PORT` environment variable, otherwise it may not respond to web requests. You can find more information in the [port management documentation](/docs/networking/port-management.md).**
+
+Now you can deploy the `ruby-getting-started` app to your Dokku server. All you have to do is add a remote to name the app. Applications are created on-the-fly on the Dokku server.
 
 ```shell
 # from your local machine
 # the remote username *must* be dokku or pushes will fail
-cd ruby-rails-sample
-git remote add dokku dokku@dokku.me:ruby-rails-sample
+cd ruby-getting-started
+git remote add dokku dokku@dokku.me:ruby-getting-started
 git push dokku master
 ```
 
 > Note: Some tools may not support the short-upstream syntax referenced above, and you may need to prefix
-> the upstream with the scheme `ssh://` like so: `ssh://dokku@dokku.me:ruby-rails-sample`
+> the upstream with the scheme `ssh://` like so: `ssh://dokku@dokku.me:ruby-getting-started`
 > 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>`.
+> Note: Your private key should be registered with `ssh-agent` in your local development environment. If you get a `permission denied` error when pushing, you can register your private key as follows: `ssh-add -k ~/<your private key>`.
+
+After running `git push dokku master`, you should have output similar to this in your terminal:
 
 ```
 Counting objects: 231, done.
@@ -77,7 +80,7 @@ Compressing objects: 100% (162/162), done.
 Writing objects: 100% (231/231), 36.96 KiB | 0 bytes/s, done.
 Total 231 (delta 93), reused 147 (delta 53)
 -----> Cleaning up...
------> Building ruby-rails-sample from herokuish...
+-----> Building ruby-getting-started from herokuish...
 -----> Adding BUILD_ENV to build environment...
 -----> Ruby app detected
 -----> Compiling Ruby/Rails
@@ -92,12 +95,12 @@ Total 231 (delta 93), reused 147 (delta 53)
 ...
 
 =====> Application deployed:
-       http://ruby-rails-sample.dokku.me
+       http://ruby-getting-started.dokku.me
 ```
 
-When the deploy finishes, the application's URL will be shown as seen above.
+Once the deploy is complete, the application's web URL will be generated as above.
 
-Dokku supports deploying applications via [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) with [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks) or using a project's [dockerfile](https://docs.docker.com/reference/builder/).
+Dokku supports deploying applications via [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) with [Herokuish](https://github.com/gliderlabs/herokuish#buildpacks), as well as by using a project's [Dockerfile](https://docs.docker.com/reference/builder/).
 
 
 ### Skipping deployment
@@ -106,23 +109,23 @@ If you only want to rebuild and tag a container, you can skip the deployment pha
 
 ``` shell
 # on the Dokku host
-dokku config:set ruby-rails-sample DOKKU_SKIP_DEPLOY=true
+dokku config:set ruby-getting-started DOKKU_SKIP_DEPLOY=true
 ```
 
-### Re-Deploying / restarting
+### Redeploying or restarting
 
-If you need to re-deploy (or restart) your app: 
+If you need to redeploy or restart your app: 
 
 ```shell
 # on the Dokku host
-dokku ps:rebuild ruby-rails-sample
+dokku ps:rebuild ruby-getting-started
 ```
 
 See the [process scaling documentation](/docs/deployment/process-management.md) for more information.
 
-### Deploying with private git submodules
+### Deploying with private Git submodules
 
-Dokku uses git locally (i.e. not a docker image) to build its own copy of your app repo, including submodules. This is done as the `dokku` user. Therefore, in order to deploy private git submodules, you'll need to drop your deploy key in `/home/dokku/.ssh/` and potentially add github.com (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. The following test should help confirm you've done it correctly.
+Dokku uses Git locally (i.e. not a Docker image) to build its own copy of your app repo, including submodules, as the `dokku` user. This means that in order to deploy private Git submodules, you need to put your deploy key in `/home/dokku/.ssh/` and potentially add `github.com` (or your VCS host key) into `/home/dokku/.ssh/known_hosts`. You can use the following test to confirm your setup is correct:
 
 ```shell
 # on the Dokku host
@@ -131,25 +134,25 @@ ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 ssh -T git@github.com
 ```
 
-Note that if the buildpack or dockerfile build process require ssh key access for other reasons, the above may not always apply.
+> Warning: if the buildpack or Dockerfile build process require SSH key access for other reasons, the above may not always apply.
 
 ## Deploying to subdomains
 
-The name of remote repository is used as the name of application to be deployed, as for example above:
+If you do not enter a fully qualified domain name when pushing your app, Dokku deploys the app to `<remotename>.yourdomain.tld` as follows:
 
 ```shell
 # from your local machine
 # the remote username *must* be dokku or pushes will fail
-git remote add dokku dokku@dokku.me:ruby-rails-sample
+git remote add dokku dokku@dokku.me:ruby-getting-started
 git push dokku master
 ```
 
 ```
 remote: -----> Application deployed:
-remote:        http://ruby-rails-sample.dokku.me
+remote:        http://ruby-getting-started.dokku.me
 ```
 
-You can also specify fully qualified names, say `app.dokku.me`, as
+You can also specify the fully qualified name as follows:
 
 ```shell
 # from your local machine
@@ -163,7 +166,7 @@ remote: -----> Application deployed:
 remote:        http://app.dokku.me
 ```
 
-This is in particular useful, then you want to deploy to root domain, as
+This is useful when you want to deploy to the root domain:
 
 ```shell
 # from your local machine
@@ -177,11 +180,11 @@ git push dokku master
     remote: -----> Application deployed:
     remote:        http://dokku.me
 
-## Dokku/Docker Container Management Compatibility
+## Dokku/Docker container management compatibility
 
-Dokku is, at its core, a docker container manager. Thus, it does not necessarily play well with other out-of-band processes interacting with the docker daemon. One thing to note as in [issue #1220](https://github.com/dokku/dokku/issues/1220), dokku executes a cleanup function prior to every deployment.
+Dokku is, at its core, a Docker container manager. Thus, it does not necessarily play well with other out-of-band processes interacting with the Docker daemon.
 
-As of 0.5.x, this function removes all containers with the label `dokku` where the status is either `dead` or `exited`, as well as all `dangling` images. Previous versions would remove `dead` or `exited` containers, regardless of their label.
+Prior to every deployment, Dokku will execute a cleanup function. As of 0.5.x, the cleanup removes all containers with the `dokku` label where the status is either `dead` or `exited` (previous versions would remove _all_ `dead` or `exited` containers). The cleanup function also removes all images with `dangling` status.
 
 ## Adding deploy users
 
@@ -193,11 +196,11 @@ See the [nginx documentation](/docs/configuration/nginx.md#default-site).
 
 ## Deploying non-master branch
 
-See the [git  documentation](/docs/deployment/methods/git.md#changing-the-deploy-branch).
+See the [Git documentation](/docs/deployment/methods/git.md#changing-the-deploy-branch).
 
 ## Dockerfile deployment
 
-See the [dockerfile documentation](/docs/deployment/methods/dockerfiles.md).
+See the [Dockerfile documentation](/docs/deployment/methods/dockerfiles.md).
 
 ## Image tagging
 

docs/deployment/application-management.md

@@ -17,7 +17,7 @@ apps:unlock <app>                              # Unlocks an app for deployment
 
 ## Usage
 
-### Listing Applications
+### Listing applications
 
 > New as of 0.8.1. Use the `apps` command for older versions.
 
@@ -33,7 +33,7 @@ node-js-app
 python-app
 ```
 
-Note that you can easily hide extra output from Dokku commands by using the `--quiet` flag, which makes it easier to parse on the command-line.
+Note that you can easily hide extra output from Dokku commands by using the `--quiet` flag, which makes it easier to parse on the command line.
 
 ```shell
 dokku --quiet apps:list
@@ -72,9 +72,9 @@ Creating node-js-app... done
 
 Once created, you can configure the application as normal, and deploy the application whenever ready. This is useful for cases where you may wish to do any of the following kinds of tasks:
 
-- configure domain names and ssl certificates
-- create and link datastores
-- set environment variables
+- Configure domain names and SSL certificates.
+- Create and link datastores.
+- Set environment variables.
 
 ### Removing a deployed app
 
@@ -103,7 +103,6 @@ dokku --force apps:destroy node-js-app
 Destroying node-js-app (including all add-ons)
 ```
 
-
 Destroying an application will unlink all linked services and destroy any config related to the application. Note that linked services will retain their data for later use (or removal).
 
 ### Renaming a deployed app
@@ -135,6 +134,12 @@ Renaming 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, delete your old app, then rebuild the new version of the app and deploy it. All of your config variables, including database urls, will be preserved.
 
+By default, Dokku will deploy the renamed app, though you can skip the deploy by using the `--skip-deploy` flag:
+
+```shell
+dokku apps:rename --skip-deploy node-js-app io-js-app
+```
+
 ### Cloning an existing app
 
 > New as of 0.11.5
@@ -149,17 +154,22 @@ 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. Custom domains and SSL certificates will not be copied to the new app.
+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 with the following caveats:
 
-> 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.
+- All of your environment variables, including database urls, will be preserved.
+- Custom domains are not applied to the new app.
+- SSL certificates will not be copied to the new app.
+- Port mappings with the scheme `https` and host-port `443` will be skipped.
 
-By default, Dokku will deploy this new application, though you can skip the deploy by using the `--skip-deploy` flag:
+> Warning: If you have exposed specific ports via `docker-options` plugin, or performed anything that cannot be done against multiple applications, `apps:clone` may result in errors.
+
+By default, Dokku will deploy this new app, though you can skip the deploy by using the `--skip-deploy` flag:
 
 ```shell
 dokku apps:clone --skip-deploy node-js-app io-js-app
 ```
 
-Finally, if the application already exists, you may wish to ignore errors resulting from attempting to clone over it. To do so, you can use the `--ignore-existing` flag. A warning will be emitted, but the command will return 0.
+Finally, if the application already exists, you may wish to ignore errors resulting from attempting to clone over it. To do so, you can use the `--ignore-existing` flag. A warning will be emitted, but the command will return `0`.
 
 ```shell
 dokku apps:clone --ignore-existing node-js-app io-js-app
@@ -186,7 +196,7 @@ dokku apps:lock node-js-app
 
 In some cases, it may be necessary to remove an existing deploy lock. This can be performed via the `apps:unlock` command.
 
-> Warning: Removing the deploy lock _will not_ stop in progress deploys. At this time, in progress deploys will need to be manually terminated by someone with server access.
+> Warning: Removing the deploy lock *will not* stop in progress deploys. At this time, in progress deploys will need to be manually terminated by someone with server access.
 
 ```shell
 dokku apps:unlock node-js-app
@@ -213,7 +223,7 @@ dokku apps:locked node-js-app
 Deploy lock does not exist
 ```
 
-### Displaying reports about an app
+### Displaying reports for an app
 
 > New as of 0.8.1
 
@@ -226,16 +236,14 @@ dokku apps:report
 ```
 =====> node-js-app
        App dir:             /home/dokku/node-js-app
-       Git sha:             dbddc3f
-       Deploy source:       git
-       Locked:              false
+       App deploy source:   git
+       App locked:          false
 =====> python-sample
 not deployed
 =====> ruby-sample
        App dir:             /home/dokku/ruby-sample
-       Git sha:             a2d477c
-       Deploy source:       git
-       Locked:              false
+       App deploy source:   git
+       App locked:          false
 ```
 
 You can run the command for a specific app also.
@@ -247,13 +255,12 @@ dokku apps:report node-js-app
 ```
 =====> node-js-app
        App dir:             /home/dokku/node-js-app
-       Git sha:             dbddc3f
-       Deploy source:       git
-       Locked:              false
+       App deploy source:   git
+       App locked:          false
 ```
 
 You can pass flags which will output only the value of the specific information you want. For example:
 
 ```shell
-dokku apps:report node-js-app --git-sha
+dokku apps:report node-js-app --app-dir
 ```

docs/deployment/logs.md

@@ -7,7 +7,7 @@ logs:failed [<app>]                              # Shows the last failed deploy
 
 ## Usage
 
-### App Logs
+### Application logs
 
 You can easily get logs of an app using the `logs` command:
 
@@ -31,11 +31,12 @@ 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
+### 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.
+> Warning: The default [docker-local scheduler](/docs/advanced-usage/schedulers/docker-local.md) 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.
 

docs/deployment/methods/buildpacks.md

@@ -1,13 +1,165 @@
 # Buildpack Deployment
 
-Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) for deployment, though this may be overridden by committing a valid `Dockerfile` to the root of your repository and pushing the repository to your Dokku installation. To avoid this automatic `Dockerfile` deployment detection, you may do one of the following:
+> Subcommands new as of 0.15.0
 
-- Use `dokku config:set` to set the `BUILDPACK_URL` environment variable.
-- Add `BUILDPACK_URL` to a committed `.env` file in the root of your repository.
-  - See the [environment variable documentation](/docs/configuration/environment-variables.md) for more details.
+```
+buildpacks:add [--index 1] <app> <buildpack>  # Add new app buildpack while inserting into list of buildpacks if necessary
+buildpacks:clear <app>                        # Clear all buildpacks set on the app
+buildpacks:list <app>                         # List all buildpacks for an app
+buildpacks:remove <app> <buildpack>           # Remove a buildpack set on the app
+buildpacks:report [<app>] [<flag>]            # Displays a buildpack report for one or more apps
+buildpacks:set [--index 1] <app> <buildpack>  # Set new app buildpack at a given position defaulting to the first buildpack if no index is specified
+```
+
+> Warning: If using the `buildpacks` plugin, be sure to unset any `BUILDPACK_URL` and remove any such entries from a committed `.env` file. A specified `BUILDPACK_URL` will always override a `.buildpacks` file or the buildpacks plugin.
+
+Dokku normally defaults to using [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) for deployment, though this may be overridden by committing a valid `Dockerfile` to the root of your repository and pushing the repository to your Dokku installation. To avoid this automatic `Dockerfile` deployment detection, you may do one of the following:
+
+- Set a `BUILDPACK_URL` environment variable
+  - This can be done via `dokku config:set` or via a committed `.env` file in the root of the repository. See the [environment variable documentation](/docs/configuration/environment-variables.md) for more details.
 - Create a `.buildpacks` file in the root of your repository.
+  - This can be via a committed `.buildpacks` file or managed via the `buildpacks` plugin commands.
 
-## Switching from Dockerfile deployments
+This page will cover usage of the `buildpacks` plugin.
+
+## Usage
+
+### Listing Buildpacks in Use
+
+The `buildpacks:list` command can be used to show buildpacks that have been set for an app. This will omit any auto-detected buildpacks.
+
+```shell
+# running for an app with no buildpacks specified
+dokku buildpacks:list node-js-app
+```
+
+```
+-----> test buildpack urls
+```
+
+
+```shell
+# running for an app with two buildpacks specified
+dokku buildpacks:list node-js-app
+```
+
+```
+-----> test buildpack urls
+       https://github.com/heroku/heroku-buildpack-python.git
+       https://github.com/heroku/heroku-buildpack-nodejs.git
+```
+
+### Adding custom buildpacks
+
+> Please check the documentation for your particular buildpack as you may need to include configuration files (such as a Procfile) in your project root.
+
+To add a custom buildpack, use the `buildpacks:add` command:
+
+```shell
+dokku buildpacks:add node-js-app https://github.com/heroku/heroku-buildpack-nodejs.git
+```
+
+When no buildpacks are currently specified, the specified buildpack will be the only one executed for detection and compilation.
+
+Multiple buildpacks may be specified by using the `buildpacks:add` command multiple times.
+
+```shell
+dokku buildpacks:add node-js-app https://github.com/heroku/heroku-buildpack-ruby.git
+dokku buildpacks:add node-js-app https://github.com/heroku/heroku-buildpack-nodejs.git
+```
+
+Buildpacks are executed in order, may be inserted at a specified index via the `--index` flag. This flag is specified starting at a 1-index value.
+
+```shell
+# will add the golang buildpack at the second position, bumping all proceeding ones by 1 position
+dokku buildpacks:add --index 2 node-js-app https://github.com/heroku/heroku-buildpack-golang.git
+```
+
+### Overwriting a buildpack position
+
+In some cases, it may be necessary to swap out a given buildpack. Rather than needing to re-specify each buildpack, the `buildpacks:set` command can be used to overwrite a buildpack at a given position.
+
+```shell
+dokku buildpacks:set node-js-app https://github.com/heroku/heroku-buildpack-ruby.git
+```
+
+By default, this will overwrite the _first_ buildpack specified. To specify an index, the `--index` flag may be used. This flag is specified starting at a 1-index value, and defaults to `1`.
+
+```shell
+# the following are equivalent commands
+dokku buildpacks:set node-js-app https://github.com/heroku/heroku-buildpack-ruby.git
+dokku buildpacks:set --index 1 node-js-app https://github.com/heroku/heroku-buildpack-ruby.git
+```
+
+If the index specified is larger than the number of buildpacks currently configured, the buildpack will be appended to the end of the list.
+
+```shell
+dokku buildpacks:set --index 99 node-js-app https://github.com/heroku/heroku-buildpack-ruby.git
+```
+
+### Removing a buildpack
+
+> At least one of a buildpack or index must be specified
+
+A single buildpack can be removed by name via the `buildpacks:remove` command.
+
+```shell
+dokku buildpacks:remove node-js-app https://github.com/heroku/heroku-buildpack-ruby.git
+```
+
+Buildpacks can also be removed by index via the `--index` flag. This flag is specified starting at a 1-index value.
+
+```shell
+dokku buildpacks:remove node-js-app --index 1
+```
+
+### Clearing all buildpacks
+
+> This does not affect automatically detected buildpacks, nor does it impact any specified `BUILDPACK_URL` environment variable.
+
+The `buildpacks:clear` command can be used to clear all configured buildpacks for a specified app.
+
+```shell
+dokku buildpacks:clear node-js-app
+```
+
+### Displaying buildpack reports for an app
+
+You can get a report about the app's buildpacks status using the `buildpacks:report` command:
+
+```shell
+dokku buildpacks:report
+```
+
+```
+=====> node-js-app buildpacks information
+       Buildpacks list:               https://github.com/heroku/heroku-buildpack-nodejs.git
+=====> python-sample buildpacks information
+       Buildpacks list:               https://github.com/heroku/heroku-buildpack-nodejs.git,https://github.com/heroku/heroku-buildpack-python.git
+=====> ruby-sample buildpacks information
+       Buildpacks list:
+```
+
+You can run the command for a specific app also.
+
+```shell
+dokku buildpacks:report node-js-app
+```
+
+```
+=====> node-js-app buildpacks information
+       Buildpacks list:               https://github.com/heroku/heroku-buildpack-nodejs.git
+```
+
+You can pass flags which will output only the value of the specific information you want. For example:
+
+```shell
+dokku buildpacks:report node-js-app --buildpacks-list
+```
+
+## Errata
+
+### Switching from Dockerfile deployments
 
 If an application was previously deployed via Dockerfile, the following commands should be run before a buildpack deploy will succeed:
 
@@ -15,54 +167,25 @@ If an application was previously deployed via Dockerfile, the following commands
 dokku config:unset --no-restart node-js-app DOKKU_DOCKERFILE_CMD DOKKU_DOCKERFILE_ENTRYPOINT DOKKU_PROXY_PORT_MAP
 ```
 
-## Specifying a custom buildpack
-
-In certain cases you may want to specify a custom buildpack. While Dokku uses herokuish to support all the [official heroku buildpacks](https://github.com/gliderlabs/herokuish#buildpacks), it is possible that the buildpack detection does not work well for your application. As well, you may wish to use a custom buildpack to handle specific application logic.
-
-To use a specific buildpack, you can run the following Dokku command:
-
-```shell
-# replace REPOSITORY_URL with your buildpack's url
-dokku config:set node-js-app BUILDPACK_URL=REPOSITORY_URL
-
-# example: using a specific ruby buildpack version
-dokku config:set node-js-app BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-ruby.git#v142
-```
-
-Please check the documentation for your particular buildpack as you may need to include configuration files (such as a Procfile) in your project root.
-
-## Using multiple buildpacks
-
-You can only set a single buildpack using the `BUILDPACK_URL`, though there may be times when you wish to use multiple buildpacks. To do so, simply create a `.buildpacks` file in the base of your repository. This file should list all the buildpacks, one-per-line. For instance, if you wish to use both the `nodejs` and `ruby` buildpacks, your `.buildpacks` file should contain the following:
-
-```shell
-https://github.com/heroku/heroku-buildpack-nodejs.git#v87
-https://github.com/heroku/heroku-buildpack-ruby.git#v142
-```
+### Using a specific buildpack version
 
 > Always remember to pin your buildpack versions when using the multi-buildpacks method, or you may find deploys changing your deployed environment.
 
-You may also choose to set just a single buildpack in this file, though that is up to you.
-
-Please check the documentation for your particular buildpack(s) as you may need to include configuration files (such as a Procfile) in your project root.
-
-## Using a specific buildpack version
-
-As Dokku pins all buildpacks via herokuish releases, there may be occasions where a local buildpack version is out of date. If you wish to use a more recent version of the buildpack, you may use any of the above methods to specify a buildpack **without** the git sha attached like so:
+By default, Dokku uses the [gliderlabs/herokuish](https://github.com/gliderlabs/herokuish/) project, which pins all of it's vendored buildpacks. There may be occasions where the pinned version results in a broken deploy, or does not have a particular feature that is required to build your project. To use a more recent version of a given buildpack, the buildpack may be specified *without* a Git commit SHA like so:
 
 ```shell
 # using the latest nodejs buildpack
-dokku config:set node-js-app BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs
+dokku buildpacks:set node-js-app https://github.com/heroku/heroku-buildpack-nodejs
 ```
 
-You may also wish to use a **specific** version of a buildpack, which is also simple
+This will use the latest commit on the `master` branch of the specified buildpack. To pin to a newer version of a buildpack, a sha may also be specified by using the form `REPOSITORY_URL#COMMIT_SHA`, where `COMMIT_SHA` is any tree-ish git object - usually a git tag.
 
 ```shell
 # using v87 of the nodejs buildpack
-dokku config:set node-js-app BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-nodejs#v87
+dokku buildpacks:set node-js-app https://github.com/heroku/heroku-buildpack-nodejs#v87
 ```
 
-## Specifying commands via Procfile
+### Specifying commands via Procfile
 
 While many buildpacks have a default command that is run when a detected repository is pushed, it is possible to override this command via a Procfile. A Procfile can also be used to specify multiple commands, each of which is subject to process scaling. See the [process scaling documentation](/docs/deployment/process-management.md) for more details around scaling individual processes.
 
@@ -87,17 +210,18 @@ importantworker:  env QUEUE=important bundle exec rake resque:work
 
 The `web` process type holds some significance in that it is the only process type that is automatically scaled to `1` on the initial application deploy. See the [process scaling documentation](/docs/deployment/process-management.md) for more details around scaling individual processes.
 
-## Curl Build Timeouts
 
-Certain buildpacks may time out in retrieving dependencies via curl. This can happen when your network connection is poor or if there is significant network congestion. You may see a message similar to `gzip: stdin: unexpected end of file` after a curl command.
+### `curl` build timeouts
 
-If you see output similar this when deploying , you may need to override the curl timeouts to increase the length of time allotted to those tasks. You can do so via the `config` plugin:
+Certain buildpacks may time out in retrieving dependencies via `curl`. This can happen when your network connection is poor or if there is significant network congestion. You may see a message similar to `gzip: stdin: unexpected end of file` after a `curl` command.
+
+If you see output similar this when deploying , you may need to override the `curl` timeouts to increase the length of time allotted to those tasks. You can do so via the `config` plugin:
 
 ```shell
 dokku config:set --global CURL_TIMEOUT=1200
 dokku config:set --global CURL_CONNECT_TIMEOUT=180
 ```
 
-## Clearing buildpack cache
+### Clearing buildpack cache
 
 See the [repository management documentation](/docs/advanced-usage/repository-management.md#clearing-app-cache).

docs/deployment/methods/dockerfiles.md

@@ -2,26 +2,26 @@
 
 > New as of 0.3.15
 
-While Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) for deployment, you can also use docker's native `Dockerfile` system to define a container.
+While Dokku normally defaults to using [Heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) for deployment, you can also use Docker's native `Dockerfile` system to define a container.
 
-> Dockerfile support is considered a **Power User** feature. By using Dockerfile-based deployment, you agree that you will not have the same comfort as that enjoyed by Buildpack users, and Dokku features may work differently. Differences between the two systems will be documented here.
+> Dockerfile support is considered a *power user* feature. By using Dockerfile-based deployment, you agree that you will not have the same comfort as that enjoyed by buildpack users, and Dokku features may work differently. Differences between the two systems will be documented here.
 
-To use a dockerfile for deployment, commit a valid `Dockerfile` to the root of your repository and push the repository to your Dokku installation. If this file is detected, Dokku will default to using it to construct containers **except** in the following two cases:
+To use a Dockerfile for deployment, commit a valid `Dockerfile` to the root of your repository and push the repository to your Dokku installation. If this file is detected, Dokku will default to using it to construct containers *except* in the following two cases:
 
 - The application has a `BUILDPACK_URL` environment variable set via the `dokku config:set` command or in a committed `.env` file. In this case, Dokku will use your specified buildpack.
 - The application has a `.buildpacks` file in the root of the repository. In this case, Dokku will use your specified buildpack(s).
 
-## Switching from Buildpack deployments
+## Switching from buildpack deployments
 
-If an application was previously deployed via Buildpacks, the following commands should be run before a Dockerfile deploy will succeed:
+If an application was previously deployed via buildpacks, the following commands should be run before a Dockerfile deploy will succeed:
 
 ```shell
 dokku config:unset --no-restart node-js-app DOKKU_PROXY_PORT_MAP 
 ```
 
-## Build-time Configuration Variables
+## Build-time configuration variables
 
-For security reasons - and as per [docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available only during runtime.
+For security reasons - and as per [Docker recommendations](https://github.com/docker/docker/issues/13490) - Dockerfile-based deploys have variables available only during runtime.
 
 For users that require customization in the `build` phase, you may use build arguments via the [docker-options plugin](docs/advanced-usage/docker-options.md):
 
@@ -29,10 +29,16 @@ For users that require customization in the `build` phase, you may use build arg
 dokku docker-options:add node-js-app build '--build-arg NODE_ENV=production'
 ```
 
+The location of the `Dockerfile` may also be specified. If the location is changed, the repository **must also** have a `Dockerfile` in the root directory in order to trigger a dockerfile-based deploy.
+
+```shell
+dokku docker-options:add node-js-app build '--file Dockerfile.dokku'
+```
+
 Once set, the Dockerfile usage would be as follows:
 
 ```Dockerfile
-FROM debian:jessie
+FROM ubuntu:18.04
 
 # set the argument default
 ARG NODE_ENV=production
@@ -44,7 +50,7 @@ RUN echo $NODE_ENV
 You may also set the argument as an environment variable
 
 ```Dockerfile
-FROM debian:jessie
+FROM ubuntu:18.04
 
 # set the argument default
 ARG NODE_ENV=production
@@ -61,7 +67,7 @@ RUN echo $NODE_ENV
 
 ## Customizing the run command
 
-By default no arguments are passed to `docker run` when deploying the container and the `CMD` or `ENTRYPOINT` defined in the `Dockerfile` are executed. You can take advantage of docker ability of overriding the `CMD` or passing parameters to your `ENTRYPOINT` setting `$DOKKU_DOCKERFILE_START_CMD`. Let's say for example you are deploying a base nodejs image, with the following `ENTRYPOINT`:
+By default no arguments are passed to `docker run` when deploying the container and the `CMD` or `ENTRYPOINT` defined in the `Dockerfile` are executed. You can take advantage of docker ability of overriding the `CMD` or passing parameters to your `ENTRYPOINT` setting `$DOKKU_DOCKERFILE_START_CMD`. Let's say for example you are deploying a base Node.js image, with the following `ENTRYPOINT`:
 
 ```Dockerfile
 ENTRYPOINT ["node"]
@@ -73,18 +79,17 @@ You can do:
 dokku config:set node-js-app DOKKU_DOCKERFILE_START_CMD="--harmony server.js"
 ```
 
-To tell docker what to run.
+To tell Docker what to run.
 
-Setting `$DOKKU_DOCKERFILE_CACHE_BUILD` to `true` or `false` will enable or disable docker's image layer cache. Lastly, for more granular build control, you may also pass any `docker build` option to `docker`, by setting `$DOKKU_DOCKER_BUILD_OPTS`.
+Setting `$DOKKU_DOCKERFILE_CACHE_BUILD` to `true` or `false` will enable or disable Docker's image layer cache. Lastly, for more granular build control, you may also pass any `docker build` option to `docker`, by setting `$DOKKU_DOCKER_BUILD_OPTS`.
 
-### Procfiles and Multiple Processes
+### Procfiles and multiple processes
 
 > New as of 0.5.0
 
 You can also customize the run command using a `Procfile`, much like you would on Heroku or
-with a buildpack deployed app. The `Procfile` should contain one or more lines defining [process
-types and associated commands](https://devcenter.heroku.com/articles/procfile#declaring-process-types).
-When you deploy your app a Docker image will be built, the `Procfile` will be extracted from the image
+with a buildpack deployed app. The `Procfile` should contain one or more lines defining [process types and associated commands](https://devcenter.heroku.com/articles/procfile#declaring-process-types).
+When you deploy your app, a Docker image will be built. The `Procfile` will be extracted from the image
 (it must be in the folder defined in your `Dockerfile` as `WORKDIR` or `/app`) and the commands
 in it will be passed to `docker run` to start your process(es). Here's an example `Procfile`:
 
@@ -96,7 +101,7 @@ worker: bin/run-worker.sh
 And `Dockerfile`:
 
 ```Dockerfile
-FROM debian:jessie
+FROM ubuntu:18.04
 WORKDIR /app
 COPY . ./
 CMD ["bin/run-dev.sh"]

docs/deployment/methods/git.md

@@ -1,4 +1,4 @@
-# GIT Deployment
+# Git Deployment
 
 > Subcommands new as of 0.12.0
 
@@ -8,11 +8,11 @@ git:report [<app>] [<flag>]              # Displays a git report for one or more
 git:set <app> <key> (<value>)            # Set or clear a git property for an app
 ```
 
-GIT-based deployment has been the traditional method of deploying applications in Dokku. As of v0.12.0, Dokku introduces a few ways to customize the experience of deploying via `git push`. A GIT-based deployment currently supports building applications via both [Buildpack](/docs/deployment/methods/buildpacks.md) and [Dockerfile](/docs/deployment/methods/dockerfiles.md). 
+Git-based deployment has been the traditional method of deploying applications in Dokku. As of v0.12.0, Dokku introduces a few ways to customize the experience of deploying via `git push`. A Git-based deployment currently supports building applications via both [Buildpack](/docs/deployment/methods/buildpacks.md) and [Dockerfile](/docs/deployment/methods/dockerfiles.md). 
 
 ## Usage
 
-### Initializing an Application
+### Initializing an application
 
 When an application is created via `git push`, Dokku will create the proper `pre-receive` hook in order to execute the build pipeline. In certain cases - such as when fronting deploys with the [`git-http-backend`](https://git-scm.com/docs/git-http-backend) - this may not be correctly created. As an alternative, the `git:initialize` command can be used to trigger this creation:
 
@@ -23,13 +23,13 @@ When an application is created via `git push`, Dokku will create the proper `pre
 dokku git:initialize node-js-app
 ```
 
-In order for the above command to succeed, the application _must_ already exist. 
+In order for the above command to succeed, the application *must* already exist. 
 
-> Warning: If the pre-receive hook was customized in any way, this will overwrite that hook with the current defaults for Dokku.
+> Warning: If the `pre-receive` hook was customized in any way, this will overwrite that hook with the current defaults for Dokku.
 
-### Changing the Deploy Branch
+### Changing the deploy branch
 
-By default, Dokku will deploy code pushed to the `master` branch. In order to quickly deploy a different local branch, the following GIT command can be used:
+By default, Dokku will deploy code pushed to the `master` branch. In order to quickly deploy a different local branch, the following Git command can be used:
 
 ```shell
 # on the local machine
@@ -53,11 +53,11 @@ dokku git:set node-js-app deploy-branch SOME_BRANCH_NAME
 
 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
+### Configuring the `GIT_REV` environment variable
 
 > New as of 0.12.0
 
-Application deployments will include a special `GIT_REV` environment variable containing the current deployment sha being deployed. For rebuilds, this sha will remain the same.
+Application deployments will include a special `GIT_REV` environment variable containing the current deployment sha being deployed. For rebuilds, this SHA will remain the same.
 
 To configure the name of the `GIT_REV` environment variable, run the `git:set` command as follows:
 
@@ -76,3 +76,28 @@ This behavior can be disabled entirely on a per-app basis by setting the `rev-en
 # override for a specific app
 dokku git:set node-js-app rev-env-var ""
 ```
+
+### Keeping the `.git` directory
+
+By default, Dokku will remove the contents of the `.git` before triggering a build for a given app. This is generally a safe default as shipping the entire source code history of your app in the deployed image artifact is unnecessary as it increases bloat and potentially can leak information if there are any security issues with your app code.
+
+To enable the `.git` directory, run the `git:set` command as follows:
+
+```shell
+# on the Dokku host
+
+# keep the .git directory during builds
+dokku git:set node-js-app keep-git-dir true
+```
+
+The default behavior is to delete this directory and it's contents. To revert to the default behavior, the `keep-git-dir` value can be set to either an empty string or `false`.
+
+```shell
+# on the Dokku host
+
+# delete the .git directory during builds (default)
+dokku git:set node-js-app keep-git-dir false
+
+# delete the .git directory during builds (default)
+dokku git:set node-js-app keep-git-dir ""
+```

docs/deployment/methods/images.md

@@ -9,14 +9,14 @@ tags:deploy <app> <tag>                        # Deploy tagged app image
 tags:destroy <app> <tag>                       # Remove app image tag
 ```
 
-The Dokku tags plugin allows you to add docker image tags to the currently deployed app image for versioning and subsequent deployment.
+The Dokku tags plugin allows you to add Docker image tags to the currently deployed app image for versioning and subsequent deployment.
 
 > When triggering `dokku ps:rebuild APP` on an application deployed via the `tags` plugin, the following may occur:
 >
 > - Applications previously deployed via another method (`git`/`tar`): The application may revert to a state before the latest custom image tag was deployed.
 > - Applications that were only ever deployed via the `tags` plugin: No action will be taken against your application.
 >
-> Please use the `tags:deploy` command when redeploying an application deployed via docker image.
+> Please use the `tags:deploy` command when redeploying an application deployed via Docker image.
 
 ## Usage
 
@@ -40,7 +40,7 @@ dokku/node-js-app   latest              936a42f25901        About a minute ago
 
 ### Creating a tag
 
-You can also create new tags for that app using the `tags:create` function. Tags should conform to the docker tagging specification for your docker version. As of 1.10, that specification is available [here](https://github.com/docker/docker/blob/master/image/spec/v1.1.md), while users of older versions can check the documentation [here](https://github.com/docker/docker/blob/master/image/spec/v1.md).
+You can also create new tags for that app using the `tags:create` function. Tags should conform to the Docker tagging specification for your Docker version. As of 1.10, that specification is available [here](https://github.com/docker/docker/blob/master/image/spec/v1.1.md), while users of older versions can check the documentation [here](https://github.com/docker/docker/blob/master/image/spec/v1.md).
 
 ```shell
 dokku tags:create node-js-app v1
@@ -67,7 +67,7 @@ dokku/node-js-app   v1                  936a42f25901        About a minute ago
 
 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.
+> 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
@@ -92,7 +92,6 @@ dokku tags:deploy node-js-app v1
 -----> Running post-deploy
 -----> Configuring node-js-app.dokku.me...
 -----> Creating http nginx.conf
------> Running nginx-pre-reload
        Reloading nginx
 -----> Shutting down old containers in 60 seconds
 =====> 025eec3fa3b442fded90933d58d8ed8422901f0449f5ea0c23d00515af5d3137
@@ -100,31 +99,31 @@ dokku tags:deploy node-js-app v1
        http://node-js-app.dokku.me
 ```
 
-## Image Workflows
+## Image workflows
 
-### Deploying from a Docker Registry
+### Deploying from a Docker registry
 
-You can alternatively add image pulled from a docker Registry and deploy app from it by using tagging feature. In this example, we are deploying from Docker Hub.
+You can alternatively add image pulled from a Docker registry and deploy from it by using tagging feature. In this example, we are deploying from Docker Hub.
 
-1. Create Dokku app as usual
+1. Create Dokku app as usual.
 
     ```shell
     dokku apps:create test-app
     ```
 
-2. Pull image from Docker Hub
+2. Pull image from Docker Hub.
 
     ```shell
     docker pull demo-repo/some-image:v12
     ```
 
-3. Retag the image to match the created app
+3. Retag the image to match the created app.
 
     ```shell
     docker tag demo-repo/some-image:v12 dokku/test-app:v12
     ```
 
-4. Deploy tag
+4. Deploy tag.
 
     ```shell
     dokku tags:deploy test-app v12
@@ -137,22 +136,22 @@ artifacts in your repository. For some projects however, building artifacts duri
 to Dokku may affect the performance of running applications.
 
 One solution is to build a finished Docker image on a CI service (or even locally) and deploy
-it directly to the host running dokku.
+it directly to the host running Dokku.
 
-1. Build image on CI (or locally)
+1. Build image on CI (or locally).
 
     ```shell
     docker build -t dokku/test-app:v12 .
     # Note: The image must be tagged `dokku/<app-name>:<version>`
     ```
 
-2. Deploy image to Dokku host
+2. Deploy image to Dokku host.
 
     ```shell
     docker save dokku/test-app:v12 | ssh my.dokku.host "docker load | dokku tags:deploy test-app v12"
     ```
 
-> Note: You can also use a Docker Registry to push and pull
+> Note: You can also use a Docker registry to push and pull
 > the image rather than uploading it directly.
 
 Here's a more complete example using the above method:
@@ -167,6 +166,6 @@ ssh my.dokku.host "dokku tags:create test-app previous; dokku tags:deploy test-a
 ```
 
 ## Related articles
-- [Setting up Persistent Storage](/docs/advanced-usage/persistent-storage.md)
-- [Defining Environment Variables](/docs/configuration/environment-variables.md)
-- [Setting up the Ports](/docs/advanced-usage/proxy-management.md)
+- [Setting up persistent storage](/docs/advanced-usage/persistent-storage.md)
+- [Defining environment variables](/docs/configuration/environment-variables.md)
+- [Setting up the ports](/docs/advanced-usage/proxy-management.md)

docs/deployment/methods/tar.md

@@ -18,7 +18,7 @@ tar:in <app>                                   # Reads an tarball containing the
 
 ### Deploying from a tarball
 
-In some cases, it may be useful to deploy an application from a tarball. For instance, if you implemented a non-git based deployment plugin, tarring the generated artifact may be an easier route to interface with the existing Dokku infrastructure.
+In some cases, it may be useful to deploy an application from a tarball. For instance, if you implemented a non-Git based deployment plugin, tarring the generated artifact may be an easier route to interface with the existing Dokku infrastructure.
 
 You can place the tarball on an external webserver and deploy via the `tar:from` command.
 

docs/deployment/one-off-processes.md

@@ -5,7 +5,7 @@ Sometimes you need to either inspect running containers or run a one-off command
 ## Run a command in an app environment
 
 ```
-run <app> <cmd>                                # Run a command in a new container using the current application image
+run [ --env KEY=VALUE | -e KEY=VALUE ] <app> <cmd>  # Run a command in a new container using the current application image
 ```
 
 The `run` command can be used to run a one-off process for a specific command. This will start a new container and run the desired command within that container. Note that this container will be stay around even after command completes. The container will be the same container as was used to start the currently deployed application.
@@ -13,6 +13,9 @@ The `run` command can be used to run a one-off process for a specific command. T
 ```shell
 # runs `ls -lah` in the `/app` directory of the application `node-js-app`
 dokku run node-js-app ls -lah
+
+# optionally, run can be passed custom environment variables
+dokku run --env "NODE_ENV=development" --env "PATH=/custom/path" node-js-app npm run mytask
 ```
 
 The `run` command can also be used to run a command defined in your Procfile:
@@ -43,6 +46,12 @@ dokku --rm-container run node-js-app ls -lah
 dokku --rm run node-js-app ls -lah
 ```
 
+Containers may have specific labels attached. In order to avoid issues with dokku internals, do not use any labels beginning with either `com.dokku` or `org.label-schema`.
+
+```shell
+dokku --label=com.example.test-label=value run node-js-app ls -lah
+```
+
 Finally, you may wish to run a container in "detached" mode via the `--detach` Dokku flag. Running a process in detached mode will immediately return a `CONTAINER_ID`. It is up to the user to then further manage this container in whatever manner they see fit, as Dokku will *not* automatically terminate the container.
 
 ```shell
@@ -61,7 +70,7 @@ dokku --rm run node-js-app some-command
 dokku --rm-container run node-js-app some-command
 ```
 
-For tasks that should not be interrupted, run is the **preferred** method of handling cron tasks, as the container will continue running even during a deploy or scaling event. The trade-off is that there will be an increase in memory usage if there are multiple concurrent tasks running.
+For tasks that should not be interrupted, run is the *preferred* method of handling cron tasks, as the container will continue running even during a deploy or scaling event. The trade-off is that there will be an increase in memory usage if there are multiple concurrent tasks running.
 
 ## Entering existing containers
 
@@ -79,7 +88,7 @@ dokku enter node-js-app web.1
 dokku enter node-js-app --container-id ID
 ```
 
-Additionally, you can run `enter` with no container-type. If only a single container-type is defined in your app, you will be dropped into the only running container. This behavior is not supported when specifying a custom command; as described below.
+Additionally, you can run `enter` with no `<container-type>`. If only a single `<container-type>` is defined in your app, you will be dropped into the only running container. This behavior is not supported when specifying a custom command; as described below.
 
 By default, it runs a `/bin/bash`, but can also be used to run a custom command:
 
@@ -93,7 +102,7 @@ dokku enter node-js-app web python script/background-worker.py
 
 ### Using `enter` for cron tasks
 
-Your procfile can have the following entry:
+Your Procfile can have the following entry:
 
 ```Procfile
 cron: sleep infinity
@@ -113,28 +122,28 @@ dokku enter node-js-app cron some-command
 
 Note that you can also run multiple commands at the same time to reduce memory usage, though that may result in polluting the container environment.
 
-For tasks that will properly resume, you **should** use the above method, as running tasks will be interrupted during deploys and scaling events, and subsequent commands will always run with the latest container. Note that if you scale the cron container down, this may interrupt proper running of the task.
+For tasks that will properly resume, you *should* use the above method, as running tasks will be interrupted during deploys and scaling events, and subsequent commands will always run with the latest container. Note that if you scale the cron container down, this may interrupt proper running of the task.
 
-## General Cron Recommendations
+## General cron recommendations
 
-Regularly scheduled tasks can be a bit of a pain with dokku. The following are general recommendations to follow to help ensure successful task runs.
+Regularly scheduled tasks can be a bit of a pain with Dokku. The following are general recommendations to follow to help ensure successful task runs.
 
-- Use the `dokku` user's crontab
-  - If you do not, the `dokku` binary will attempt to execute with `sudo` dokku, and your cron run with fail with `sudo: no tty present and no askpass program specified`
+- Use the `dokku` user's crontab.
+  - If you do not, the `dokku` binary will attempt to execute with `sudo`, and your cron run with fail with `sudo: no tty present and no askpass program specified`.
 - Add a `MAILTO` environment variable to ship cron emails to yourself.
 - Add a `PATH` environment variable or specify the full path to binaries on the host.
-- Add a `SHELL` environment variable to specify bash when running commands.
+- Add a `SHELL` environment variable to specify Bash when running commands.
 - Keep your cron tasks in time-sorted order.
-- Keep your server time in UTC so you don't need to translate daylight saving's time when reading the cronfile.
+- Keep your server time in UTC so you don't need to translate daylight savings time when reading the cronfile.
 - Run tasks at the lowest traffic times if possible.
-- Use cron to **trigger** jobs, not run them. Use a real queuing system such as rabbitmq to actually process jobs.
+- Use cron to *trigger* jobs, not run them. Use a real queuing system such as rabbitmq to actually process jobs.
 - Try to keep tasks quiet so that mails only send on errors.
 - Do not silence standard error or standard out. If you silence the former, you will miss failures. Silencing the latter means you should actually make application changes to handle log levels.
 - Use a service such as [Dead Man's Snitch](https://deadmanssnitch.com) to verify that cron tasks completed successfully.
 - Add lots of comments to your cronfile, including what a task is doing, so that you don't spend time deciphering the file later.
 - Place your cronfiles in a pattern such as `/etc/cron.d/APP`.
-- Do not use non-ascii characters in your cronfile names. Cron is finicky.
-- Remember to have trailing newlines in your cronfile! Cron is finicky.
+- Do not use non-ASCII characters in your cronfile names. cron is finicky.
+- Remember to have trailing newlines in your cronfile! cron is finicky.
 
 The following is a sample cronfile that you can use for your applications:
 

docs/deployment/process-management.md

@@ -3,7 +3,6 @@
 > New as of 0.3.14, Enhanced in 0.7.0
 
 ```
-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
@@ -21,18 +20,10 @@ ps:stopall                                     # Stop all app container(s)
 
 By default, Dokku will only start a single `web` process - if defined - though process scaling can be managed by the `ps` plugin or [via a custom `DOKKU_SCALE` file](/docs/deployment/process-management.md#manually-managing-process-scaling).
 
-> The `web` proctype is the only proctype that will invoke custom checks as defined by a CHECKS file. It is also the only process type that will be launched in a container that is either proxied via nginx or bound to an external port.
+> The `web` proctype is the only proctype that will invoke custom checks as defined by a `CHECKS` file. It is also the only process type that will be launched in a container that is either proxied via nginx or bound to an external port.
 
 ## Usage
 
-### Listing processes running in an app container
-
-To find out if your application's containers are running the commands you expect, simply run the `ps` command against that application.
-
-```shell
-dokku ps node-js-app
-```
-
 ### Inspecting app containers
 
 > New as of 0.13.0
@@ -47,7 +38,7 @@ This command will gather all the running container IDs for your application and
 
 ### 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`
+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`
 
 ```shell
 dokku ps:rebuild node-js-app
@@ -60,13 +51,13 @@ dokku ps:rebuildall
 ```
 
 > The `ps:rebuild` and `ps:rebuildall` commands only work for applications for which there is a source, and thus
-> will only always work deterministically for git-deployed application. Please see
+> will only always work deterministically for Git-deployed application. Please see
 > the [images documentation](/docs/deployment/methods/images.md) and [tar documentation](/docs/deployment/methods/tar.md)
 > in for more information concerning rebuilding those applications.
 
 ### Restarting applications
 
-Applications can be restarted, which is functionally identical to calling the `release_and_deploy` function on an application. Please not that any linked containers *must* be started before the application in order to have a successful boot.
+Applications can be restarted, which is functionally identical to calling the `release_and_deploy` function on an application. Please note that any linked containers *must* be started before the application in order to have a successful boot.
 
 ```shell
 dokku ps:restart node-js-app
@@ -108,7 +99,7 @@ dokku ps:scale node-js-app
 
 ### Stopping applications
 
-Deployed applications can be stopped using the `ps:stop` command. This turns off all running containers for an application, and will result in a `502 Bad Gateway` response for the default nginx proxy implementation.
+Deployed applications can be stopped using the `ps:stop` command. This turns off all running containers for an application, and will result in a **502 Bad Gateway** response for the default nginx proxy implementation.
 
 ```shell
 dokku ps:stop node-js-app
@@ -130,7 +121,7 @@ dokku ps:start node-js-app
 
 ### Starting all applications
 
-In some cases, it may be necessary to start all applications from scratch - eg. if all Docker containers have been manually stopped. This can be executed via the `ps:startall` command, which supports parallelism in the same manner `ps:rebuildall`, `ps:restartall`, and `ps:stopall` do.
+In some cases, it may be necessary to start all applications from scratch - e.g. if all Docker containers have been manually stopped. This can be executed via the `ps:startall` command, which supports parallelism in the same manner `ps:rebuildall`, `ps:restartall`, and `ps:stopall` do.
 
 Be aware that no action will be taken if the application containers are running.
 
@@ -138,7 +129,7 @@ Be aware that no action will be taken if the application containers are running.
 dokku ps:startall
 ```
 
-## Restart Policies
+## Restart policies
 
 > New as of 0.7.0
 
@@ -210,7 +201,7 @@ Restart policies have no bearing on server reboot, and Dokku will always attempt
 
 ## Manually managing process scaling
 
-You can optionally _commit_ a `DOKKU_SCALE` file to the root of your repository - *not* to the /home/dokku/APP directory. Dokku expects this file to contain one line for every process defined in your Procfile.
+You can optionally *commit* a `DOKKU_SCALE` file to the root of your repository - *not* to the `/home/dokku/APP` directory. Dokku expects this file to contain one line for every process defined in your Procfile.
 
 Example:
 
@@ -221,4 +212,4 @@ worker=2
 
 If it is not committed to the repository, the `DOKKU_SCALE` file will otherwise be automatically generated based on your `ps:scale` settings.
 
-> *NOTE*: Dokku will always use the DOKKU_SCALE file that ships with the repo to override any local settings.
+> *NOTE*: Dokku will always use the `DOKKU_SCALE` file that ships with the repo to override any local settings.

docs/deployment/remote-commands.md

@@ -1,6 +1,6 @@
 # Remote Commands
 
-Dokku commands can be run over ssh. Anywhere you would run `dokku <command>`, just run `ssh -t dokku@dokku.me <command>`
+Dokku commands can be run over SSH. Anywhere you would run `dokku <command>`, just run `ssh -t dokku@dokku.me <command>`
 The `-t` is used to request a pty. It is highly recommended to do so.
 To avoid the need to type the `-t` option each time, simply create/modify a section in the `.ssh/config` on the client side, as follows:
 
@@ -11,8 +11,8 @@ Host dokku.me
 
 ## Behavioral modifiers
 
-Dokku also supports certain command-line arguments that augment it's behavior. If using these over ssh, you must use the form `ssh -t dokku@dokku.me -- <command>`
-in order to avoid ssh interpretting Dokku arguments for itself.
+Dokku also supports certain command line arguments that augment its behavior. If using these over SSH, you must use the form `ssh -t dokku@dokku.me -- <command>`
+in order to avoid SSH interpretting Dokku arguments for itself.
 
 ```
 --quiet                suppress output headers

docs/deployment/user-management.md

@@ -4,51 +4,59 @@
 
 ```
 ssh-keys:add <name> [/path/to/key]             # Add a new public key by pipe or path
-ssh-keys:list                                  # List of all authorized Dokku public ssh keys
+ssh-keys:list [<name>]                         # List of all authorized Dokku public ssh keys
 ssh-keys:remove <name>                         # Remove SSH public key by name
 ```
 
-When pushing to Dokku, ssh key based authorization is the preferred authentication method, for ease of use and increased security.
+When pushing to Dokku, SSH key-based authorization is the preferred authentication method, for ease of use and increased security.
 
-Users in Dokku are managed via the `~/dokku/.ssh/authorized_keys` file. It is **highly** recommended that you follow the steps below to manage users on a Dokku server.
+Users in Dokku are managed via the `~/dokku/.ssh/authorized_keys` file. It is *highly* recommended that you follow the steps below to manage users on a Dokku server.
 
 > Users of older versions of Dokku may use the `sshcommand` binary to manage keys instead of the `ssh-keys` plugin. Please refer to the Dokku documentation for your version for more details.
 
 ## Usage
 
-### Listing SSH Keys
+### Listing SSH keys
 
-You can use the `ssh-keys:list` command to show all configured ssh keys. Any key added via the `dokku-installer` will be associated with the `admin` key name.
+You can use the `ssh-keys:list` command to show all configured SSH keys. Any key added via the `dokku-installer` will be associated with the `admin` key name.
 
 ```shell
 dokku ssh-keys:list
 ```
 
 ```
-61:21:1f:88:7f:86:d4:3a:68:9f:18:aa:41:4f:bc:3d NAME="admin" SSHCOMMAND_ALLOWED_KEYS="no-agent-forwarding,no-user-rc,no-X11-forwarding,no-port-forwarding"
+SHA256:ABC123ABC123+abc123abc123Zabc123abcZ123abc NAME="admin" SSHCOMMAND_ALLOWED_KEYS="no-agent-forwarding,no-user-rc,no-X11-forwarding,no-port-forwarding"
 ```
 
 The output contains the following information:
 
 - SSH Key Fingerprint.
 - The `KEY_NAME`.
-- A comma separated list of ssh options under the `SSHCOMMAND_ALLOWED_KEYS` name.
+- A comma separated list of SSH options under the `SSHCOMMAND_ALLOWED_KEYS` name.
 
-### Adding SSH Keys
+> New as of 0.20.2
 
-You can add your public key to Dokku with the `ssh-keys:add` command. The output will be the fingerprint of the ssh key:
+The keys for a specific user may be listed by specifying a second argument to the `ssh-keys:list` command:
+
+```shell
+dokku ssh-keys:list admin
+```
+
+### Adding SSH keys
+
+You can add your public key to Dokku with the `ssh-keys:add` command. The output will be the fingerprint of the SSH key:
 
 ```shell
 dokku ssh-keys:add KEY_NAME path/to/id_rsa.pub
 ```
 
 ```
-b7:76:27:4f:30:90:21:ae:d4:1e:70:20:35:3f:06:d6
+SHA256:ABC123ABC123+abc123abc123Zabc123abcZ123abc
 ```
 
 `KEY_NAME` is the name you want to use to refer to this particular key. Including the word `admin` in the name will grant the user privileges to add additional keys remotely.
 
-> `KEY_NAME` is a unique name which is used to identify public keys. Attempting to re-use a key name will result in an error. The ssh (git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all it's actions.
+> `KEY_NAME` is a unique name which is used to identify public keys. Attempting to re-use a key name will result in an error. The SSH (Git) user is *always* `dokku`, as this is the system user that the `dokku` binary uses to perform all its actions.
 
 Admin users and root can add keys remotely by specifying the `dokku` bin on their `ssh` command:
 
@@ -56,15 +64,15 @@ Admin users and root can add keys remotely by specifying the `dokku` bin on thei
 cat ~/.ssh/id_rsa.pub | ssh root@dokku.me dokku ssh-keys:add KEY_NAME
 ```
 
-If you are using the vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to Dokku (it will use your host username as the `USER`):
+If you are using the Vagrant installation, you can also use the `make vagrant-acl-add` target to add your public key to Dokku (it will use your host username as the `USER`):
 
 ```shell
 cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
 ```
 
-### Removing SSH Keys
+### Removing SSH keys
 
-As key names are unique, they can be used to remove a public ssh key.
+As key names are unique, they can be used to remove a public SSH key.
 
 ```SHELL
 dokku ssh-keys:remove KEY_NAME
@@ -72,11 +80,12 @@ dokku ssh-keys:remove KEY_NAME
 
 ## Scoping commands to specific users
 
-Keys are given unique names, which can be used in conjunction with the [user-auth](/docs/development/plugin-triggers.md#user-auth) plugin trigger to handle command authorization. Please see the documentation on that trigger for more information.
+Support for scoping commands to specific users can be added through plugins that take advantage of the [user-auth](/docs/development/plugin-triggers.md#user-auth) plugin trigger to handle command authorization.
+See also the list of [community-provided plugins](/docs/community/plugins.md).
 
 ## Granting other Unix user accounts Dokku access
 
-Any Unix user account which belongs to the 'sudo' Unix group can run Dokku.  However, you may want to give them Dokku access but not full sudo privileges.
+Any Unix user account which belongs to the `sudo` Unix group can run Dokku.  However, you may want to give them Dokku access but not full sudo privileges.
 
 To allow other Unix user accounts to be able to run Dokku commands, without giving them full sudo access, modify your sudoers configuration.
 

docs/deployment/zero-downtime-deploys.md

@@ -3,7 +3,6 @@
 > New as of 0.5.0
 
 ```
-checks <app>                             Show zero-downtime status
 checks:disable <app> [process-type(s)]   Disable zero-downtime deployment for all processes (or comma-separated process-type list) ***WARNING: this will cause downtime during deployments***
 checks:enable <app> [process-type(s)]    Enable zero-downtime deployment for all processes (or comma-separated process-type list)
 checks:report [<app>] [<flag>]           Displays a checks report for one or more apps
@@ -11,7 +10,7 @@ checks:run <app> [process-type(s)]       Runs zero-downtime checks for all proce
 checks:skip <app> [process-type(s)]      Skip zero-downtime checks for all processes (or comma-separated process-type list)
 ```
 
-By default, Dokku will wait `10` seconds after starting each container before assuming it is up and proceeding with the deploy. Once this has occurred for all containers started by for an application, traffic will be switched to point to your new containers. Dokku will also wait a further `60` seconds _after_ the deploy is complete before terminating old containers in order to give time for long running connections to terminate. In either case, you may have more than one container running for a given application.
+By default, Dokku will wait `10` seconds after starting each container before assuming it is up and proceeding with the deploy. Once this has occurred for all containers started by for an application, traffic will be switched to point to your new containers. Dokku will also wait a further `60` seconds *after* the deploy is complete before terminating old containers in order to give time for long running connections to terminate. In either case, you may have more than one container running for a given application.
 
 You may both create user-defined checks for web processes using a `CHECKS` file, as well as customize any and all parts of this experience using the checks plugin.
 
@@ -19,17 +18,17 @@ You may both create user-defined checks for web processes using a `CHECKS` file,
 > as the Django framework - checks for specific hostnames or header values, these
 > checks will fail. To avoid this:
 >
-> - Remove such checks from your code: Modify your application to remove the hostname check completely
-> - Allow checks from all hostnames: Modify your application to accept a dynamically provided hostname
-> - Specify the domain within the check: See below for further documentation
+> - Remove such checks from your code: Modify your application to remove the hostname check completely.
+> - Allow checks from all hostnames: Modify your application to accept a dynamically provided hostname.
+> - Specify the domain within the check: See below for further documentation.
 
-## Configuring Check Settings using the `config` plugin
+## Configuring check settings using the `config` plugin
 
 There are certain settings that can be configured via environment variables:
 
 - `DOKKU_DEFAULT_CHECKS_WAIT`: (default: `10`) If no user-defined checks are specified - or if the process being checked is not a `web` process - this is the period of time Dokku will wait before checking that a container is still running.
-- `DOKKU_DOCKER_STOP_TIMEOUT`: (default: `10`) Configurable grace period given to the `docker stop` command. If a container has not stopped by this time, a `kill -9` signal or equivalent is sent in order to force-terminate the container. Both the `ps:stop` and `apps:destroy` commands _also_ respect this value. If not specified, the docker defaults for the [docker stop command](https://docs.docker.com/engine/reference/commandline/stop/) will be used.
-- `DOKKU_WAIT_TO_RETIRE`: (default: `60`) After a successful deploy, the grace period given to old containers before they are stopped/terminated. This is useful for ensuring completion of long-running http connections.
+- `DOKKU_DOCKER_STOP_TIMEOUT`: (default: `10`) Configurable grace period given to the `docker stop` command. If a container has not stopped by this time, a `kill -9` signal or equivalent is sent in order to force-terminate the container. Both the `ps:stop` and `apps:destroy` commands *also* respect this value. If not specified, the Docker defaults for the [`docker stop` command](https://docs.docker.com/engine/reference/commandline/stop/) will be used.
+- `DOKKU_WAIT_TO_RETIRE`: (default: `60`) After a successful deploy, the grace period given to old containers before they are stopped/terminated. This is useful for ensuring completion of long-running HTTP connections.
 
 The following settings may also be specified in the `CHECKS` file, though are available as environment variables in order to ease application reuse.
 
@@ -56,7 +55,7 @@ dokku checks:skip node-js-app worker,web
        DOKKU_CHECKS_SKIPPED: worker,web
 ```
 
-Zero-downtime checks can also be disabled completely. This will stop old containers **before** new ones start, which may result in broken connections and downtime if your application fails to boot properly.
+Zero downtime checks can also be disabled completely. This will stop old containers *before* new ones start, which may result in broken connections and downtime if your application fails to boot properly.
 
 ```shell
 dokku checks:disable node-js-app worker
@@ -70,7 +69,7 @@ dokku checks:disable node-js-app worker
        DOKKU_CHECKS_SKIPPED: web
 ```
 
-### Displaying checks reports about an app
+### Displaying checks reports for an app
 
 > New as of 0.8.1
 
@@ -81,13 +80,13 @@ dokku checks:report
 ```
 
 ```
-=====> search checks information
+=====> node-js-app checks information
        Checks disabled list: none
        Checks skipped list: none          
-=====> python-sample checks information
+=====> python-app checks information
        Checks disabled list: none
        Checks skipped list: none          
-=====> ruby-sample checks information
+=====> ruby-app checks information
        Checks disabled list: _all_
        Checks skipped list: none          
 ```
@@ -95,11 +94,11 @@ dokku checks:report
 You can run the command for a specific app also.
 
 ```shell
-dokku checks:report node-js-sample
+dokku checks:report node-js-app
 ```
 
 ```
-=====> node-js-sample checks information
+=====> node-js-app checks information
        Checks disabled list: none
        Checks skipped list: none          
 ```
@@ -107,25 +106,25 @@ dokku checks:report node-js-sample
 You can pass flags which will output only the value of the specific information you want. For example:
 
 ```shell
-dokku checks:report node-js-sample --checks-disabled-list
+dokku checks:report node-js-app --checks-disabled-list
 ```
 
-## Customizing Checks
+## Customizing checks
 
-If your application needs a longer period to boot up - perhaps to load data into memory, or because of slow boot time - you may also use dokku's `checks` functionality to more precisely check whether an application can serve traffic or not.
+If your application needs a longer period to boot up - perhaps to load data into memory, or because of slow boot time - you may also use Dokku's `checks` functionality to more precisely check whether an application can serve traffic or not.
 
 Checks are run against the detected `web` process from your application's `Procfile`. For non-web processes, Dokku will fallback to the aforementioned process uptime check.
 
 To specify checks, add a `CHECKS` file to the root of your project directory. The `CHECKS` file should be plain text and may contain:
 
-- Check instructions
-- Settings (NAME=VALUE)
-- Comments (lines starting with #)
-- Empty lines
+- check instructions
+- settings (NAME=VALUE)
+- comments (lines starting with #)
+- empty lines
 
-> For dockerfile-based deploys, the file *must* be in `/app/CHECKS` within the container. `/app` is used by default as the root container directory for buildpack-based deploys.
+> For Dockerfile and Docker Image based deploys, the file *must* be in the `WORKDIR` directory of the built image. `/app` is used by default as the root container directory for buildpack-based deploys.
 
-### Check Instructions
+### Check instructions
 
 The format of a check instruction is a path or relative URL, optionally followed by the expected content:
 
@@ -156,9 +155,9 @@ https://admin.dokku.me  Admin Dashboard
 https://static.dokku.me/logo.png
 ```
 
-While a full url may be used in order to invoke checks, if you are using relative urls, the port *must* be omitted.
+While a full URL may be used in order to invoke checks, if you are using relative URLs, the port *must* be omitted.
 
-### Check Settings
+### Check settings
 
 The default behavior is to wait for `5` seconds before running the checks, to timeout the checks after `30` seconds, and to attempt the checks `5` times. If the checks fail `5` times, the deployment is considered failed and the old container will continue serving traffic.
 
@@ -172,7 +171,7 @@ ATTEMPTS=10 # Attempt checks 10 times
 /  My Amazing App
 ```
 
-## Manually Invoking Checks
+## Manually invoking checks
 
 Checks can also be manually invoked via the `checks:run` command. This can be used to check the status of an application via cron to provide integration with external healthchecking software.
 
@@ -220,7 +219,7 @@ dokku checks:run node-js-app worker
 -----> Default container check successful!
 ```
 
-An app process id may also be specified:
+An app process ID may also be specified:
 
 ```shell
 dokku checks:run node-js-app web.2
@@ -247,7 +246,7 @@ dokku checks:run node-js-app non-existent
 Invalid process type specified (APP.non-existent)
 ```
 
-Non-existent process ids will *also* result in an error
+Non-existent process IDs will *also* result in an error
 
 ```shell
 dokku checks:run node-js-app web.3
@@ -258,11 +257,11 @@ dokku checks:run node-js-app web.3
 Invalid container id specified (APP.web.3)
 ```
 
-## Example: Successful Rails Deployment
+## Example: Successful Rails deployment
 
-In this example, a Rails application is successfully deployed to dokku. The initial round of checks fails while the server is starting, but once it starts they succeed and the deployment is successful. `WAIT` is set to `10` because our application takes a while to boot up. `ATTEMPTS` is set to `6`, but the third attempt succeeds.
+In this example, a Rails application is successfully deployed to Dokku. The initial round of checks fails while the server is starting, but once it starts they succeed and the deployment is successful. `WAIT` is set to `10` because our application takes a while to boot up. `ATTEMPTS` is set to `6`, but the third attempt succeeds.
 
-### CHECKS file
+### `CHECKS` file
 
 ```
 WAIT=10
@@ -276,9 +275,9 @@ For this check to work, we've added a line to `config/routes.rb` that simply ret
 get '/check.txt', to: proc {[200, {}, ['simple_check']]}
 ```
 
-### Deploy Output
+### Deploy output
 
-> Note: The output has been trimmed for brevity
+> Note: The output has been trimmed for brevity.
 
 ```shell
 git push dokku master
@@ -327,20 +326,19 @@ curl: (7) Failed to connect to 172.17.0.155 port 5000: Connection refused
 -----> Running post-deploy
 -----> Configuring myapp.dokku.me...
 -----> Creating http nginx.conf
------> Running nginx-pre-reload
        Reloading nginx
 -----> Shutting down old container in 60 seconds
 =====> Application deployed:
        http://myapp.dokku.me
 ```
 
-## Example: Failing Rails Deployment
+## Example: Failing Rails deployment
 
-In this example, a Rails application fails to deploy. The reason for the failure is that the postgres database connection fails. The initial checks will fail while we wait for the server to start up, just like in the above example. However, once the server does start accepting connections, we will see an error 500 due to the postgres database connection failure.
+In this example, a Rails application fails to deploy. The reason for the failure is that the PostgreSQL database connection fails. The initial checks will fail while we wait for the server to start up, just like in the above example. However, once the server does start accepting connections, we will see an error 500 due to the PostgreSQL database connection failure.
 
-Once the attempts have been exceeded, the deployment fails and we see the container output, which shows the Postgres connection errors.
+Once the attempts have been exceeded, the deployment fails and we see the container output, which shows the PostgreSQL connection errors.
 
-### CHECKS file
+### `CHECKS` file
 
 ```
 WAIT=10
@@ -348,11 +346,11 @@ ATTEMPTS=6
 /
 ```
 
-> The check to the root url '/' would normally access the database.
+> The check to the root url `/` would normally access the database.
 
-### Deploy Output
+### Deploy output
 
-> Note: The output has been trimmed for brevity
+> Note: The output has been trimmed for brevity.
 
 ```shell
 git push dokku master

docs/development/plugin-creation.md

@@ -1,97 +1,283 @@
-# Plugin Creation
+# Plugin creation
 
-Plugins can simply be implementations of [triggers](/docs/development/plugin-triggers.md) or they may implement a command structure of their own. Dokku has no restrictions on the language in which a plugin is implemented, it only cares that the plugin implements the appropriate [commands](/docs/development/plugin-creation.md#command-api) or [triggers](/docs/development/plugin-triggers.md) API. NOTE: all files that implement the triggers or commands API must be executable.
+A plugin can be a simple implementation of [triggers](/docs/development/plugin-triggers.md) or can implement a command structure of its own. Dokku has no restrictions on the language in which a plugin is implemented; it only cares that the plugin implements the appropriate [commands](/docs/development/plugin-creation.md#command-api) or [triggers](/docs/development/plugin-triggers.md) for the API. **NOTE:** any file that implements triggers or uses the command API must be executable.
 
-If you create your own plugin:
+When creating custom plugins:
 
-1. Take a look at the plugins shipped with Dokku and hack away!
-2. Check out the [list of triggers](/docs/development/plugin-triggers.md) your plugin can implement.
-3. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
-4. Edit [this page](/docs/community/plugins.md) and add a link to it.
+1. Take a look at [the plugins shipped with Dokku](/docs/community/plugins.md) and hack away!
+2. Check out the [list of triggers](/docs/development/plugin-triggers.md) the plugin can implement
+3. Upload the plugin to GitHub with a repository name following the `dokku-<name>` convention (e.g. `dokku-mariadb`)
+4. Edit [this page](/docs/community/plugins.md) and add a link to the plugin
 5. Subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases
 
+## Compilable plugins (Golang, Java(?), C, etc.)
 
-### Compilable Plugins (i.e. golang, java(?), c, etc.)
-The plugin developer is required to implement the `install` trigger such that it will output your built executable(s) in the correct directory structure to implement the plugin's desired command and/or trigger API. See [smoke-test-plugin](https://github.com/dokku/smoke-test-plugin) for an example.
+When developing a plugin, the `install` trigger must be implemented such that it outputs the built executable(s) using a directory structure that implements the plugin's desired command and/or triggers the API. See the [smoke-test-plugin](https://github.com/dokku/smoke-test-plugin) for an example.
 
+## Command API
 
-### Command API
-There are 3 main implementation points: `commands`, `subcommands/default`, and `subcommands/<command-name>`
+There are 3 main integration points: `commands`, `subcommands/default`, and `subcommands/<command-name>`.
 
-#### commands
-Primarily used to supply the plugin's usage/help output. (i.e. [plugin help](https://github.com/dokku/dokku/tree/master/plugins/plugin/commands))
+### `commands`
 
-#### subcommands/default
-Implements the plugin's default command behavior. (i.e. [`dokku plugin`](https://github.com/dokku/dokku/tree/master/plugins/plugin/subcommands/default))
+Primarily used to supply the plugin's usage/help output. (i.e. [plugin help](https://github.com/dokku/dokku/tree/master/plugins/plugin/commands)).
 
-#### subcommands/<command-name>
-Implements the additional command interface and will translate to `dokku plugin:cmd` on the command line. (i.e. [`dokku plugin:install`](https://github.com/dokku/dokku/tree/master/plugins/plugin/subcommands/install))
+### `subcommands/default`
 
+Implements the plugin's default command behavior. (i.e. [`dokku plugin`](https://github.com/dokku/dokku/tree/master/plugins/plugin/subcommands/default)).
 
-### Sample plugin
-The below plugin is a dummy `dokku hello` plugin.
+### `subcommands/<command-name>`
 
-hello/subcommands/default
+Implements the additional command interface and will translate to `dokku plugin:cmd` on the command line. (i.e. [`dokku plugin:install`](https://github.com/dokku/dokku/tree/master/plugins/plugin/subcommands/install)).
+
+# Plugin Building Tips
+
+## Always create a `plugin.toml`
+
+The `plugin.toml` file is used to describe the plugin in help output, and helps users understand the purpose of the plugin. This _must_ have a description and a version. The version _should_ be bumped at every plugin release.
+
+```toml
+[plugin]
+description = "dokku example plugin"
+version = "0.1.0"
+[plugin.config]
+```
+
+## Files should be executable
+
+Commands, subcommands, triggers and source shell scripts should all be executable. On a Unix-like machine, the following command can be used to make them executable:
+
+```shell
+chmod +x path/to/file
+```
+
+Non-executable commands, subcommands, and triggers will be ignored.
+
+## Use the `pipefail` bash option
+
+Consider whether to include the `set -eo pipefail` option. Look at the following example:
+
+```shell
+IMAGE=$(docker images | grep "user/repo" | awk '{print $3}')
+if [[ -z $IMAGE ]]; then
+  dokku_log_fail "user/repo image not found... Did you run 'dokku plugin:install'?"
+fi
+```
+
+If `user/repo` doesn't exist, Dokku exits just before the `awk` command and the `dokku_log_fail` message will never go to `STDOUT`. printed with echo. The `set -e` option should be used in this case.
+
+Here is the `help` entry for `set`:
+
+```
+help set
+Options:
+  -e  Exit immediately if a command exits with a non-zero status.
+  -o option-name
+      pipefail     the return value of a pipeline is the status of
+                   the last command to exit with a non-zero status,
+                   or zero if no command exited with a non-zero status
+```
+
+## Support trace mode
+
+Trace mode is useful for getting debugging output from plugins when the `--trace` flag is specified or `dokku trace:on` is triggered. This should be done at the top of each shell script:
 
 ```shell
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+```
+
+In the above example, the third line enables bash's debug mode, which prints command traces before executing command.
+
+## Verify the existence of dependencies
+
+If a plugin depends on a specific command-line tool, check whether that tool exists before utilizing it. Either `command -v` or `which` may be used to do so:
+
+```shell
+# `command -v` example
+if ! command -v "nginx" &>/dev/null; then
+  log-fail "Missing nginx, install it"
+fi
+
+# `which` example
+if ! which nginx >/dev/null 2>&1; then
+  log-fail "Missing nginx, install it"
+fi
+```
+
+In cases where a dependency should be installed before the plugin can be used at all, use the `dependencies` plugin trigger to install the dependency.
+
+## Implement a help command
+
+For plugins which expose commands, implement a `help` command. This may be empty, but should contain a listing of all available commands.
+
+Commas - `,` - are used in the help output for columnizing output. Verify that the plugin conforms to the spec by running `dokku help --all` and manually verifying the output.
+
+See the sample plugin below for an example.
+
+## Namespace commands
+
+All commands *should* be namespaced. In cases where a core plugin is overriden, the plugin _may_ utilize the a namespace in use by the core, but generally this should be avoided to reduce confusion as to where the command is implemented.
+
+## Implement a proper catch-all command
+
+As of 0.3.3, a catch-all should be implemented that exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows Dokku to output a `command not found` message.
+
+See the sample plugin below for an example.
+
+## Set app config without restarting
+
+In the case that a plugin needs to set app configuration settings and a restart should be avoided (default Heroku-style behavior) these "internal" commands provide this functionality:
+
+```shell
+config_set --no-restart node-js-app KEY1=VALUE1 [KEY2=VALUE2 ...]
+config_unset --no-restart node-js-app KEY1 [KEY2 ...]
+```
+
+## Expose functionality in a `functions` file
+
+To allow other plugins access to (some of) a plugin's functionality, functions can expose by including a `functions` file in the plugin for others to source. All functions in that file should be considered publicly accessible by other plugins.
+
+Any functions that must be kept private should reside in the plugin's `trigger/` or `commands/` directories. Other files may also be used to hide private functions; the official convention for hiding private functions is to place them an `internal-functions` file.
+
+## Use helper functions to fetch app images
+
+> New as of 0.4.0
+
+Dokku allows image tagging and deployment of tagged images. This means hard-coding the `$IMAGE` as `dokku/$APP` is no longer sufficient.
+
+Plugins should use `get_running_image_tag()` and `get_app_image_name()` as sourced from `common/functions`. See the [plugin triggers](/docs/development/plugin-triggers.md) doc for examples.
+
+> **Note:** This is only for plugins that are not `pre/post-build-*` plugins
+
+## Use `$DOCKER_BIN` instead of `docker` directly
+
+> New as of 0.17.5
+
+Certain systems may require a wrapper function around the `docker` binary for proper execution. Utilizing the `$DOCKER_BIN` environment variable when calling docker for those functions is preferred.
+
+```shell
+# good
+"$DOCKER_BIN" container run -d $IMAGE /bin/bash -e -c "$COMMAND"
+
+# bad
+docker run -d $IMAGE /bin/bash -e -c "$COMMAND"
+```
+
+## Include labels for all temporary containers and images
+
+> New as of 0.5.0
+
+As of 0.5.0, labels are used to help cleanup intermediate containers with `dokku cleanup`. Plugins that create containers and images should add the correct labels to the `build`, `commit`, and `run` docker commands.
+
+Note that where possible, a label `com.dokku.app-name=$APP` - where `$APP` is the name of the app - should also be included. This enables `dokku cleanup APP` to cleanup the specific containers for a given app.
+
+```shell
+# `docker build` example
+"$DOCKER_BIN" image build "--label=com.dokku.app-name=${APP}" $DOKKU_GLOBAL_BUILD_ARGS ...
+
+# `docker commit` example
+# Note that the arguments must be set as a local array
+# as arrays cannot be exported in shell
+local DOKKU_COMMIT_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL $DOKKU_CONTAINER_LABEL=")
+"$DOCKER_BIN" container commit --change "LABEL com.dokku.app-name=$APP" "${DOKKU_COMMIT_ARGS[@]}" ...
+
+# `docker run` example
+"$DOCKER_BIN" container run "--label=com.dokku.app-name=${APP}" $DOKKU_GLOBAL_RUN_ARGS ...
+```
+
+## Copy files from the built image using `copy_from_image`
+
+Avoid copying files from running containers as these files may change over time. Instead copy files from the image built during the deploy process. This can be done via the `copy_from_image` helper function. This will correctly handle various corner cases in copying files from an image.
+
+```shell
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-hello_main_cmd() {
+local TMP_FILE=$(mktemp "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")
+trap "rm -rf '$TMP_FILE' >/dev/null" RETURN INT TERM
+
+local IMAGE_TAG="$(get_running_image_tag "$APP")"
+local IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
+copy_from_image "$IMAGE" "file-being-copied" "$TMP_FILE" 2>/dev/null
+```
+
+Files are copied from the `/app` directory - for images built via buildpacks - or `WORKDIR` - for images built via Dockerfile.
+
+## Avoid calling the `dokku` binary directly
+
+> New as of 0.6.0
+
+Plugins should **not** call the `dokku` binary directly from within plugins because clients using the `--app` argument are potentially broken when doing so.
+
+Plugins should instead source the `functions` file for a given plugin when attempting to call Dokku internal functions.
+
+# Sample plugin
+
+The below plugin is a dummy `dokku hello` plugin.
+
+Each plugin requires a `plugin.toml` descriptor file with the following required fields:
+
+```toml
+[plugin]
+description = "dokku hello plugin"
+version = "0.1.0"
+[plugin.config]
+```
+
+`hello/subcommands/default`
+
+```shell
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+cmd-hello-default() {
   declare desc="prints Hello \$APP"
-  local cmd="hello"
+  declare cmd="hello"
+  [[ "$1" == "$cmd" ]] && shift 1
   # Support --app/$DOKKU_APP_NAME flag
   # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@""
-  local argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
-  [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
+  [[ -n $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
   set -- $cmd $@
-  ##
+  #
+  declare APP="$1"
 
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2";
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
 
   echo "Hello $APP"
 }
 
-hello_main_cmd "$@"
+cmd-hello-default "$@"
 ```
 
-hello/subcommands/world
+`hello/subcommands/world`
 
 ```shell
 #!/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"
 
-hello_world_cmd() {
-  declare desc="prints Hello World"
-  local cmd="hello:world"
-  # Support --app/$DOKKU_APP_NAME flag
-  # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@""
-  local argv=("$@")
-  [[ ${argv[0]} == "$cmd" ]] && shift 1
-  [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@
-  set -- $cmd $@
-  ##
-
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2";
+cmd-hello-world() {
+  declare desc="prints Hello world"
+  declare cmd="hello:world"
+  [[ "$1" == "$cmd" ]] && shift 1
 
   echo "Hello world"
 }
 
-hello_world_cmd "$@"
+cmd-hello-world "$@"
 ```
 
-hello/commands
+`hello/commands`
 
 ```shell
 #!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
   help | hello:help)
@@ -126,53 +312,3 @@ help_content
 
 esac
 ```
-
-Each plugin requires a `plugin.toml` descriptor file with the following required fields:
-
-```toml
-[plugin]
-description = "dokku hello plugin"
-version = "0.1.0"
-[plugin.config]
-```
-
-A few notes:
-
-- Don't forget to `chmod +x` your executable files.
-- You should always support `DOKKU_TRACE` as specified on the 2nd line of the plugin.
-- If your command requires that an application exists, ensure you check for it's existence in the manner prescribed above.
-- A `help` command is required, though it is allowed to be empty. Also, the command syntax will need to separated by `, ` in order to maintain columnar output alignment.
-- Commands *should* be namespaced.
-- As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows Dokku to output a `command not found` message.
-- Be sure you want the "set -eo pipefail" option. Look at the following example :
-
-    ```shell
-    IMAGE=$(docker images | grep "user/repo" | awk '{print $3}')
-    if [[ -z $IMAGE ]]; then
-        dokku_log_fail "user/repo image not found... Did you run 'dokku plugin:install'?"
-    fi
-    ```
-
-  In the case where the "user/repo" is not installed, Dokku exits just before the awk command,
-  you will never see the message printed with echo. You just want "set -e" in this case.
-
-  Here is the documentation of the 'set -eo pipefail' option:
-  ```
-  help set
-    Options:
-      -e  Exit immediately if a command exits with a non-zero status.
-      -o option-name
-          pipefail     the return value of a pipeline is the status of
-                       the last command to exit with a non-zero status,
-                       or zero if no command exited with a non-zero status
-  ```
-- As some plugins require access to set app config settings and do not want/require the default Heroku-style behavior of a restart, we have the following "internal" commands that provide this functionality :
-
-  ```shell
-  dokku config:set --no-restart node-js-app KEY1=VALUE1 [KEY2=VALUE2 ...]
-  dokku config:unset --no-restart node-js-app KEY1 [KEY2 ...]
-  ```
-- From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
-- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](/docs/development/plugin-triggers.md) doc for examples.
-- As of 0.5.0, we use container labels to help cleanup intermediate containers with `dokku cleanup`. If manually calling `docker run`, include `$DOKKU_GLOBAL_RUN_ARGS`. This will ensure you intermediate containers labeled correctly.
-- As of 0.6.0, we advise you to *not* call the `dokku` binary directly from within plugins. Clients using the `--app` argument are potentially broken, amongst other issues, when doing so. Instead, please source the `functions` file for a given plugin when attempting to call Dokku internal functions

docs/development/plugin-triggers.md

@@ -29,6 +29,81 @@ The following plugin triggers describe those available to a Dokku installation.
 
 > The example plugin trigger code is not guaranteed to be implemented as in within dokku, and are merely simplified examples. Please look at the Dokku source for larger, more in-depth examples.
 
+### `app-create`
+
+- Description: Creates an app
+- Invoked by:
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `app-destroy`
+
+- Description: Destroys an app (with confirmation if force isn't specified)
+- Invoked by:
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `app-exists`
+
+- Description: Creates an app
+- Invoked by:
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `app-maybe-create`
+
+- Description: Creates an app (gated by whether this is globally enabled or not)
+- Invoked by:
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `app-restart`
+
+- Description: Triggers an app restart
+- Invoked by: `dokku config:clear`, `dokku config:set`, `dokku config:unset`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `app-urls`
 
 - Description: Allows you to change the urls Dokku reports for an application. Will override any auto-detected urls.
@@ -53,6 +128,66 @@ case "$URL_TYPE" in
 esac
 ```
 
+### `builder-build`
+
+- Description: Triggers the artifact build process
+- Invoked by: `dokku deploy`
+- Arguments: `$BUILDER_TYPE` `$APP` `$SOURCECODE_WORK_DIR`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `builder-create-dokku-image`
+
+- Description: Allows modification of the configured dokku-image
+- Invoked by: `dokku deploy`
+- Arguments: `$BUILDER_TYPE` `$APP` `$SOURCECODE_WORK_DIR` `$DOKKU_IMAGE`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `builder-dokku-image`
+
+- Description: Allows modification of the used dokku-image.
+- Invoked by: `dokku deploy`
+- Arguments: `$BUILDER_TYPE` `$APP` `$SOURCECODE_WORK_DIR` `$DOKKU_IMAGE`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `builder-release`
+
+- Description: Triggers the artifact release process
+- Invoked by: `dokku deploy`
+- Arguments: `$BUILDER_TYPE` `$APP` `$IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `check-deploy`
 
 - Description: Allows you to run checks on a deploy before Dokku allows the container to handle requests.
@@ -68,7 +203,7 @@ esac
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
-APP="$1"; CONTAINERID="$2"; PROC_TYPE="$3"; PORT="$4" ; IP="$5"
+APP="$1"; CONTAINER_ID="$2"; PROC_TYPE="$3"; PORT="$4" ; IP="$5"
 
 eval "$(config_export app $APP)"
 DOKKU_DISABLE_DEPLOY="${DOKKU_DISABLE_DEPLOY:-false}"
@@ -126,6 +261,36 @@ help_content
 esac
 ```
 
+### `config-get`
+
+- Description: Fetches the app config value for a key
+- Invoked by:
+- Arguments: `$APP $KEY`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `config-get-global`
+
+- Description: Fetches the global config value for a key
+- Invoked by:
+- Arguments: `$KEY`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `core-post-deploy`
 
 > To avoid issues with community plugins, this plugin trigger should be used *only* for core plugins. Please avoid using this trigger in your own plugins.
@@ -248,6 +413,8 @@ echo 'derp.dkr.ecr.us-east-1.amazonaws.com'
 
 ### `docker-args-build`
 
+> Warning: Deprecated, please use `docker-args-process-build` instead
+
 - Description:
 - Invoked by: `internal function dokku_build() (build phase)`
 - Arguments: `$APP $IMAGE_SOURCE_TYPE`
@@ -271,6 +438,8 @@ echo -n "$STDIN$output"
 
 ### `docker-args-deploy`
 
+> Warning: Deprecated, please use `docker-args-process-deploy` instead
+
 - Description:
 - Invoked by: `dokku deploy`
 - Arguments: `$APP $IMAGE_TAG [$PROC_TYPE $CONTAINER_INDEX]`
@@ -287,8 +456,65 @@ verify_app_name "$APP"
 # TODO
 ```
 
+### `docker-args-process-build`
+
+- Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options.
+- Invoked by: `dokku ps:rebuild`
+- Arguments: `$APP $IMAGE_SOURCE_TYPE`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+APP="$1"; IMAGE_SOURCE_TYPE="$2"
+verify_app_name "$APP"
+
+# TODO
+```
+
+### `docker-args-process-deploy`
+
+- Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker deploy options.
+- Invoked by: `dokku deploy`
+- Arguments: `$APP $IMAGE_SOURCE_TYPE $IMAGE_TAG [$PROC_TYPE $CONTAINER_INDEX]`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; $IMAGE_SOURCE_TYPE="$2" IMAGE_TAG="$3"; PROC_TYPE="$4"; CONTAINER_INDEX="$5"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
+### `docker-args-process-run`
+
+- Description: `$PROC_TYPE` may be set to magic `_all_` process type to signify global docker run options.
+- Invoked by: `dokku run`
+- Arguments: `$APP $IMAGE_SOURCE_TYPE $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+APP="$1"; IMAGE_SOURCE_TYPE="$3"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
+verify_app_name "$APP"
+
+# TODO
+```
+
 ### `docker-args-run`
 
+> Warning: Deprecated, please use `docker-args-process-run` instead
+
 - Description:
 - Invoked by: `dokku run`
 - Arguments: `$APP $IMAGE_TAG`
@@ -339,6 +565,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 since it does not get called for commands that use `git-upload-archive` such
 as `git archive`. Instead, use the [`user-auth`](#user-auth) trigger.
 
+### `git-revision`
+
+- Description: Allows you to fetch the current git revision for a given application
+- Invoked by:
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `install`
 
 - Description: Used to setup any files/configuration for a plugin.
@@ -376,7 +617,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 ### `network-clear-config`
 
 - Description: Clears network configuration
-- Invoked by: `internally triggered by proxy-clear-config within proxy implementations`
+- Invoked by: `internally triggered within proxy implementations`
 - Arguments: `$APP`
 - Example:
 
@@ -437,7 +678,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 - Description: Return the listeners (host:port combinations) for a given app container
 - Invoked by: `internally triggered by a deploy`
-- Arguments: `$APP`
+- Arguments: `$APP $PROCESS_TYPE`
 - Example:
 
 ```shell
@@ -529,6 +770,8 @@ echo "$NEW_SUBDOMAIN.$VHOST"
 
 ### `nginx-pre-reload`
 
+> Warning: The arguments INTERNAL_PORT and INTERNAL_IP_ADDRESS are no longer sufficient to retrieve all app listeners. Please run `plugn trigger network-get-listeners APP` within any implementation of `nginx-pre-reload` in order to retrieve all application listeners.
+
 - Description: Run before nginx reloads hosts
 - Invoked by: `dokku nginx:build-config`
 - Arguments: `$APP $INTERNAL_PORT $INTERNAL_IP_ADDRESS`
@@ -589,11 +832,27 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `post-app-rename-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:rename`
+- Arguments: `$OLD_APP_NAME $NEW_APP_NAME`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+
+```
+
 ### `post-build-buildpack`
 
 - Description: Allows you to run commands after the build image is create for a given app. Only applies to apps using buildpacks.
 - Invoked by: `internal function dokku_build() (build phase)`
-- Arguments: `$APP`
+- Arguments: `$APP` `$SOURCECODE_WORK_DIR`
 - Example:
 
 ```shell
@@ -668,6 +927,20 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `post-container-create`
+
+- Description: This trigger should be used to do stuff to containers after they are created but before they are started. They are explicitely for commands that may involve network traffic, and _not_ for commands that are self-contained, such as chown or tar.
+- Invoked by: `dokku run`, `dokku ps:rebuild`, `dokku deploy`
+- Arguments "app|service" "$CONTAINER_ID" "$APP|$SERVICE" "$PHASE"
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
 ### `post-create`
 
 - Description: Can be used to run commands after an app is created.
@@ -760,9 +1033,10 @@ APP="$1"; verify_app_name "$APP"
 TMP_WORK_DIR="$2"
 REV="$3" # optional, may not be sent for tar-based builds
 
-pushd "$TMP_WORK_DIR" > /dev/null
+pushd "$TMP_WORK_DIR" >/dev/null
 touch Procfile
 echo "clock: some-command" >> Procfile
+popd >/dev/null
 ```
 
 ### `post-proxy-ports-update`
@@ -787,6 +1061,8 @@ haproxy-build-config "$APP"
 
 ### `post-release-buildpack`
 
+> Warning: Image mutation in this trigger may result in an invalid run state, and is heavily discouraged.
+
 - Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to apps using buildpacks.
 - Invoked by: `internal function dokku_release() (release phase)`
 - Arguments: `$APP $IMAGE_TAG`
@@ -794,26 +1070,19 @@ haproxy-build-config "$APP"
 
 ```shell
 #!/usr/bin/env bash
-# Installs a package specified by the `CONTAINER_PACKAGE` env var
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 verify_app_name "$APP"
 
-dokku_log_info1 "Installing $CONTAINER_PACKAGE..."
-
-CMD="cat > gm && \
-  dpkg -s CONTAINER_PACKAGE > /dev/null 2>&1 || \
-  (apt-get update && apt-get install -y CONTAINER_PACKAGE && apt-get clean)"
-
-ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
-test $(docker wait $ID) -eq 0
-docker commit $ID $IMAGE > /dev/null
+# TODO
 ```
 
 ### `post-release-dockerfile`
 
+> Warning: Image mutation in this trigger may result in an invalid run state, and is heavily discouraged.
+
 - Description: Allows you to run commands after environment variables are set for the release step of the deploy. Only applies to apps using a dockerfile.
 - Invoked by: `internal function dokku_release() (release phase)`
 - Arguments: `$APP $IMAGE_TAG`
@@ -852,7 +1121,7 @@ dokku config:set --no-restart $APP MANUALLY_STOPPED=1
 
 - Description: Allows you to run commands before the build image is created for a given app. For instance, this can be useful to add env vars to your container. Only applies to apps using buildpacks.
 - Invoked by: `internal function dokku_build() (build phase)`
-- Arguments: `$APP`
+- Arguments: `$APP` `$SOURCECODE_WORK_DIR`
 - Example:
 
 ```shell
@@ -896,7 +1165,7 @@ APP="$1"; GULP_CACHE_DIR="$DOKKU_ROOT/$APP/gulp"; IMAGE=$(get_app_image_name $AP
 verify_app_name "$APP"
 
 if [[ -d $GULP_CACHE_DIR ]]; then
-  docker run $DOKKU_GLOBAL_RUN_ARGS --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
+  docker run "${DOCKER_COMMIT_LABEL_ARGS[@]}" --rm -v "$GULP_CACHE_DIR:/gulp" "$IMAGE" find /gulp -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true
 fi
 ```
 
@@ -917,10 +1186,10 @@ APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG)
 verify_app_name "$APP"
 
 dokku_log_info1 "Running gulp"
-id=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d $IMAGE /bin/bash -c "cd /app && gulp default")
-test $(docker wait $id) -eq 0
-docker commit $id $IMAGE > /dev/null
-dokku_log_info1 "Building UI Complete"
+CID=$(docker run "${DOCKER_COMMIT_LABEL_ARGS[@]}" -d $IMAGE /bin/bash -c "cd /app && gulp default")
+test $(docker wait $CID) -eq 0
+DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.app-name=$APP")
+docker commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" $CID $IMAGE >/dev/null
 ```
 
 ### `pre-disable-vhost`
@@ -995,12 +1264,13 @@ verify_app_name "$APP"
 dokku_log_info1 "Installing GraphicsMagick..."
 
 CMD="cat > gm && \
-  dpkg -s graphicsmagick > /dev/null 2>&1 || \
+  dpkg -s graphicsmagick >/dev/null 2>&1 || \
   (apt-get update && apt-get install -y graphicsmagick && apt-get clean)"
 
-ID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
-test $(docker wait $ID) -eq 0
-docker commit $ID $IMAGE > /dev/null
+CID=$(docker run $DOKKU_GLOBAL_RUN_ARGS -i -a stdin $IMAGE /bin/bash -c "$CMD")
+test $(docker wait $CID) -eq 0
+DOCKER_COMMIT_LABEL_ARGS=("--change" "LABEL org.label-schema.schema-version=1.0" "--change" "LABEL org.label-schema.vendor=dokku" "--change" "LABEL com.dokku.app-name=$APP")
+docker commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" $CID $IMAGE >/dev/null
 ```
 
 ### `pre-release-dockerfile`
@@ -1085,6 +1355,21 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
+### `proxy-disable`
+
+- Description: Disables the configured proxy implementation for an app
+- Invoked by: `internally triggered by ps:restore`
+- 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
@@ -1100,10 +1385,25 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 # TODO
 ```
 
-### `proxy-disable`
+### `proxy-is-enabled`
 
-- Description: Disables the configured proxy implementation for an app
-- Invoked by: `internally triggered by ps:restore`
+- Description: Checks if there is a proxy enabled for the app
+- Invoked by:
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+# TODO
+```
+
+### `proxy-type`
+
+- Description: Returns the proxy type for an app
+- Invoked by:
 - Arguments: `$APP`
 - Example:
 
@@ -1152,11 +1452,43 @@ APP=${refname/*\//}.$reference_app
 
 if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
   REFERENCE_REPO="$DOKKU_ROOT/$reference_app"
-  git clone --bare --shared --reference "$REFERENCE_REPO" "$REFERENCE_REPO" "$DOKKU_ROOT/$APP" > /dev/null
+  git clone --bare --shared --reference "$REFERENCE_REPO" "$REFERENCE_REPO" "$DOKKU_ROOT/$APP" >/dev/null
 fi
 plugn trigger receive-app $APP $newrev
 ```
 
+### `report`
+
+- Description: Allows you to report on any custom configuration in use by your application
+- Invoked by: `dokku report`
+- Arguments: `$APP`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1";
+
+# TODO
+```
+
+### `resource-get-property`
+
+- Description: Fetches a given resource property value
+- Invoked by:
+- Arguments: `$APP` `$PROC_TYPE` `$RESOURCE_TYPE` `$PROPERTY`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+APP="$1"; PROC_TYPE="$2" RESOURCE_TYPE="$3" PROPERTY="$4"
+
+# TODO
+```
+
 ### `retire-container-failed`
 
 - Description: Allows you to run commands if/when retiring old containers has failed
@@ -1174,18 +1506,21 @@ APP="$1"; HOSTNAME=$(hostname -s)
 mail -s "$APP containers on $HOSTNAME failed to retire" ops@dokku.me
 ```
 
-### `report`
+### `scheduler-app-status`
 
-- Description: Allows you to report on any custom configuration in use by your application
-- Invoked by: `dokku report`
-- Arguments: `$APP`
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Fetch the status of an app
+- Invoked by: `dokku ps:report`
+- Arguments: `$DOKKU_SCHEDULER $APP`
 - Example:
 
 ```shell
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-APP="$1";
+DOKKU_SCHEDULER="$1"; APP="$2";
 
 # TODO
 ```
@@ -1247,6 +1582,43 @@ DOKKU_SCHEDULER="$1"; APP="$2";
 # TODO
 ```
 
+### `scheduler-is-deployed`
+
+> Warning: The scheduler plugin trigger apis are under development and may change
+> between minor releases until the 1.0 release.
+
+- Description: Allows you to check if an app has been deployed
+- Invoked by: `dokku ps:rebuild`
+- 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`
+
+> 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 container logs
+- Invoked by: `dokku logs:failed`
+- Arguments: `$DOKKU_SCHEDULER $APP $PROCESS_TYPE $TAIL $PRETTY_PRINT $NUM`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; PROCESS_TYPE="$3"; TAIL="$4"; PRETTY_PRINT="$5"; NUM="$6"
+
+# TODO
+```
+
 ### `scheduler-logs-failed`
 
 > Warning: The scheduler plugin trigger apis are under development and may change
@@ -1261,7 +1633,64 @@ DOKKU_SCHEDULER="$1"; APP="$2";
 #!/usr/bin/env bash
 
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-DOKKU_SCHEDULER="$1"; APP="$2"; ARGS="${@:3}";
+DOKKU_SCHEDULER="$1"; APP="$2";
+
+# TODO
+```
+
+### `scheduler-post-delete`
+
+> 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 deleted
+- Invoked by: `dokku apps:destroy`
+- Arguments: `$DOKKU_SCHEDULER $APP $IMAGE_TAG`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; IMAGE_TAG="$3";
+
+# TODO
+```
+
+### `scheduler-post-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 after a `dokku run` invocation is called
+- Invoked by: `dokku run`
+- Arguments: `$DOKKU_SCHEDULER $APP $CONTAINER_ID`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1"; APP="$2"; CONTAINER_ID="$3";
+
+# TODO
+```
+
+### `scheduler-retire`
+
+> 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 containers should be force retired from the system
+- Invoked by: `dokku run`
+- Arguments: `$DOKKU_SCHEDULER`
+- Example:
+
+```shell
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+DOKKU_SCHEDULER="$1";
 
 # TODO
 ```

docs/development/release-process.md

@@ -7,7 +7,7 @@ To propose a release, the following tasks need to be performed:
 ```shell
 export PACKAGECLOUD_TOKEN=SOME_TOKEN
 # supports major/minor/patch/betafish
-contrib/release
+contrib/release-dokku
 ```
 
 > If you are a maintainer and need the PACKAGECLOUD_TOKEN in order to make a release, please contact @josegonzalez to get this information.
@@ -29,7 +29,7 @@ The workflow looks like this:
 ```shell
 # having dokku-arch in ../dokku-arch
 vagrant up build-arch
-# wait for "==> build-arch: ==> Finished making: dokku 0.14.2-2 (Mon Feb 22 23:20:37 CET 2016)"
+# wait for "==> build-arch: ==> Finished making: dokku 0.20.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

@@ -1,6 +1,6 @@
-# Dokku test suite
+# Running Tests
 
-Dokku has a full test suite to assist in quick iterating development. These tests include a linter using [shellcheck](https://github.com/koalaman/shellcheck), functional unit tests using the [bats testing framework](https://github.com/sstephenson/bats), and a deployment suite of example apps that use the most popular languages and frameworks.
+Dokku has a full test suite to assist in quick iterating development. These tests include a linter using [shellcheck](https://github.com/koalaman/shellcheck), functional unit tests using the [Bats testing framework](https://github.com/bats-core/bats-core), and a deployment suite of example apps that use the most popular languages and frameworks.
 
 We maintain the Dokku test harness within the `tests` directory:
 
@@ -9,15 +9,15 @@ We maintain the Dokku test harness within the `tests` directory:
 
 ## Continuous Integration
 
-All pull requests have tests run against them on [CircleCI](https://circleci.com/), a continuous integration platform that provides Docker support for Ubuntu Trusty 14.04.
+All pull requests have tests run against them on [CircleCI](https://circleci.com/), a continuous integration platform that provides Docker support for Ubuntu Trusty 16.04.
 
-If you wish to skip tests for a particular commit - e.g. Documentation changes - you may add the `[ci skip]` designator to your commit message. Commits that *should* be tested but have the above designator will not be merged.
+If you wish to skip tests for a particular commit, e.g. documentation changes, you may add the `[ci skip]` designator to your commit message. Commits that _should_ be tested but have the above designator will not be merged.
 
-While we do provide official packages for a variety of platforms, as our test suite currently runs on Ubuntu Trusty 14.04, we only provide official installation support for that platform.
+While we do provide official packages for a variety of platforms, as our test suite currently runs on Ubuntu Trusty 16.04, we only provide official installation support for that platform and the latest LTS release of Ubuntu (currently 18.04).
 
 ## Local Test Execution
 
-- Setup Dokku in a [vagrant vm](/docs/getting-started/install/vagrant.md)
+- Setup Dokku in a [Vagrant VM](/docs/getting-started/install/vagrant.md).
 - Run the following to setup tests and execute them:
 
   ```shell
@@ -29,8 +29,8 @@ While we do provide official packages for a variety of platforms, as our test su
   # execute the entire test suite (linter, bats tests, and app deployment tests)
   make test
 
-  # run linter & update vagrant Dokku install from local git clone
-  make lint copyfiles
+  # run linter
+  make lint
 
   # execute all bats tests
   make unit-tests
@@ -39,6 +39,16 @@ While we do provide official packages for a variety of platforms, as our test su
   make deploy-tests
   ```
 
+After making changes to your local Dokku clone, don't forget to update the Vagrant Dokku install.
+
+```shell
+# update vagrant dokku install from local git clone
+make copyfiles
+
+# build a specific plugin
+make go-build-plugin copyplugin PLUGIN_NAME=apps
+```
+
 Additionally you may run a specific app deployment tests with a target similar to:
 
 ```shell
@@ -63,7 +73,7 @@ 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.
+In order to increase testing velocity, a wrapper script around Bats is available that can be used to run a single test case 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.
 
@@ -77,7 +87,7 @@ A single test can be specified as a second parameter. The test is selected by fu
 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.
+Some special characters are translated in the test listing, specifically the characters `( ) :`, while others are not. The fuzzy matching happens on test names as listed by this script, 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

@@ -1,6 +1,6 @@
 # Advanced installation
 
-You can always install Dokku straight from the latest - potentially unstable - master release via the following bash command:
+You can always install Dokku straight from the latest - potentially unstable - `master` branch via the following Bash command:
 
 ```shell
 # using a branch results in installing from source
@@ -10,7 +10,7 @@ sudo DOKKU_BRANCH=master bash bootstrap.sh
 
 ## Development
 
-If you plan on developing dokku, the easiest way to install from your own repository is cloning the repository and calling the install script. Example:
+If you plan on developing Dokku, the easiest way to install from your own repository is cloning the repository and calling the install script. Example:
 
 ```shell
 git clone https://github.com/yourusername/dokku.git
@@ -34,9 +34,9 @@ chmod +x bootstrap.sh
 sudo DOKKU_REPO=https://github.com/yourusername/dokku.git DOKKU_BRANCH=master ./bootstrap.sh
 ```
 
-## Custom herokuish build
+## Custom Herokuish build
 
-Dokku ships with a pre-built version of version of the [herokuish](https://github.com/gliderlabs/herokuish) component by default. If you want to build your own version you can specify that with an env variable.
+Dokku ships with a pre-built version of version of the [Herokuish](https://github.com/gliderlabs/herokuish) component by default. If you want to build your own version you can specify that with an environment variable.
 
 ```shell
 git clone https://github.com/dokku/dokku.git
@@ -44,29 +44,29 @@ cd dokku
 sudo BUILD_STACK=true STACK_URL=https://github.com/gliderlabs/herokuish.git make install
 ```
 
-## Skipping herokuish installation
+## Skipping Herokuish installation
 
-The `herokuish` package is recommended but not required if not using Heroku Buildpacks for deployment. Debian-based OS users can run the bootstrap installer via `sudo DOKKU_NO_INSTALL_RECOMMENDS=true bash bootstrap.sh` to skip the dependency. Please note that this will _also_ skip installation of other recommended dependencies.
+The Herokuish package is recommended but not required if not using Heroku buildpacks for deployment. Debian-based OS users can run the bootstrap installer via `sudo DOKKU_NO_INSTALL_RECOMMENDS=" --no-install-recommends " bash bootstrap.sh` to skip the dependency. Please note that this will _also_ skip installation of other recommended dependencies.
 
 ## Configuring an unattended installation
 
-Once Dokku is installed, if you are not using the web-installer, you'll want to configure a the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications.
+Once Dokku is installed, if you are not using the web-installer, you'll want to configure the virtualhost setup as well as the push user. If you do not, your installation will be considered incomplete and you will not be able to deploy applications.
 
 For Debian, unattended installation is described [Debian installation guide](/docs/getting-started/install/debian.md).
 
 *You should also stop and disable the `dokku-installer` service to remove public access to adding SSH keys.*
 
-Set up a domain using your preferred vendor and a wildcard domain pointing to the host running dokku. You can manage this global domain using the [domains plugin](/docs/configuration/domains.md).
+Set up a domain using your preferred vendor and a wildcard domain pointing to the host running Dokku. You can manage this global domain using the [domains plugin](/docs/configuration/domains.md).
 
-Follow the [user management documentation](/docs/deployment/user-management.md) in order to add ssh keys for users to Dokku, or to give other Unix accounts access to Dokku.
+Follow the [user management documentation](/docs/deployment/user-management.md) in order to add SSH keys for users to Dokku, or to give other Unix accounts access to Dokku.
 
-## VMs with less than 1GB of memory
+## VMs with less than 1 GB of memory
 
-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).
+Having less than 1 GB 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.
+To work around this issue, it might suffice to augment the Linux swap file size to a maximum of twice the physical memory size.
 
-To resize the swap file of a 512MB machine to 1GB, follow these steps while in SSH within your machine:
+To resize the swap file of a 512 MB machine to 1 GB, follow these steps while in SSH within your machine:
 
 ```shell
 cd /var

docs/getting-started/install/azure.md

@@ -1,11 +1,11 @@
-# Microsoft Azure
+# Microsoft Azure Installation Notes
 
-- If you don't already have one [generate an SSH key pair](https://help.github.com/articles/generating-ssh-keys/).
+1. 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**.
+2. 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.
+3. You'll be prompted to enter a few parameters, including a unique storage account name and a unique name for the subdomain 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.
+4. 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`.
+5. 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

@@ -4,7 +4,7 @@ As of 0.3.18, Dokku defaults to being installed via Debian package. While certai
 
 ```shell
 # install prerequisites
-sudo apt-get update -qq > /dev/null
+sudo apt-get update -qq >/dev/null
 sudo apt-get install -qq -y apt-transport-https
 
 # install docker
@@ -12,10 +12,10 @@ wget -nv -O - https://get.docker.com/ | sh
 
 # install dokku
 wget -nv -O - https://packagecloud.io/dokku/dokku/gpgkey | apt-key add -
-OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"
-echo "trusty utopic vivid wily xenial yakkety zesty artful bionic" | grep -q "$OS_ID" || OS_ID="trusty"
+OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")"
+echo "xenial bionic" | grep -q "$OS_ID" || OS_ID="bionic"
 echo "deb https://packagecloud.io/dokku/dokku/ubuntu/ ${OS_ID} main" | sudo tee /etc/apt/sources.list.d/dokku.list
-sudo apt-get update -qq > /dev/null
+sudo apt-get update -qq >/dev/null
 sudo apt-get install -qq -y dokku
 sudo dokku plugin:install-dependencies --core
 ```

docs/getting-started/install/digitalocean.md

@@ -1,14 +1,14 @@
-# Digital Ocean Droplet
+# DigitalOcean Droplet Installation Notes
 
-[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.
+[DigitalOcean](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/).
+> **Please disable IPv6**. There are known issues with IPv6 on DigitalOcean and Docker. If you would like to run Dokku on an IPv6 DigitalOcean 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 [DigitalOcean](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.
+3. Under **Choose an image > One-click apps**, choose the latest **Dokku** release for 18.04 _(version numbers may vary)_.
+4. Under **Choose a size**, select your machine spec.
+5. Under **Choose a datacenter region**, select your region.
 6. Add an SSH Key.
    * New Keys
      1. Under **Add your SSH keys** click **New SSH Key** _(this opens a dialog)_.

docs/getting-started/install/docker.md

@@ -0,0 +1,54 @@
+# Docker Installation Notes
+
+Pull the dokku/dokku image:
+
+```shell
+docker pull dokku/dokku:0.20.2
+```
+
+Next, run the image.
+
+```shell
+docker run \
+  --env DOKKU_HOSTNAME=dokku.me \
+  --name dokku \
+  --publish 3022:22 \
+  --publish 8080:80 \
+  --publish 8443:443 \
+  --volume /var/lib/dokku:/mnt/dokku \
+  --volume /var/run/docker.sock:/var/run/docker.sock \
+  dokku/dokku:0.20.2
+```
+
+Dokku is run with the following options:
+
+- The global hostname is set to `dokku.me` on boot.
+- The container name is dokku.
+- Container SSH port 22 is exposed on the host as 3022.
+- Container HTTP port 80 is exposed on the host as 8080.
+- Container HTTPS port 443 is exposed on the host as 8443.
+- Data within the container is stored on the host within the `/var/lib/dokku` directory.
+- The docker socket is mounted into container
+
+Application repositories, plugin config, and plugin data is persisted to disk within the specified host directory for `/var/lib/dokku`.
+
+To install custom plugins, create a `plugin-list` file in the host's `/var/lib/dokku` directory. The plugins listed herein will be automatically installed by Dokku on container boot. This file should be the following format:
+
+```yaml
+plugin_name: repository_url
+```
+
+An example for installing the postgres and redis plugins follows:
+
+```yaml
+postgres: https://github.com/dokku/dokku-postgres.git
+redis: https://github.com/dokku/dokku-redis.git
+```
+
+To initialize ssh-keys within the container, use `docker exec` to enter the container and run the appropriate ssh-keys commands.
+
+```shell
+docker exec -it dokku bash
+```
+
+Please see the [user management documentation](/docs/deployment/user-management.md) for more information.

docs/getting-started/install/dreamhost.md

@@ -1,4 +1,4 @@
-# Install Dokku on DreamHost Cloud Server with cloud-init
+# DreamHost Cloud Server Installation Notes
 
 Cloud-init script can be used to automate installation of Dokku on
 Dreamhost (or any other OpenStack-compatible cloud with minimal
@@ -19,7 +19,7 @@ source openrc.sh # Set the environment variables for DreamHost Cloud
 
 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
+based on Ubuntu 18.04, with 2 GB RAM and 1 CPU (the flavor called
 `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
@@ -28,7 +28,7 @@ be reused by Dokku.
 
 ```sh
 openstack server create \
-  --image Ubuntu-14.04 \
+  --image Ubuntu-18.04 \
   --flavor gp1.supersonic \
   --security-group default \
   --key-name $YOUR_SSH_KEYNAME \
@@ -46,7 +46,7 @@ server:
 apt_upgrade: true
 
 apt_sources:
- - source: "deb https://packagecloud.io/dokku/dokku/ubuntu/ trusty main"
+ - source: "deb https://packagecloud.io/dokku/dokku/ubuntu/ bionic main"
    key: |
     -----BEGIN PGP PUBLIC KEY BLOCK-----
     Version: SKS 1.1.5
@@ -107,7 +107,7 @@ apt_sources:
     =H60S
     -----END PGP PUBLIC KEY BLOCK-----
    filename: dokku.list
- - source: "deb https://apt.dockerproject.org/repo ubuntu-trusty main"
+ - source: "deb https://apt.dockerproject.org/repo ubuntu-bionic main"
    key: |
     -----BEGIN PGP PUBLIC KEY BLOCK-----
     Version: SKS 1.1.5
@@ -185,13 +185,11 @@ packages:
 ```
 
 Shortly after running the create command you will get a confirmation that the
-instance has been created, and after about a minute it should be ready to login.
-Check the IP of the instance through the web UI or by running:
+instance has been created, and after about a minute it should be ready to login. Check the IP of the instance through the web UI or by running:
 
 ```sh
 nova list
 ```
 
 SSH with the `ubuntu` username and the public key previously added.
-Keep in mind that if you logged in quick enough dokku might still be installing
-in the background, and not be ready. The installation takes a few minutes.
+Keep in mind that if you logged in quick enough Dokku might still be installing in the background, and not be ready. The installation takes a few minutes.

docs/getting-started/install/vagrant.md

@@ -1,14 +1,16 @@
-# Install Dokku using Vagrant
+# Vagrant Installation Notes
 
-- Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-- Download and install [Vagrant](http://www.vagrantup.com/downloads.html)
-- Clone Dokku
+1. Download and install [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
+
+2. Download and install [Vagrant](http://www.vagrantup.com/downloads.html).
+
+3. Clone Dokku.
 
     ```shell
     git clone https://github.com/dokku/dokku.git
     ```
 
-- Create VM
+4. Create VM.
 
     ```shell
     # Optional ENV arguments:
@@ -27,7 +29,7 @@
     vagrant up dokku-windows
     ```
 
-- Setup SSH Config in `~/.ssh/config`.
+5. Setup SSH Config in `~/.ssh/config`.
 
     ```ini
     Host dokku.me
@@ -36,8 +38,8 @@
 
     > 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.
+6. 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 (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.
+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

@@ -6,8 +6,8 @@ Dokku is an extensible, open source Platform as a Service that runs on a single
 
 To start using Dokku, you'll need a system that meets the following minimum requirements:
 
-- A fresh installation of [Ubuntu 16.04 x64](https://www.ubuntu.com/download), [Ubuntu 14.04 x64](https://www.ubuntu.com/download), [Debian 8.2 x64](https://www.debian.org/distrib/) or [CentOS 7 x64](https://www.centos.org/download/) *(experimental)* with the FQDN set <sup>[1]</sup>
-- At least `1GB` of system memory <sup>[2]</sup>
+- A fresh installation of [Ubuntu 16.04/18.04 x64](https://www.ubuntu.com/download), [Debian 9+ x64](https://www.debian.org/distrib/) or [CentOS 7 x64](https://www.centos.org/download/) *(experimental)* with the FQDN set <sup>[1]</sup>
+- At least 1 GB of system memory <sup>[2]</sup>
 
 You can *optionally* have a domain name pointed at the host's IP, though this is not necessary.
 
@@ -15,19 +15,19 @@ Dokku is designed for usage on a fresh VM installation, and should install all n
 
 ### Installing the latest stable version
 
-#### 1. Install dokku
+#### 1. Install Dokku
 
 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.14.2/bootstrap.sh;
-sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh
+wget https://raw.githubusercontent.com/dokku/dokku/v0.20.2/bootstrap.sh;
+sudo DOKKU_TAG=v0.20.2 bash bootstrap.sh
 ```
 
 The installation process takes about 5-10 minutes, depending upon internet connection speed.
 
-If you're using Debian 8 or Ubuntu 14.04, make sure your package manager is configured to install a sufficiently recent version of nginx<sup>[3]</sup>, otherwise, the installation may fail due to "unmet dependencies" relating nginx.
+If you're using Debian 9+ or Ubuntu 18.04, make sure your package manager is configured to install a sufficiently recent version of nginx<sup>[3]</sup>, otherwise, the installation may fail due to `unmet dependencies` relating nginx.
 
 #### 2. Setup SSH key and Virtualhost Settings
 
@@ -47,13 +47,14 @@ Once you save your settings, the web admin will self-terminate and you should be
 
 For various reasons, certain hosting providers may have other steps that should be preferred to the above. If hosted on any of the following popular hosts, please follow the linked to instructions:
 
-- [Digital Ocean Installation Notes](/docs/getting-started/install/digitalocean.md)
+- [DigitalOcean Installation Notes](/docs/getting-started/install/digitalocean.md)
 - [DreamHost Cloud Installation Notes](/docs/getting-started/install/dreamhost.md)
 - [Microsoft Azure Installation Notes](/docs/getting-started/install/azure.md)
 
-As well, you may wish to customize your installation in some other fashion. or experiment with vagrant. The guides below should get you started:
+As well, you may wish to customize your installation in some other fashion. or experiment with Vagrant. The guides below should get you started:
 
 - [Debian Package Installation Notes](/docs/getting-started/install/debian.md)
+- [Docker-based Installation Notes](/docs/getting-started/install/docker.md)
 - [RPM Package Installation Notes](/docs/getting-started/install/rpm.md)
 - [Vagrant Installation Notes](/docs/getting-started/install/vagrant.md)
 - [Advanced Install Customization](/docs/getting-started/advanced-installation.md)

docs/getting-started/troubleshooting.md

@@ -1,6 +1,39 @@
 # Troubleshooting
 
-__Symptom:__ I deployed my app but I am getting the default nginx page
+> New as of 0.17.0
+
+```
+trace:on                                       # Enables trace mode
+trace:off                                      # Disables trace mode
+```
+
+## Trace Mode
+
+By default, Dokku will constrain the amount of output displayed for any given command run. The verbosity of output can be increased by enabling trace mode. Trace mode will turn on the `set -x` flag for bash plugins, while other plugins are free to respect the environment variable `DOKKU_TRACE` and log differently as approprate. Trace mode can be useful to see _where_ plugins are running commands that would otherwise be unexpected.
+
+To enable trace mode, run `trace:on`
+
+```shell
+dokku trace:on
+```
+
+```
+-----> Enabling trace mode
+```
+
+Trace mode can be disabled with `trace:off`
+
+```shell
+dokku trace:off
+```
+
+```
+-----> Disabling trace mode
+```
+
+## Common Problems
+
+__Symptom:__ I deployed my app but I am getting the default nginx page.
 
 __Solution:__
 
@@ -11,7 +44,7 @@ nginx -t
 ## nginx: [emerg] could not build the server_names_hash, you should increase server_names_hash_bucket_size: 32
 ```
 
-If you get a similar error just edit __/etc/nginx/nginx.conf__ and add the following line to your http section:
+If you get a similar error just edit `/etc/nginx/nginx.conf` and add the following line to your `http` section:
 
 ```nginx
 http {
@@ -35,45 +68,30 @@ Save the file and try stopping nginx and starting it again:
 
 ***
 
-__Symptom:__ I want to deploy my app, but while pushing I get the following error
+__Symptom:__ I want to deploy my app, but while pushing I get the following error.
 
     ! [remote rejected] master -> master (pre-receive hook declined)
 
 __Solution:__
 
-The `remote rejected` error does not give enough information. Anything could have failed.
-
-To enable Dokku tracing, simply run the following command:
-
-```shell
-# since 0.3.9
-dokku trace on
-```
-
-In versions older than 0.3.9, you can create a `/home/dokku/dokkurc` file containing the following :
-
-```shell
-export DOKKU_TRACE=1
-```
-
-This will trace all of dokku's activity. If this does not help you, create a [gist](https://gist.github.com) containing the full log, and create an issue.
+The `remote rejected` error does not give enough information. Anything could have failed. Enable trace mode and begin debugging. If this does not help you, create a [gist](https://gist.github.com) containing the full log, and create an issue.
 
 ***
 
-__Symptom:__ I get the aforementioned error in the build phase (after turning on Dokku tracing)
+__Symptom:__ I get the aforementioned error in the build phase (after turning on Dokku tracing).
 
-  Most errors that happen in this phase are due to transient network issues (either locally or remotely) buildpack bugs.
+Most errors that happen in this phase are due to transient network issues (either locally or remotely) buildpack bugs.
 
 __Solution (Less solution, more helpful troubleshooting steps):__
 
-  Find the failed phase's container image (*077581956a92* in this example)
+Find the failed phase's container image (`077581956a92` in this example).
 
 ```shell
 docker ps -a  | grep build
 ## 94d9515e6d93        077581956a92                "/build"       29 minutes ago      Exited (0) 25 minutes ago                       cocky_bell
 ```
 
-  Start a new container with the failed image and poke around (i.e. ensure you can access the internet from within the container or attempt the failed command, if known)
+Start a new container with the failed image and poke around (i.e. ensure you can access the internet from within the container or attempt the failed command, if known).
 
 ```shell
 docker run -ti 077581956a92 /bin/bash
@@ -84,38 +102,37 @@ tar tzf node-v0.10.30-linux-x64.tar.gz
 ## ...
 ```
 
-  Sometimes (especially on DO) deploying again seems to get past these seemingly transient issues
-  Additionally we've seen issues if changing networks that have different DNS resolvers. In this case, you can run the following to update your resolv.conf
+Sometimes (especially on DigitalOcean) deploying again seems to get past these seemingly transient issues. Additionally we've seen issues if changing networks that have different DNS resolvers. In this case, you can run the following to update your `resolv.conf`.
 
 ```shell
 resolvconf -u
 ```
 
-Please see https://github.com/dokku/dokku/issues/841 and https://github.com/dokku/dokku/issues/649
+Please see https://github.com/dokku/dokku/issues/841 and https://github.com/dokku/dokku/issues/649.
 
 ***
 
-__Symptom:__ I want to deploy my app but I am getting asked for the password of the git user and the error message
+__Symptom:__ I want to deploy my app but I am getting asked for the password of the Git user and the error message.
 
     fatal: 'NAME' does not appear to be a git repository
     fatal: Could not read from remote repository.
 
 __Solution:__
 
-You get asked for a password because your ssh secret key can't be found. This may happen if the private key corresponding to the public key you added with `sshcommand acl-add` is not located in the default location `~/.ssh/id_rsa`.
+You get asked for a password because your SSH secret key can't be found. This may happen if the private key corresponding to the public key you added with `sshcommand acl-add` is not located in the default location `~/.ssh/id_rsa`.
 
-You have to point ssh to the correct secret key for your domain name. Add the following to your `~/.ssh/config`:
+You have to point SSH to the correct secret key for your domain name. Add the following to your `~/.ssh/config`:
 
 ```ini
 Host DOKKU_HOSTNAME
   IdentityFile "~/.ssh/KEYNAME"
 ```
 
-Also see [issue #116](https://github.com/dokku/dokku/issues/116)
+Also see [issue #116](https://github.com/dokku/dokku/issues/116).
 
 ***
 
-__Symptom:__ I successfully deployed my application with no deployment errors and receiving Bad Gateway when attempting to access the application
+__Symptom:__ I successfully deployed my application with no deployment errors and receiving **Bad Gateway** when attempting to access the application.
 
 __Solution:__
 
@@ -127,11 +144,11 @@ When specifying your port you may want to use something similar to:
 var port = process.env.PORT || 3000
 ```
 
-Please see https://github.com/dokku/dokku/issues/282
+Please see https://github.com/dokku/dokku/issues/282.
 
 ***
 
-__Symptom:__ Deployment fails because of slow internet connection, messages shows `gzip: stdin: unexpected end of file`
+__Symptom:__ Deployment fails because of slow internet connection, messages shows `gzip: stdin: unexpected end of file`.
 
 __Solution:__
 
@@ -146,16 +163,16 @@ If you see output similar this when deploying:
  !     tar: Error is not recoverable: exiting now
 ```
 
-it might that the curl command that is supposed to fetch the buildpack (anything in the low megabyte file size range) takes too long to finish, due to slowish connection.  To overwrite the default values (connection timeout: 90 seconds, total maximum time for operation: 600 seconds), set the following environment variables:
+it might that the cURL command that is supposed to fetch the buildpack (anything in the low megabyte file size range) takes too long to finish, due to slowish connection.  To overwrite the default values (connection timeout: 90 seconds, total maximum time for operation: 600 seconds), set the following environment variables:
 
 ```shell
 dokku config:set --global CURL_TIMEOUT=1200
 dokku config:set --global CURL_CONNECT_TIMEOUT=180
 ```
 
-Please see https://github.com/dokku/dokku/issues/509
+Please see https://github.com/dokku/dokku/issues/509.
 
-Another reason for this error (although it may respond immediately ruling out a timeout issue) may be because you've set the config setting `SSL_CERT_FILE`. Using a config setting with this key interferes with the buildpack's ability to download it's dependencies, so you must rename the config setting to something else, e.g. `MY_APP_SSL_CERT_FILE`.
+Another reason for this error (although it may respond immediately ruling out a timeout issue) may be because you've set the config setting `SSL_CERT_FILE`. Using a config setting with this key interferes with the buildpack's ability to download its dependencies, so you must rename the config setting to something else, e.g. `MY_APP_SSL_CERT_FILE`.
 
 ***
 
@@ -163,7 +180,7 @@ __Symptom:__ Build fails with `Killed` message.
 
 __Solution:__
 
-This generally occurs when the server runs out of memory. You can either add more ram to your server or setup swap space. The follow script will create 2gb of swap space.
+This generally occurs when the server runs out of memory. You can either add more RAM to your server or setup swap space. The follow script will create 2 GB of swap space.
 
 ```shell
 sudo install -o root -g root -m 0600 /dev/null /swapfile
@@ -181,13 +198,13 @@ __Symptom:__ I successfully deployed my application with no deployment errors bu
 
 __Solution:__
 
-This can occur if Dokku is running on a system with a firewall like ufw enabled (some OS versions like Ubuntu 16.04 have this enabled by default). You can check if this is your case by running the following script:
+This can occur if Dokku is running on a system with a firewall like UFW enabled (some OS versions like Ubuntu have this enabled by default). You can check if this is your case by running the following script:
 
 ```shell
 sudo ufw status
 ```
 
-If the previous script returned `Status: active` and a list of ports, ufw is enabled and is probably the cause of the symptom described above. To disable it, run:
+If the previous script returned `Status: active` and a list of ports, UFW is enabled and is probably the cause of the symptom described above. To disable it, run:
 
 ```shell
 sudo ufw disable
@@ -201,6 +218,6 @@ __Solution:__
 
 This isn't usually an issue with Dokku, but rather an app config problem. This can happen when your application is configured to enforce secure connections/HSTS, but you don't have SSL set up for the app.
 
-In Rails at least, if your `application.rb` or `environmnents/production.rb` include the line `configure.force_ssl = true`, which includes HSTS try commenting that out and redeploying.
+In Rails at least, if your `application.rb` or `environmnents/production.rb` include the line `configure.force_ssl = true` which includes HSTS, try commenting that out and redeploying.
 
 If this solves the issue temporarily, longer term you should consider [configuring SSL](http://dokku.viewdocs.io/dokku/configuration/ssl/).

docs/getting-started/upgrading.md

@@ -4,7 +4,7 @@ If your version of Dokku is pre 0.3.0 (check with `dokku version`), we recommend
 
 ## Security Updates
 
-For any security related updates, please follow our [twitter account](https://twitter.com/dokku). As Dokku does not run any daemons, the security risk introduced by our software is minimal.
+For any security related updates, please follow our [Twitter account](https://twitter.com/dokku). As Dokku does not run any daemons, the security risk introduced by our software is minimal.
 
 Your operating system may occasionally provide security updates. We recommend setting unattended upgrades for your operating system. Here are some helpful links:
 
@@ -51,6 +51,10 @@ Before upgrading, check the migration guides to get comfortable with new feature
 
 - [0.10 Migration Guide](/docs/appendices/0.10.0-migration-guide.md)
 
+### 0.20 Migration Guide
+
+- [0.20 Migration Guide](/docs/appendices/0.20.0-migration-guide.md)
+
 ## Upgrade Instructions
 
 If Dokku was installed via `apt-get install dokku` or `bootstrap.sh` (most common), upgrade with:
@@ -68,7 +72,7 @@ dokku --quiet apps:list | xargs -L1 dokku ps:stop
 dokku --quiet apps | xargs -L1 dokku ps:stop
 
 # update dokku and its dependencies
-sudo apt-get install -qq -y dokku herokuish sshcommand plugn
+sudo apt-get install -qq -y dokku herokuish sshcommand plugn gliderlabs-sigil
 
 # rebuild all of your applications
 dokku ps:rebuildall # rebuilds all applications
@@ -101,7 +105,7 @@ sudo make install
 dokku ps:rebuildall # rebuilds all applications
 ```
 
-To upgrade herokuish from source, upgrade with:
+To upgrade Herokuish from source, upgrade with:
 
 ```shell
 cd /tmp

docs/getting-started/where-to-get-help.md

@@ -6,7 +6,7 @@ If you’re stuck, there are a number of places you can get help:
 
 - [http://dokku.viewdocs.io/dokku/](/docs/)
 
-The Official Dokku website is always a great place to visit. It features links to oft-used developer tools, community plugins, and guides on using dokku.
+The Official Dokku website is always a great place to visit. It features links to oft-used developer tools, community plugins, and guides on using Dokku.
 
 ## The IRC and Slack Channels
 

docs/home.html

@@ -10,30 +10,30 @@
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.20.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.20.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.20.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.20.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.20.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.20.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.20.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.20.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.20.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/style.css" rel="stylesheet">
     <!-- <link href="/dokku/docs/assets/style.css" rel="stylesheet"> -->
     <style>
       .sponsors {
@@ -127,12 +127,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.14.2/bootstrap.sh</span>
+            <span class="command">wget https://raw.githubusercontent.com/dokku/dokku/v0.20.2/bootstrap.sh</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">sudo DOKKU_TAG=v0.14.2 bash bootstrap.sh</span>
+            <span class="command">sudo DOKKU_TAG=v0.20.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>
@@ -164,12 +164,12 @@
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">export OS_ID="$(lsb_release -cs 2> /dev/null || echo "trusty")"</span>
+            <span class="command">export OS_ID="$(lsb_release -cs 2>/dev/null || echo "bionic")"</span>
           </p>
           <p class="line">
             <span class="path"></span>
             <span class="prompt">$</span>
-            <span class="command">echo "utopicvividwilyxenialyakketyzestyartfulbionic" | grep -q "$OS_ID" || OS_ID="trusty"</span>
+            <span class="command">echo "xenial bionic" | grep -q "$OS_ID" || OS_ID="bionic"</span>
           </p>
           <p class="line">
             <span class="path"></span>
@@ -312,7 +312,7 @@
 
     <div class="container">
       <footer>
-        <p>&copy; 2013-2019 Dokku</p>
+        <p>&copy; 2013-2020 Dokku</p>
       </footer>
     </div>
     <script>

docs/networking/network.md

@@ -1,8 +1,13 @@
 # Network Management
 
-> New as of 0.11.0
+> New as of 0.11.0, Enhanced in 0.20.0
 
 ```
+network:create <network>                 # Creates an attachable docker network
+network:destroy <network>                # Destroys a docker network
+network:exists <network>                 # Checks if a docker network exists
+network:info <network>                   # Outputs information about a docker network
+network:list                             # Lists all docker networks
 network:report [<app>] [<flag>]          # Displays a network report for one or more apps
 network:rebuild <app>                    # Rebuilds network settings for an app
 network:rebuildall                       # Rebuild network settings for all apps
@@ -13,6 +18,161 @@ The Network plugin allows developers to abstract the concept of container networ
 
 ## Usage
 
+### Listing networks
+
+> New as of 0.20.0, Requires Docker 1.21+
+
+You can easily list all available networks using the `network:list` command:
+
+```shell
+dokku network:list
+```
+
+```
+=====> Networks
+bridge
+host
+none
+test-network
+```
+
+Note that you can easily hide extra output from Dokku commands by using the `--quiet` flag, which makes it easier to parse on the command line.
+
+```shell
+dokku --quiet network:list
+```
+
+```
+bridge
+host
+none
+test-network
+```
+
+### Creating a network
+
+> New as of 0.20.0, Requires Docker 1.21+
+
+Docker networks can be created via the `network:create` command. Executing this command will create an attachable `bridge` network. This can be used to route requests between containers without going through any public network.
+
+```shell
+dokku network:create test-network
+```
+
+```
+-----> Creating network test-network
+```
+
+Specifying other additional flags or other types of networks can be created directly via the `docker` command.
+
+### Destroying a network
+
+> New as of 0.20.0, Requires Docker 1.21+
+
+A Docker network without any associated containers may be destroyed via the `network:destroy` command. Docker will refuse to destroy networks that have containers attached.
+
+```shell
+dokku network:destroy test-network
+```
+
+```shell
+ !     WARNING: Potentially Destructive Action
+ !     This command will destroy network test.
+ !     To proceed, type "test"
+> test
+-----> Destroying network test
+```
+
+As the command is destructive, it will default to asking for confirmation before executing the removal of the network. This may be avoided by providing the `--force` flag:
+
+```shell
+dokku --force network:destroy test-network
+```
+
+```shell
+-----> Destroying network test
+```
+
+### Checking if a network exists
+
+> New as of 0.20.0, Requires Docker 1.21+
+
+For CI/CD pipelines, it may be useful to see if an network exists before creating a new network. You can do so via the `network:exists` command:
+
+```shell
+dokku network:exists nonexistent-network
+```
+
+```
+Network does not exist
+```
+
+The `network:exists` command will return non-zero if the network does not exist, and zero if it does.
+
+### Checking network info
+
+> New as of 0.20.0, Requires Docker 1.21+
+
+Network information can be retrieved via the `network:info` command. This is a slightly different version of the `docker network` command.
+
+```shell
+dokku network:info test-network
+```
+
+```
+// TODO
+```
+
+### Attaching an app to a network
+
+> New as of 0.20.0, Requires Docker 1.21+
+
+Apps will default to being associated with the `bridge` network, but can be attached to `attachable` networks by changing the `attach-post-create` or `attach-post-deploy` network properties when using the [docker-local scheduler](/docs/advanced-usage/schedulers/docker-local.md). A change in these values will require an app deploy or rebuild.
+
+```shell
+# associates the network after a container is created but before it is started
+dokku network:set node-js-app attach-post-create test-network
+
+# associates the network after the deploy is successful but before the proxy is updated
+dokku network:set node-js-app attach-post-deploy other-test-network
+```
+
+Setting the `attach` network property to an empty value will de-associate the container with the network.
+
+```shell
+dokku network:set node-js-app attach-post-create
+dokku network:set node-js-app attach-post-deploy
+```
+
+When a container created for a deployment is being attached to a network - regardless of which `attach` property was used - a network alias of the pattern `APP.PROC_TYPE` will be added to all containers. This can be used to load-balance requests between containers.
+
+#### When to attach containers to a network
+
+Containers can be attached to a network for a variety of reasons:
+
+- A background process in one app needs to communicate to a webservice in another app
+- An app needs to talk to a container not managed by Dokku in a secure manner
+- A custom network that allows transparent access to another host exists and is necessary for an app to run
+
+Whatever the reason, the semantics of the two network hooks are important and are outlined before.
+
+- `attach-post-create`:
+  - Phase it applies to:
+    - `build`: Intermediate containers created during the build process.
+    - `deploy`: Deployed app containers.
+    - `run`: Containers created by the `run` command.
+  - Container state on attach: `created` but not `running`
+  - Use case: When the container needs to access a resource on the network.
+  - Example: The app needs to talk to a database on the same network when it first boots.
+- `attach-post-deploy`
+  - Phase it applies to:
+    - `deploy`: Deployed app containers.
+  - Container state on attach: `running`
+  - Use case: When another container on the network needs to access _this_ container.
+  - Example: A background process needs to communicate with the web process exposed by this container.
+
+> Warning: If the attachment fails at this stage, this may result in your application failing to respond to proxied requests once older containers are removed.
+
 ### Rebuilding network settings
 
 There are cases where you may need to rebuild the network configuration for an app, such as on app boot or container restart. In these cases, you can use the `network:rebuild` command:
@@ -37,7 +197,7 @@ dokku network:rebuildall
 
 > This functionality does not control the `--network` docker flag. Please use the [docker-options plugin](docs/advanced-usage/docker-options.md) to manage this flag.
 
-By default, an application will only bind to the internal interface. This behavior can be modified per app by changing the `bind-all-interfaces` network property.
+By default, an app will only bind to the internal interface. This behavior can be modified per app by changing the `bind-all-interfaces` network property.
 
 ```shell
 # bind to the default docker interface (`docker0`) with a random internal ip
@@ -85,7 +245,7 @@ CONTAINER ID        IMAGE                      COMMAND                CREATED
 d6499edb0edb        dokku/node-js-app:latest   "/bin/bash -c '/star   About a minute ago   Up About a minute   0.0.0.0:49153->5000/tcp   node-js-app.web.1
 ```
 
-### Displaying network reports about an app
+### Displaying network reports for an app
 
 You can get a report about the app's network status using the `network:report` command:
 

docs/networking/port-management.md

@@ -3,23 +3,29 @@
 > New as of 0.5.0, Enhanced in 0.6.0
 
 ```
-proxy:ports <app>                        # List proxy port mappings for app
-proxy:ports-set <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Set proxy port mappings for app
-proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Add proxy port mappings for app
-proxy:ports-clear <app>                  # Clear all proxy port mappings for app
-proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...]                      # Unset proxy port mappings for app
+proxy:ports <app>                        # List proxy port mappings for an app
+proxy:ports-add <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Add proxy port mappings to an app
+proxy:ports-clear <app>                  # Clear all proxy port mappings for an app
+proxy:ports-remove <app> <host-port> [<host-port>|<scheme>:<host-port>:<container-port>...]                      # Remove specific proxy port mappings from an app
+proxy:ports-set <app> <scheme>:<host-port>:<container-port> [<scheme>:<host-port>:<container-port>...]           # Set proxy port mappings for an app
 ```
 
 In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into the proxy plugin. Dokku 0.6.0 introduced the ability to map host ports to specific container ports. In the future this will allow other proxy software - such as HAProxy or Caddy - to be used in place of nginx.
 
 ## Usage
 
-### Proxy port mapping
+> Warning: Mapping alternative ports may conflict with the active firewall installed on your server or hosting provider. Such software includes - but is not limited to - AWS Security Groups, iptables, and UFW. Please consult the documentation for those softwares as applicable.
 
 > New as of 0.6.0
 
 You can now configure `host -> container` port mappings with the `proxy:ports-*` commands. This mapping is currently supported by the built-in nginx-vhosts plugin.
 
+By default, buildpack apps and dockerfile apps **without** explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on port `80` (and additionally a listener on 443 if ssl is enabled) that will proxy to the application container on port `5000`. Dockerfile apps **with** explicitly exposed ports will be configured with a listener on each exposed port and will proxy to that same port of the deployed application container.
+
+> Note: This default behavior **will not** be automatically changed on subsequent pushes and must be manipulated with the `proxy:ports-*` commands detailed below.
+
+### Listing port mappings
+
 To inspect the port mapping for a given application, use the `proxy:ports` command:
 
 ```shell
@@ -42,6 +48,8 @@ curl http://node-js-app.dokku.me
 Hello World!
 ```
 
+### Adding a custom port mapping
+
 There are cases where we may wish for the service to be listening on more than one port, such as port 8080. Normally, this would not be possible:
 
 ```shell
@@ -63,7 +71,6 @@ dokku proxy:ports-add node-js-app http:8080:5000
        DOKKU_PROXY_PORT_MAP: http:80:5000 http:8080:5000
 -----> Configuring node-js-app.dokku.me...(using built-in template)
 -----> Creating http nginx.conf
------> Running nginx-pre-reload
        Reloading nginx
 ```
 
@@ -87,6 +94,8 @@ curl http://node-js-app.dokku.me:8080
 Hello World!
 ```
 
+### Setting all port mappings at once
+
 Port mappings can also be force set using the `proxy:ports-set` command.
 
 ```shell
@@ -98,19 +107,22 @@ dokku proxy:ports-set node-js-app http:8080:5000
        DOKKU_PROXY_PORT_MAP: http:80:5000 http:8080:5000
 -----> Configuring node-js-app.dokku.me...(using built-in template)
 -----> Creating http nginx.conf
------> Running nginx-pre-reload
        Reloading nginx
 ```
 
+### Removing a port mapping
+
 A port mapping can be removed using the `proxy:ports-remove` command if it no longer necessary:
 
 ```shell
 dokku proxy:ports-remove node-js-app http:80:5000
 ```
 
-By default, buildpack apps and dockerfile apps **without** explicitly exposed ports (i.e. using the `EXPOSE` directive) will be configured with a listener on port `80` (and additionally a listener on 443 if ssl is enabled) that will proxy to the application container on port `5000`. Dockerfile apps **with** explicitly exposed ports will be configured with a listener on each exposed port and will proxy to that same port of the deployed application container.
+Ports may also be removed by specifying only the `host-port` value. This effectively acts as a wildcard and removes all mappings for that particular host port.
 
-> Note: This default behavior **will not** be automatically changed on subsequent pushes and must be manipulated with the `proxy:ports-*` syntax detailed above.
+```shell
+dokku proxy:ports-remove node-js-app http:80
+```
 
 ## Port management by Deployment Method
 
@@ -124,7 +136,7 @@ For buildpack deployments, your application *must* respect the `PORT` environmen
 
 > Changed as of 0.5.0
 
-Dokku's default proxy implementation - nginx - only supports HTTP request proxying. At this time, we do not support proxying plain TCP or UDP ports. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`. If you would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/docs/advanced-usage/proxy-management.md).
+Dokku's default proxy implementation - nginx - supports HTTP and GRPC request proxying. At this time, we do not support proxying plain TCP or UDP ports. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`. If you would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/docs/advanced-usage/proxy-management.md).
 
 #### Applications using EXPOSE
 
@@ -133,7 +145,7 @@ Dokku will extract all tcp ports exposed using the `EXPOSE` directive (one port
 For example, if the Dokku installation is configured with the domain `dokku.me` and an application named `node-js-app` is deployed with following Dockerfile:
 
 ```
-FROM ubuntu:14.04
+FROM ubuntu:18.04
 EXPOSE 1234
 RUN python -m SimpleHTTPServer 1234
 ```

docs/networking/proxy-management.md

@@ -19,7 +19,7 @@ In Dokku 0.5.0, port proxying was decoupled from the `nginx-vhosts` plugin into
 
 From Dokku versions `0.5.0` until `0.11.0`, enabling or disabling an application's proxy would **also** control whether or not the application was bound to all interfaces - e.g. `0.0.0.0`. As of `0.11.0`, this is now controlled by the network plugin. Please see the [network documentation](/docs/networking/network.md#container-network-interface-binding) for more information.
 
-### Displaying proxy reports about an app
+### Displaying proxy reports for an app
 
 > New as of 0.8.1
 
@@ -69,7 +69,8 @@ The proxy port scheme is as follows:
 
 - `SCHEME:HOST_PORT:CONTAINER_PORT`
 
-The scheme metadata can be used by proxy implementations in order to properly handle proxying of requests. For example, the built-in `nginx-vhosts` proxy implementation supports both the `http` and `https` schemes.
+The scheme metadata can be used by proxy implementations in order to properly handle proxying of requests. For example, the built-in `nginx-vhosts` proxy implementation supports the `http`, `https`, `grpc` and `grpcs` schemes. 
+For the `grpc` and `grpcs` see [nginx blog post on grpc](https://www.nginx.com/blog/nginx-1-13-10-grpc/).
 
 Developers of proxy implementations are encouraged to use whatever schemes make the most sense, and ignore configurations which they do not support. For instance, a `udp` proxy implementation can safely ignore `http` and `https` port mappings.
 

docs/template.html

@@ -9,26 +9,26 @@
     <meta name="author" content="">
     <title>Dokku - The smallest PaaS implementation you've ever seen</title>
 
-    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/apple-touch-icon-180x180.png">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/android-chrome-192x192.png" sizes="192x192">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
-    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
-    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/manifest.json">
-    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/favicon.ico">
+    <link rel="apple-touch-icon" sizes="57x57" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.20.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.20.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.20.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.20.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.20.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.20.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.20.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.20.2/docs/assets/favicons/apple-touch-icon-180x180.png">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/favicon-32x32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.20.2/docs/assets/favicons/favicon-96x96.png" sizes="96x96">
+    <link rel="icon" type="image/png" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/favicon-16x16.png" sizes="16x16">
+    <link rel="manifest" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/manifest.json">
+    <link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/mstile-144x144.png">
-    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/favicons/browserconfig.xml">
+    <meta name="msapplication-TileImage" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.2/docs/assets/favicons/mstile-144x144.png">
+    <meta name="msapplication-config" content="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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.jsdelivr.net/gh/dokku/dokku@v0.14.2/docs/assets/style.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/gh/dokku/dokku@v0.20.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>
@@ -121,7 +121,7 @@
             <a href="/{{NAME}}/deployment/application-management/" class="list-group-item">Application Management</a>
             <a href="/{{NAME}}/deployment/logs/" class="list-group-item">Application Logs</a>
             <a href="/{{NAME}}/deployment/remote-commands/" class="list-group-item">Remote Commands</a>
-            <a href="/{{NAME}}/deployment/one-off-processes/" class="list-group-item">One Off Processes/Cron</a>
+            <a href="/{{NAME}}/deployment/one-off-processes/" class="list-group-item">One-Off Processes/Cron</a>
             <a href="/{{NAME}}/deployment/process-management/" class="list-group-item">Process Scaling</a>
             <a href="/{{NAME}}/deployment/user-management/" class="list-group-item">User Management</a>
             <a href="/{{NAME}}/deployment/zero-downtime-deploys/" class="list-group-item">Zero Downtime Deploy Checks</a>
@@ -157,6 +157,7 @@
             <a href="/{{NAME}}/advanced-usage/persistent-storage/" class="list-group-item">Persistent Storage</a>
             <a href="/{{NAME}}/advanced-usage/plugin-management/" class="list-group-item">Plugin Management</a>
             <a href="/{{NAME}}/advanced-usage/repository-management/" class="list-group-item">Repository Management</a>
+            <a href="/{{NAME}}/advanced-usage/resource-management/" class="list-group-item">Resource Management</a>
 
             <a href="#" class="list-group-item disabled">Schedulers</a>
 

dokku

@@ -2,6 +2,7 @@
 set -eo pipefail
 shopt -s nullglob
 
+export DOCKER_BIN=docker
 if [[ -r /etc/default/dokku ]]; then
   # shellcheck disable=SC1091
   source /etc/default/dokku
@@ -36,7 +37,11 @@ DOKKU_DISTRO=$(
   echo "$ID"
 )
 
-export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish"}
+# Specify twice so that only host-level
+# configuration can ever override the DOCKER_BIN value
+export DOCKER_BIN=${DOCKER_BIN:="docker"}
+
+export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish:latest"}
 export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"}
 
 export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}
@@ -51,12 +56,14 @@ export DOKKU_SYSTEM_USER=${DOKKU_SYSTEM_USER:="dokku"}
 export DOKKU_API_VERSION=1
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
 export DOKKU_VALID_EXIT=0
+export DOKKU_PID="$BASHPID"
 
 export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
 export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
 
 export DOKKU_CONTAINER_LABEL=dokku
-export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL"
+export DOKKU_GLOBAL_BUILD_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=$DOKKU_CONTAINER_LABEL"
+export DOKKU_GLOBAL_RUN_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=$DOKKU_CONTAINER_LABEL"
 
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
@@ -66,6 +73,9 @@ skip_arg=false
 if [[ "${args[0]}" =~ ^--.* ]]; then
   for arg in "$@"; do
     $skip_arg && skip_arg=false && continue
+    if [[ "$arg" == "--version" ]]; then
+      continue
+    fi
     if [[ "$arg" == "--app" ]]; then
       shift 2 && skip_arg=true
     elif [[ "$arg" =~ ^--.* ]]; then
@@ -77,13 +87,13 @@ if [[ "${args[0]}" =~ ^--.* ]]; then
 fi
 ! has_tty && DOKKU_QUIET_OUTPUT=1
 
-if [[ $(id -un) != "dokku" ]] && [[ ! $1 =~ plugin:* ]] && [[ ! $1 == "ssh-keys:add" ]]; then
+if [[ $(id -un) != "dokku" ]] && [[ ! $1 =~ plugin:* ]] && [[ $1 != "ssh-keys:add" ]] && [[ $1 != "ssh-keys:remove" ]]; then
   export SSH_USER=$(id -un)
   sudo -u dokku -E -H "$0" "$@"
   exit $?
 fi
 
-if [[ $1 =~ ^plugin:.* && $1 != "plugin:help" && $1 != "plugin:list" ]] || [[ $1 == "ssh-keys:add" ]]; then
+if [[ $1 =~ ^plugin:.* && $1 != "plugin:help" && $1 != "plugin:list" ]] || [[ $1 == "ssh-keys:add" ]] || [[ $1 == "ssh-keys:remove" ]]; then
   if [[ $(id -un) != "root" ]]; then
     dokku_log_fail "This command must be run as root"
   else
@@ -126,17 +136,14 @@ execute_dokku_cmd() {
     nginx | nginx:*)
       local PLUGIN_NAME=${PLUGIN_NAME/nginx/nginx-vhosts}
       ;;
-    deploy | delete | ls | run | cleanup)
-      local PLUGIN_NAME="00_dokku-standard"
-      ;;
-    trace | url | urls | report | version)
+    deploy | run | cleanup | url | urls | report)
       local PLUGIN_NAME="00_dokku-standard"
       ;;
   esac
 
   if [[ "$(readlink -f "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}")" == *core-plugins* ]]; then
     [[ ${argv[0]} == "$PLUGIN_CMD" ]] && shift 1
-    if [[ ! -z $DOKKU_APP_NAME ]]; then
+    if [[ -n $DOKKU_APP_NAME ]]; then
       if [[ "$PLUGIN_CMD" == config* ]] && [[ ${argv[1]} == "--no-restart" ]]; then
         shift 1
         set -- "--no-restart" "$DOKKU_APP_NAME" "$@"
@@ -233,6 +240,17 @@ case "$1" in
     fi
     ;;
 
+  version | -v | --version)
+    if [[ -f "$DOKKU_LIB_ROOT/STABLE_VERSION" ]]; then
+      DOKKU_VERSION=$(cat "${DOKKU_LIB_ROOT}/STABLE_VERSION")
+    elif [[ -f "$DOKKU_LIB_ROOT/VERSION" ]]; then
+      DOKKU_VERSION=$(cat "${DOKKU_LIB_ROOT}/VERSION")
+    else
+      dokku_log_fail "Unable to determine dokku's version"
+    fi
+    echo "dokku version ${DOKKU_VERSION}"
+    ;;
+
   *)
     execute_dokku_cmd "$@"
     ;;

package.mk

@@ -0,0 +1,35 @@
+/tmp/build-dokku/var/lib/dokku/GIT_REV:
+	mkdir -p /tmp/build-dokku
+	mkdir -p /tmp/build-dokku/usr/share/bash-completion/completions
+	mkdir -p /tmp/build-dokku/usr/bin
+	mkdir -p /tmp/build-dokku/usr/share/doc/dokku
+	mkdir -p /tmp/build-dokku/usr/share/dokku/contrib
+	mkdir -p /tmp/build-dokku/usr/share/lintian/overrides
+	mkdir -p /tmp/build-dokku/usr/share/man/man1
+	mkdir -p /tmp/build-dokku/var/lib/dokku/core-plugins/available
+
+	cp dokku /tmp/build-dokku/usr/bin
+	cp LICENSE /tmp/build-dokku/usr/share/doc/dokku/copyright
+	cp contrib/bash-completion /tmp/build-dokku/usr/share/bash-completion/completions/dokku
+	find . -name ".DS_Store" -depth -exec rm {} \;
+	$(MAKE) go-build
+	cp common.mk /tmp/build-dokku/var/lib/dokku/core-plugins/common.mk
+	cp -r plugins/* /tmp/build-dokku/var/lib/dokku/core-plugins/available
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build-dokku/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build-dokku/var/lib/dokku/core-plugins/available/$$plugin/.core; done
+	rm /tmp/build-dokku/var/lib/dokku/core-plugins/common.mk
+	$(MAKE) help2man
+	$(MAKE) addman
+	cp /usr/local/share/man/man1/dokku.1 /tmp/build-dokku/usr/share/man/man1/dokku.1
+	gzip -9 /tmp/build-dokku/usr/share/man/man1/dokku.1
+	cp contrib/dokku-installer.py /tmp/build-dokku/usr/share/dokku/contrib
+ifeq ($(DOKKU_VERSION),master)
+	git describe --tags > /tmp/build-dokku/var/lib/dokku/VERSION
+else
+	echo $(DOKKU_VERSION) > /tmp/build-dokku/var/lib/dokku/VERSION
+endif
+ifdef DOKKU_GIT_REV
+	echo "$(DOKKU_GIT_REV)" > /tmp/build-dokku/var/lib/dokku/GIT_REV
+else
+	git rev-parse HEAD > /tmp/build-dokku/var/lib/dokku/GIT_REV
+endif

plugins/00_dokku-standard/commands

@@ -1,28 +1,12 @@
 #!/usr/bin/env bash
-[[ " help help:help run:help trace:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+[[ " help help:help cleanup:help run:help url:help urls:help version:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+source "$PLUGIN_AVAILABLE_PATH/00_dokku-standard/help-functions"
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
-  help | run:help | trace:help | url:help | urls:help | version:help)
-    [[ $(echo "$1" | sed '/.*:help/!d') ]] && help_topic="${1%\:help}"
-    help_content_func() {
-      declare desc="return standard plugin 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)
-    urls <app>, Show all URLs for an application
-    version , Print dokku's version
-    help , Print the list of commands
-help_content
-    }
-
-    if [[ $help_topic ]]; then
-      help_content_func | sed "/^\s*$help_topic\s/!d" | sort | sed '/^.*:/d' | column -c2 -t -s,
-    else
-      help_content_func
-    fi
+  help | cleanup:help | run:help | url:help | urls:help | version:help)
+    cmd-standard-help "$@"
     ;;
 
   *)

plugins/00_dokku-standard/help-functions

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+cmd-standard-help() {
+  declare desc="help command"
+  declare CMD="$1"
+
+  [[ $(echo "$CMD" | sed '/.*:help/!d') ]] && help_topic="${CMD%\:help}"
+  if [[ $help_topic ]]; then
+    fn-help-content | sed "/^\s*$help_topic\s/!d" | sort | sed '/^.*:/d' | column -c2 -t -s,
+  else
+    fn-help-content
+  fi
+}
+
+fn-help-content() {
+  declare desc="return help content"
+  cat <<help_content
+    cleanup [<app>], Cleans up exited/dead Docker containers and removes dangling images
+    run [--env KEY=VALUE] <app> <cmd>, Run a command in a new container using the current application image
+    url <app>, Show the first URL for an application (compatibility)
+    urls <app>, Show all URLs for an application
+    version , Print dokku's version
+    help , Print the list of commands
+help_content
+}

plugins/00_dokku-standard/install

@@ -43,7 +43,7 @@ ExecStart=$dokku_path ps:restore
 WantedBy=docker.service
 EOF
   if command -v systemctl &>/dev/null; then
-    systemctl reenable dokku-redeploy
+    systemctl --quiet reenable dokku-redeploy
   fi
 fi